[svn-commits] trunk - r7862 /trunk/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: markster
Date: Sat Jan  7 15:35:40 2006
New Revision: 7862

URL: http://svn.digium.com/view/asterisk?rev=7862&view=rev
Log:
Fix RPID with new string fields (bug #6145)

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=7862&r1=7861&r2=7862&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat Jan  7 15:35:40 2006
@@ -4194,7 +4194,7 @@
 	add_header(req, "User-Agent", default_useragent);
 	add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
 
-	if (p->rpid)
+	if (!ast_strlen_zero(p->rpid))
 		add_header(req, "Remote-Party-ID", p->rpid);
 
 	return 0;
@@ -4720,7 +4720,7 @@
 	char iabuf[INET_ADDRSTRLEN];
 	const char *fromdomain;
 
-	if (p->rpid || p->rpid_from)
+	if (!ast_strlen_zero(p->rpid) || !ast_strlen_zero(p->rpid_from))  
 		return;
 
 	if (p->owner && p->owner->cid.cid_num)
@@ -4922,7 +4922,7 @@
 	add_header(req, "CSeq", tmp);
 	add_header(req, "User-Agent", default_useragent);
 	add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
-	if (p->rpid)
+	if (!ast_strlen_zero(p->rpid))
 		add_header(req, "Remote-Party-ID", p->rpid);
 }