[asterisk-commits] rizzo: branch rizzo/astobj2 r51231 - /team/rizzo/astobj2/channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Thu Jan 18 10:51:38 2007
New Revision: 51231

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51231
Log:
merge from trunk 48992:
remove deprecated musicclass musiconhold localmask


Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=51231&r1=51230&r2=51231
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Thu Jan 18 10:51:38 2007
@@ -16451,7 +16451,7 @@
 		M_F("callgroup", user->callgroup = ast_get_group(v->value))
 		M_F("pickupgroup", user->pickupgroup = ast_get_group(v->value))
 		M_STR("language", user->language)
-		M_STR("|mohinterpret|musicclass|musiconhold|", user->mohinterpret)
+		M_STR("mohinterpret", user->mohinterpret)
 		M_STR("mohsuggest", user->mohsuggest)
 		M_STR("accountcode", user->accountcode)
 		M_INT_GE0("call-limit", user->call_limit, 0)
@@ -16693,7 +16693,7 @@
 				peer->amaflags = format;
 			} } )
 		M_STR("accountcode", peer->accountcode)
-		M_STR("|mohinterpret|musicclass|musiconhold|", peer->mohinterpret)
+		M_STR("mohinterpret", peer->mohinterpret)
 		M_STR("mohsuggest", peer->mohsuggest)
 		M_STR("mailbox", peer->mailbox)
 		M_F("subscribemwi", ast_set2_flag(&peer->flags[1], ast_true(v->value), SIP_PAGE2_SUBSCRIBEMWIONLY);)
@@ -16910,7 +16910,7 @@
 		M_BOOL("notifyringing", global_notifyringing)
 		M_BOOL("notifyhold", global_notifyhold)
 		M_BOOL("alwaysauthreject", global_alwaysauthreject)
-		M_STR("|mohinterpret|musicclass|musiconhold", default_mohinterpret)
+		M_STR("mohinterpret", default_mohinterpret)
 		M_STR("mohsuggest", default_mohsuggest)
 		M_STR("language", default_language)
 		M_F("regcontext", {
@@ -16959,7 +16959,6 @@
 				ast_log(LOG_WARNING, "Invalid localnet value: %s\n", v->value);
 			else
 				localaddr = na; } )
-		M_F("localmask", ast_log(LOG_WARNING, "Use of localmask is no long supported -- use localnet with mask syntax\n");)
 		M_F("externip", {
 			if (!(hp = ast_gethostbyname(v->value, &ahp))) 
 				ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);