diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 17:36:14 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-27 17:36:14 +0000 |
| commit | 377e69c30bdf62e82e93a00de3b71a8652d2508f (patch) | |
| tree | 5ef5dcd5e15bca02325ac9d1dd03bf3ca69d54b7 /channels | |
| parent | df0b41713f3366a36f7c7b02567ce537b4a498bd (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@125948 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 671e678ac..1c7b281d3 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) |