[asterisk-commits] russell: trunk r61379 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Apr 11 09:13:08 2007
New Revision: 61379

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61379
Log:
Merged revisions 61377 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61377 | russell | 2007-04-11 09:04:44 -0500 (Wed, 11 Apr 2007) | 13 lines

Merged revisions 61376 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61376 | russell | 2007-04-11 09:02:54 -0500 (Wed, 11 Apr 2007) | 5 lines

Remove the attempt at reporting configuration errors in sip.conf.  This can
cause a bunch of improper messages when using realtime.  I give up.  As oej
tried to convince me when I put this in, there is just no easy way to do it.
(inspired by a message on the -dev list)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=61379&r1=61378&r2=61379
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Apr 11 09:13:08 2007
@@ -16854,8 +16854,7 @@
 			peer->maxcallbitrate = atoi(v->value);
 			if (peer->maxcallbitrate < 0)
 				peer->maxcallbitrate = default_maxcallbitrate;
-		} else if (strcasecmp(v->name, "type"))
-			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
+		}
 	}
 	if (!ast_test_flag(&global_flags[1], SIP_PAGE2_IGNOREREGEXPIRE) && ast_test_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC) && realtime) {
 		time_t nowtime = time(NULL);
@@ -17260,8 +17259,7 @@
 				default_maxcallbitrate = DEFAULT_MAX_CALL_BITRATE;
 		} else if (!strcasecmp(v->name, "matchexterniplocally")) {
 			global_matchexterniplocally = ast_true(v->value);
-		} else
-			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
+		}
 	}
 
 	if (!allow_external_domains && AST_LIST_EMPTY(&domain_list)) {
@@ -17274,8 +17272,6 @@
  		/* Format for authentication is auth = username:password at realm */
  		if (!strcasecmp(v->name, "auth"))
  			authl = add_realm_authentication(authl, v->value, v->lineno);
- 		else
-			ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno);
  	}
 	
 	ucfg = ast_config_load("users.conf");