kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts rev 316218 as it breaks parsing the [general] section of sip.conf.

Browse Source 
The functionality this patch attempts to achieve should already
be possible using [general](+) in the config file.

issue #17957



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2011-05-04 16:42:19 +00:00
parent 51fc64d13a
commit 1f96380da5
2 changed files with 494 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -108,11 +108,6 @@ FollowMe
compatability for a FollowMe call with certain dialplan apps, options, and
functions.
SIP Changes
-----------
* Multiple [general] contexts are now permitted within sip.conf. They will be
merged at load time.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
------------------------------------------------------------------------------

11
channels/chan_sip.c
View File

@@ -27231,13 +27231,8 @@ static int reload_config(enum channelreloadreason reason)
ast_clear_flag(&global_flags[1], SIP_PAGE2_IGNORESDPVERSION);
/* Read all [general] config sections of sip.conf (or from realtime config) */
for (cat = ast_category_browse(cfg, "general"); cat; cat = ast_category_browse(cfg, cat)) {
if (strcmp(cat, "general")) {
continue;
}
for (v = ast_variable_browse(cfg, cat); v; v = v->next) {
/* Read the [general] config section of sip.conf (or from realtime config) */
for (v = ast_variable_browse(cfg, "general"); v; v = v->next) {
if (handle_common_options(&global_flags[0], &dummy[0], v)) {
continue;
}
@@ -27736,8 +27731,6 @@ static int reload_config(enum channelreloadreason reason)
}
}
} /* for (...ast_category_browse(cfg, "general")...) */
if (subscribe_network_change) {
network_change_event_subscribe();
} else {