Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add filter_registrar option #1160

Merged
merged 1 commit into from
Jul 26, 2024
Merged

add filter_registrar option #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/re_sip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ void sip_set_trace_handler(struct sip *sip, sip_trace_h *traceh);
/* transport */
int sip_transp_add(struct sip *sip, enum sip_transp tp,
const struct sa *laddr, ...);
int sip_transp_add_sock(struct sip *sip, enum sip_transp tp,
bool listen, const struct sa *laddr, ...);
int sip_transp_add_websock(struct sip *sip, enum sip_transp tp,
const struct sa *laddr,
bool server, const char *cert, struct tls *tls);
Expand Down
98 changes: 87 additions & 11 deletions src/sip/transp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,19 +1193,19 @@ static void http_req_handler(struct http_conn *hc, const struct http_msg *msg,
/**
* Add a SIP transport
*
* @param sip SIP stack instance
* @param tp SIP Transport
* @param laddr Local network address
* @param ... Optional transport parameters such as TLS context
* @param sip SIP stack instance
* @param tp SIP Transport
* @param listen True to open listening socket (UDP socket always opened)
* @param laddr Local network address
* @param ap Optional transport parameters such as TLS context
*
* @return 0 if success, otherwise errorcode
*/
int sip_transp_add(struct sip *sip, enum sip_transp tp,
const struct sa *laddr, ...)
static int add_transp(struct sip *sip, enum sip_transp tp,
bool listen, const struct sa *laddr, va_list ap)
{
struct sip_transport *transp;
struct tls *tls;
va_list ap;
int err = 0;

if (!sip || !laddr || !sa_isset(laddr, SA_ADDR))
Expand All @@ -1227,8 +1227,6 @@ int sip_transp_add(struct sip *sip, enum sip_transp tp,
transp->sip = sip;
transp->tp = tp;

va_start(ap, laddr);

switch (tp) {

case SIP_TRANSP_UDP:
Expand All @@ -1252,6 +1250,13 @@ int sip_transp_add(struct sip *sip, enum sip_transp tp,
/*@fallthrough@*/

case SIP_TRANSP_TCP:

if (!listen) {
transp->laddr = *laddr;
sa_set_port(&transp->laddr, 0);
return err;
}

err = tcp_listen((struct tcp_sock **)&transp->sock, laddr,
tcp_connect_handler, transp);
if (err)
Expand All @@ -1265,15 +1270,64 @@ int sip_transp_add(struct sip *sip, enum sip_transp tp,
break;
}

va_end(ap);

if (err)
mem_deref(transp);

return err;
}


/**
* Add a SIP transport
*
* @param sip SIP stack instance
* @param tp SIP Transport
* @param laddr Local network address
* @param ... Optional transport parameters such as TLS context
*
* @return 0 if success, otherwise errorcode
*/
int sip_transp_add(struct sip *sip, enum sip_transp tp,
const struct sa *laddr, ...)
{
int err;
va_list ap;

va_start(ap, laddr);
err = add_transp(sip, tp, true, laddr, ap);
va_end(ap);

return err;
}


/**
* Add a SIP transport and open listening socket if requested
*
* UDP socket will always be opened even if listen is false.
*
* @param sip SIP stack instance
* @param tp SIP Transport
* @param listen True to open listening socket
* @param laddr Local network address
* @param ... Optional transport parameters such as TLS context
*
* @return 0 if success, otherwise errorcode
*/
int sip_transp_add_sock(struct sip *sip, enum sip_transp tp,
bool listen, const struct sa *laddr, ...)
{
int err;
va_list ap;

va_start(ap, laddr);
err = add_transp(sip, tp, listen, laddr, ap);
va_end(ap);

return err;
}


/**
* Add a SIP websocket transport
*
Expand Down Expand Up @@ -1768,11 +1822,30 @@ int sip_settos(struct sip *sip, uint8_t tos)
}


static void sip_transports_print(struct re_printf *pf, const struct sip* sip)
{
uint32_t mask = 0;

for (struct le *le = sip->transpl.head; le; le = le->next) {
const struct sip_transport *transp = le->data;
mask |= (1 << transp->tp);
}

for (uint8_t i = 0; i < SIP_TRANSPC; ++i) {
if (mask==0 || (0 != (mask & (1u << i))))
(void)re_hprintf(pf, " %s\n", sip_transp_name(i));
}
}


static bool debug_handler(struct le *le, void *arg)
{
const struct sip_transport *transp = le->data;
struct re_printf *pf = arg;

if (sa_port(&transp->laddr) == 0)
return false;

(void)re_hprintf(pf, " %J (%s)\n",
&transp->laddr,
sip_transp_name(transp->tp));
Expand Down Expand Up @@ -1813,6 +1886,9 @@ int sip_transp_debug(struct re_printf *pf, const struct sip *sip)
int err;

err = re_hprintf(pf, "transports:\n");
sip_transports_print(pf, sip);

err |= re_hprintf(pf, "transport sockets:\n");
list_apply(&sip->transpl, true, debug_handler, pf);

err |= re_hprintf(pf, "connections:\n");
Expand Down
Loading