[svn-commits] mmichelson: branch 1.6.0 r150308 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 19:14:17 2008
New Revision: 150308

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150308
Log:
Merged revisions 150307 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r150307 | mmichelson | 2008-10-16 19:13:35 -0500 (Thu, 16 Oct 2008) | 14 lines

After a long discussion on #asterisk-bugs, it seems kind of
odd that a channel would be named after the port on which it
came in on. For endpoints that always include ":5060" as part
of the From: header, it will mean that you have a ton of
channels with names like "SIP/5060-3ea38a8b."

I am boldly moving forward with this change in trunk, but I'm
not touching other branches with this one since this definitely
would qualify as a behavior change. If there is a problem with
this commit, and I haven't seen the obvious reason why you'd want
to name the channel after the port from which the call originated,
then please feel free to revert this


........

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=150308&r1=150307&r2=150308
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Oct 16 19:14:17 2008
@@ -5320,12 +5320,15 @@
 	{
 		const char *my_name;	/* pick a good name */
 	
-		if (title)
+		if (title) {
 			my_name = title;
-		else if ( (my_name = strchr(i->fromdomain, ':')) )
-			my_name++;	/* skip ':' */
-		else
-			my_name = i->fromdomain;
+		} else {
+			char *port = NULL;
+			my_name = ast_strdupa(i->fromdomain);
+			if ((port = strchr(i->fromdomain, ':'))) {
+				*port = '\0';
+			}
+		}
 
 		sip_pvt_unlock(i);
 		/* Don't hold a sip pvt lock while we allocate a channel */