[svn-commits] bbryant: branch 1.6.0 r125948 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri Jun 27 12:36:14 2008
New Revision: 125948

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125948
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=125948&r1=125947&r2=125948
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Jun 27 12:36:14 2008
@@ -2495,17 +2495,16 @@
 			return "TCP";
 		case SIP_TRANSPORT_TLS:
 			return "TLS";
-	}
-
-	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";
+		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";	
+	}
 }
 
 static inline const char *get_transport(enum sip_transport t)