From 9da0e24388dcf70c7062498dab51bb1112a94de7 Mon Sep 17 00:00:00 2001 From: Brett Bryant Date: Fri, 27 Jun 2008 17:36:14 +0000 Subject: [PATCH] Merged revisions 125947 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r125947 | bbryant | 2008-06-27 12:35:41 -0500 (Fri, 27 Jun 2008) | 1 line Small error in the function that converts peer transports to a string. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125948 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 671e678acc..1c7b281d3e 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2495,17 +2495,16 @@ static inline const char *get_transport_list(struct sip_peer *peer) { return "TCP"; case SIP_TRANSPORT_TLS: return "TLS"; + case SIP_TRANSPORT_UDP | SIP_TRANSPORT_TCP: + return "TCP,UDP"; + case SIP_TRANSPORT_UDP | SIP_TRANSPORT_TLS: + return "TLS,UDP"; + case SIP_TRANSPORT_TCP | SIP_TRANSPORT_TLS: + return "TLS,TCP"; + default: + return peer->transports ? + "TLS,TCP,UDP" : "UNKNOWN"; } - - if (peer->transports & (SIP_TRANSPORT_TLS | SIP_TRANSPORT_TCP)) - return "TLS,TCP"; - if (peer->transports & (SIP_TRANSPORT_TLS | SIP_TRANSPORT_UDP)) - return "TLS,UDP"; - if (peer->transports & (SIP_TRANSPORT_UDP | SIP_TRANSPORT_TCP)) - return "TCP,UDP"; - - return peer->transports ? - "TLS,TCP,UDP" : "UNKNOWN"; } static inline const char *get_transport(enum sip_transport t)