[asterisk-commits] dvossel: branch 1.6.0 r216996 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Sep  8 09:28:19 2009
New Revision: 216996

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=216996
Log:
Merged revisions 216993 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216993 | dvossel | 2009-09-08 09:26:30 -0500 (Tue, 08 Sep 2009) | 14 lines
  
  caller id number empty
  
  parse_uri was not being given the correct scheme's, as
  a result, uri parsing did not parse the username correctly.
  One of the side effects of this is an empty caller id.
  
  (closes issue #15839)
  Reported by: ebroad
  Patches:
        blank_cidv2.patch uploaded by ebroad (license 878)
        parse_uri_fix.diff uploaded by dvossel (license 671)
  Tested by: ebroad, dvossel
........

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.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=216996&r1=216995&r2=216996
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Sep  8 09:28:19 2009
@@ -3505,7 +3505,7 @@
  * \note 
  * - If scheme is specified, drop it from the top.
  * - If a component is not requested, do not split around it.
- * - Multiple scheme's can be specified ',' delimited. ex: "sip,sips"
+ * - Multiple scheme's can be specified ',' delimited. ex: "sip:,sips:"
  *
  * This means that if we don't have domain, we cannot split
  * name:pass and domain:port.
@@ -10431,7 +10431,7 @@
 	 * We still need to be able to send to the remote agent through the proxy.
 	*/
 
-	if (parse_uri(contact, "sip,sips", &contact, NULL, &host, &pt, NULL, &transport)) {
+	if (parse_uri(contact, "sip:,sips:", &contact, NULL, &host, &pt, NULL, &transport)) {
 		ast_log(LOG_WARNING, "Invalid contact uri %s (missing sip: or sips:), attempting to use anyway\n", fullcontact);
 	}
 
@@ -10543,7 +10543,7 @@
 	ast_string_field_build(pvt, our_contact, "<%s>", curi);
 
 	/* Make sure it's a SIP URL */
-	if (parse_uri(curi, "sip,sips", &curi, NULL, &host, &pt, NULL, &transport)) {
+	if (parse_uri(curi, "sip:,sips:", &curi, NULL, &host, &pt, NULL, &transport)) {
 		ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
 	}
 
@@ -12395,7 +12395,7 @@
 
 
 	/* ignore all fields but name */
-	if (parse_uri(of, "sip,sips", &of, &dummy, &domain, &dummy, &dummy, NULL)) {
+	if (parse_uri(of, "sip:,sips:", &of, &dummy, &domain, &dummy, &dummy, NULL)) {
 		ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
 	}