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

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 19:19:42 2008
New Revision: 150313

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150313
Log:
Instead of merging commit 150307 to 1.6.0, I had
meant to block it in 1.6.1...time to go home :)


Modified:
    branches/1.6.0/channels/chan_sip.c

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