[asterisk-commits] oej: branch oej/calleridutf8 r89563 - /team/oej/calleridutf8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Nov 25 13:05:08 2007
New Revision: 89563

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89563
Log:
Updates. Compiled and ready to commit :-)

Modified:
    team/oej/calleridutf8/channels/chan_sip.c

Modified: team/oej/calleridutf8/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/calleridutf8/channels/chan_sip.c?view=diff&rev=89563&r1=89562&r2=89563
==============================================================================
--- team/oej/calleridutf8/channels/chan_sip.c (original)
+++ team/oej/calleridutf8/channels/chan_sip.c Sun Nov 25 13:05:08 2007
@@ -4657,10 +4657,8 @@
 	tmp->priority = 1;
 	if (!ast_strlen_zero(i->uri))
 		pbx_builtin_setvar_helper(tmp, "SIPURI", i->uri);
-	if (!ast_strlen_zero(i->domain)) {
+	if (!ast_strlen_zero(i->domain)) 
 		pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain);	/* This will be deprecated */
-		tmp->cid.cid_domain = ast_strdup(i->domain);
-	}
 	if (!ast_strlen_zero(i->callid))
 		pbx_builtin_setvar_helper(tmp, "SIPCALLID", i->callid);
 	if (i->rtp)
@@ -9578,7 +9576,7 @@
 			a = from;	/* just a domain */
 		from = strsep(&from, ";");	/* Remove userinfo options */
 		a = strsep(&a, ";");		/* Remove URI options */
-		ast_string_field_set(p, fromdomain, a);
+		ast_string_field_set(p, fromdomain, a);	/* Set the caller ID domain */
 	}
 
 	/* Skip any options and find the domain */
@@ -10407,9 +10405,11 @@
 		if (!strncasecmp(t, "sip:", 4))
 			t+= 4;
 		ast_string_field_set(p, exten, t);
-		t = strchr(p->exten, '@');
+		t = strchr(p->exten, '@');	/* Strip domain */
 		if (t)
 			*t = '\0';
+		t++;
+		/* SKREP: Set caller's domain here to cid_domain */ 
 		if (ast_strlen_zero(p->our_contact))
 			build_contact(p);
 	}