From 6aa9419cfe3df7119c393c53a2224de8c92a42db Mon Sep 17 00:00:00 2001 From: Brett Bryant Date: Wed, 2 Jul 2008 22:16:29 +0000 Subject: [PATCH] Update transport= in sip so that the option is not broken from a recent commit. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@127621 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8235d7ed0e..bb6f454c44 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21278,15 +21278,25 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str for (; v || ((v = alt) && !(alt=NULL)); v = v->next) { if (handle_common_options(&peerflags[0], &mask[0], v)) continue; - if (!strcasecmp(v->name, "transport")) { - if (!strcasecmp(v->value, "udp")) - peer->transports &= SIP_TRANSPORT_UDP; - else if (!strcasecmp(v->value, "tcp")) - peer->transports &= SIP_TRANSPORT_TCP; - else if (!strcasecmp(v->value, "tls")) - peer->transports &= SIP_TRANSPORT_TLS; - if (!peer->socket.type) /*!< The first transport listed should be used for outgoing */ - peer->socket.type = peer->transports; + if (!strcasecmp(v->name, "transport") && !ast_strlen_zero(v->value)) { + char *val = ast_strdupa(v->value); + char *trans; + + while ((trans = strsep(&val, ","))) { + trans = ast_skip_blanks(trans); + + if (!strncasecmp(trans, "udp", 3)) + peer->transports |= SIP_TRANSPORT_UDP; + else if (!strncasecmp(trans, "tcp", 3)) + peer->transports |= SIP_TRANSPORT_TCP; + else if (!strncasecmp(trans, "tls", 3)) + peer->transports |= SIP_TRANSPORT_TLS; + else + ast_log(LOG_NOTICE, "'%s' is not a valid transport type. if no other is specified, udp will be used.\n", trans); + + if (!peer->socket.type) /*!< The first transport listed should be used for outgoing */ + peer->socket.type = peer->transports; + } } else if (realtime && !strcasecmp(v->name, "regseconds")) { ast_get_time_t(v->value, ®seconds, 0, NULL); } else if (realtime && !strcasecmp(v->name, "ipaddr") && !ast_strlen_zero(v->value) ) {