[asterisk-commits] tilghman: trunk r346391 - in /trunk: ./ addons/ apps/ channels/ codecs/ confi...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Nov 29 12:43:22 CST 2011


Author: tilghman
Date: Tue Nov 29 12:43:16 2011
New Revision: 346391

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=346391
Log:
Allow each logging destination and console to have its own notion of the verbosity level.

Review: https://reviewboard.asterisk.org/r/1599

Modified:
    trunk/CHANGES
    trunk/UPGRADE.txt
    trunk/addons/chan_ooh323.c
    trunk/addons/res_config_mysql.c
    trunk/apps/app_rpt.c
    trunk/apps/app_verbose.c
    trunk/apps/app_voicemail.c
    trunk/channels/chan_sip.c
    trunk/channels/chan_skinny.c
    trunk/channels/chan_usbradio.c
    trunk/codecs/codec_dahdi.c
    trunk/configs/logger.conf.sample
    trunk/include/asterisk/logger.h
    trunk/main/asterisk.c
    trunk/main/bridging.c
    trunk/main/cli.c
    trunk/main/dial.c
    trunk/main/logger.c
    trunk/main/say.c
    trunk/res/res_clialiases.c
    trunk/res/res_fax.c
    trunk/res/res_jabber.c
    trunk/res/res_musiconhold.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Tue Nov 29 12:43:16 2011
@@ -63,6 +63,16 @@
 -------------
  * Allow the built in variables ${NUMBER}, ${IPADDR} and ${SECRET} to be
    used within the dynamic weight attribute when specifying a mapping.
+
+Core changes
+------------
+ * Each logging destination and console now have an independent notion of the
+   current verbosity level.  Logger.conf now allows an optional argument to
+   the 'verbose' specifier, indicating the level of verbosity sent to that
+   particular logging destination.  Additionally, remote consoles now each
+   have their own verbosity level.  While 'core set verbose' still works to
+   affect the core console verbosity, 'remote set verbose' will now set a
+   separate level for each remote console without affecting any other console.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.8 to Asterisk 10 -------------------

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Tue Nov 29 12:43:16 2011
@@ -20,7 +20,7 @@
 ===
 ===========================================================
 
-From 10 to 12:
+From 10 to 11:
 
 func_enum:
  - ENUM query functions now return a count of -1 on lookup error to
@@ -35,6 +35,10 @@
    - cdr.conf: [general] and [csv] sections
    - dnsmgr.conf
    - dsp.conf
+
+ - The 'verbose' setting in logger.conf now takes an optional argument,
+   specifying the verbosity level for each logging destination.  The default,
+   if not otherwise specified, is a verbosity of 3.
 
 AMI:
   - DBDelTree now correctly returns an error when 0 rows are deleted just as

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Tue Nov 29 12:43:16 2011
@@ -361,8 +361,9 @@
 	struct ast_format tmpfmt;
 	int features = 0;
 
-	if (gH323Debug)
-		ast_verbose("---   ooh323_new - %s\n", host);
+	if (gH323Debug) {
+		ast_verb(0, "---   ooh323_new - %s\n", host);
+	}
 
 	ast_format_clear(&tmpfmt);
 	/* Don't hold a h323 pvt lock while we allocate a channel */
@@ -480,8 +481,9 @@
 
    	if(ch)   ast_channel_unlock(ch);
 
-	if (gH323Debug)
-		ast_verbose("+++   h323_new\n");
+	if (gH323Debug) {
+		ast_verb(0, "+++   h323_new\n");
+	}
 
 	return ch;
 }
@@ -492,8 +494,9 @@
 {
 	struct ooh323_pvt *pvt = NULL;
 
-	if (gH323Debug)
-		ast_verbose("---   ooh323_alloc\n");
+	if (gH323Debug) {
+		ast_verb(0, "---   ooh323_alloc\n");
+	}
 
 	if (!(pvt = ast_calloc(1, sizeof(*pvt)))) {
 		ast_log(LOG_ERROR, "Couldn't allocate private ooh323 structure\n");
@@ -542,8 +545,9 @@
 	iflist = pvt;
 	ast_mutex_unlock(&iflock);
 
-	if (gH323Debug)
-		ast_verbose("+++   ooh323_alloc\n");
+	if (gH323Debug) {
+		ast_verb(0, "+++   ooh323_alloc\n");
+	}
 
 	return pvt;
 }
@@ -566,7 +570,7 @@
 	int port = 0;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_request - data %s format %s\n", (char*)data,  
+		ast_verb(0, "---   ooh323_request - data %s format %s\n", (char*)data,  
 										ast_getformatname_multiple(formats,FORMAT_STRING_SIZE,cap));
 
 	if (!(ast_format_cap_has_type(cap, AST_FORMAT_TYPE_AUDIO))) {
@@ -719,7 +723,7 @@
 
 	restart_monitor();
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_request\n");
+		ast_verb(0, "+++   ooh323_request\n");
 
 	return chan;
 
@@ -731,7 +735,7 @@
 	struct ooh323_pvt *p;
 
 	if (gH323Debug)
-		ast_verbose("---   find_call\n");
+		ast_verb(0, "---   find_call\n");
 
 	ast_mutex_lock(&iflock);
 
@@ -743,7 +747,7 @@
 	ast_mutex_unlock(&iflock);
 
 	if (gH323Debug)
-		ast_verbose("+++   find_call\n");
+		ast_verb(0, "+++   find_call\n");
 
 	return p;
 }
@@ -753,7 +757,7 @@
 	struct ooh323_user *user;
 
 	if (gH323Debug)
-      ast_verbose("---   find_user: %s, %s\n",name,ip);
+      ast_verb(0, "---   find_user: %s, %s\n",name,ip);
 
 	ast_mutex_lock(&userl.lock);
 
@@ -769,7 +773,7 @@
 	ast_mutex_unlock(&userl.lock);
 
 	if (gH323Debug)
-		ast_verbose("+++   find_user\n");
+		ast_verb(0, "+++   find_user\n");
 
 	return user;
 }
@@ -779,13 +783,13 @@
 	struct ooh323_peer *peer;  
 
 	if (gH323Debug)
-		ast_verbose("---   find_friend \"%s\"\n", name);
+		ast_verb(0, "---   find_friend \"%s\"\n", name);
 
 
 	ast_mutex_lock(&peerl.lock);
 	for (peer = peerl.peers; peer; peer = peer->next) {
 		if (gH323Debug) {
-			ast_verbose("		comparing with \"%s\"\n", peer->ip);
+			ast_verb(0, "		comparing with \"%s\"\n", peer->ip);
 		}
 		if (!strcmp(peer->ip, name)) {
 			if (port <= 0 || (port > 0 && peer->port == port)) {
@@ -797,9 +801,9 @@
 
 	if (gH323Debug) {
 		if (peer) {
-			ast_verbose("		found matching friend\n");
-		}
-		ast_verbose("+++   find_friend \"%s\"\n", name);
+			ast_verb(0, "		found matching friend\n");
+		}
+		ast_verb(0, "+++   find_friend \"%s\"\n", name);
 	}
 
 	return peer;		
@@ -811,13 +815,13 @@
 	struct ooh323_peer *peer;
 
 	if (gH323Debug)
-		ast_verbose("---   find_peer \"%s\"\n", name);
+		ast_verb(0, "---   find_peer \"%s\"\n", name);
 
 
 	ast_mutex_lock(&peerl.lock);
 	for (peer = peerl.peers; peer; peer = peer->next) {
 		if (gH323Debug) {
-			ast_verbose("		comparing with \"%s\"\n", peer->ip);
+			ast_verb(0, "		comparing with \"%s\"\n", peer->ip);
 		}
 		if (!strcasecmp(peer->name, name))
 			break;
@@ -836,9 +840,9 @@
 
 	if (gH323Debug) {
 		if (peer) {
-			ast_verbose("		found matching peer\n");
-		}
-		ast_verbose("+++   find_peer \"%s\"\n", name);
+			ast_verb(0, "		found matching peer\n");
+		}
+		ast_verb(0, "+++   find_peer \"%s\"\n", name);
 	}
 
 	return peer;		
@@ -850,7 +854,7 @@
 	struct ooh323_pvt *p = (struct ooh323_pvt *) chan->tech_pvt;
 	
 	if (gH323Debug)
-		ast_verbose("---   ooh323_digit_begin\n");
+		ast_verb(0, "---   ooh323_digit_begin\n");
 
 	if (!p) {
 		ast_log(LOG_ERROR, "No private structure for call\n");
@@ -869,7 +873,7 @@
 	}
 	ast_mutex_unlock(&p->lock);
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_digit_begin\n");
+		ast_verb(0, "+++   ooh323_digit_begin\n");
 
 	return 0;
 }
@@ -879,7 +883,7 @@
 	struct ooh323_pvt *p = (struct ooh323_pvt *) chan->tech_pvt;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_digit_end\n");
+		ast_verb(0, "---   ooh323_digit_end\n");
 
 	if (!p) {
 		ast_log(LOG_ERROR, "No private structure for call\n");
@@ -891,7 +895,7 @@
 
 	ast_mutex_unlock(&p->lock);
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_digit_end\n");
+		ast_verb(0, "+++   ooh323_digit_end\n");
 
 	return 0;
 }
@@ -912,7 +916,7 @@
 	};
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_call- %s\n", dest);
+		ast_verb(0, "---   ooh323_call- %s\n", dest);
 
 
    	if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) {
@@ -989,7 +993,7 @@
       		return -1; /* ToDO: cleanup */
 	}
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_call\n");
+		ast_verb(0, "+++   ooh323_call\n");
 
   return 0;
 }
@@ -1000,7 +1004,7 @@
    	int q931cause = AST_CAUSE_NORMAL_CLEARING;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_hangup\n");
+		ast_verb(0, "---   ooh323_hangup\n");
 
 	if (p) {
 		ast_mutex_lock(&p->lock);
@@ -1027,7 +1031,7 @@
 
 
 		if (gH323Debug)
-			ast_verbose("    hanging %s with cause: %d\n", p->username, q931cause);
+			ast_verb(0, "    hanging %s with cause: %d\n", p->username, q931cause);
 		ast->tech_pvt = NULL; 
 		if (!ast_test_flag(p, H323_ALREADYGONE)) {
          		ooHangCall(p->callToken, 
@@ -1056,7 +1060,7 @@
 	}
 	
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_hangup\n");
+		ast_verb(0, "+++   ooh323_hangup\n");
 
   return 0;
 }
@@ -1067,7 +1071,7 @@
 	char *callToken = (char *)NULL;
 
 	if (gH323Debug)
-		ast_verbose("--- ooh323_answer\n");
+		ast_verb(0, "--- ooh323_answer\n");
 
 	if (p) {
 
@@ -1097,7 +1101,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++ ooh323_answer\n");
+		ast_verb(0, "+++ ooh323_answer\n");
 
   return 0;
 }
@@ -1201,12 +1205,12 @@
 
 	if (!callToken) {
 		if (gH323Debug)
-			ast_verbose("	ooh323_indicate - No callToken\n");
+			ast_verb(0, "	ooh323_indicate - No callToken\n");
 		return -1;
 	}
 
 	if (gH323Debug)
-		ast_verbose("----- ooh323_indicate %d on call %s\n", condition, callToken);
+		ast_verb(0, "----- ooh323_indicate %d on call %s\n", condition, callToken);
 	 
    	ast_mutex_lock(&p->lock);
 	switch (condition) {
@@ -1359,7 +1363,7 @@
    	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("++++  ooh323_indicate %d on %s\n", condition, callToken);
+		ast_verb(0, "++++  ooh323_indicate %d on %s\n", condition, callToken);
 
    	free(callToken);
 	return res;
@@ -1378,7 +1382,7 @@
 	ast_mutex_lock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("----- ooh323_queryoption %d on channel %s\n", option, ast->name);
+		ast_verb(0, "----- ooh323_queryoption %d on channel %s\n", option, ast->name);
 	 
 	switch (option) {
 
@@ -1418,7 +1422,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++++ ooh323_queryoption %d on channel %s\n", option, ast->name);
+		ast_verb(0, "+++++ ooh323_queryoption %d on channel %s\n", option, ast->name);
 	 
    	ast_mutex_unlock(&p->lock);
 
@@ -1434,7 +1438,7 @@
 	if (!p) return -1;
 
 	if (gH323Debug)
-		ast_verbose("--- ooh323c ooh323_fixup\n");
+		ast_verb(0, "--- ooh323c ooh323_fixup\n");
 
 	ast_mutex_lock(&p->lock);
 	if (p->owner != oldchan) {
@@ -1452,7 +1456,7 @@
 	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++ ooh323c ooh323_fixup \n");
+		ast_verb(0, "+++ ooh323c ooh323_fixup \n");
 
 	return 0;
 }
@@ -1464,7 +1468,7 @@
 	char formats[FORMAT_STRING_SIZE];
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_update_writeformat %s/%d\n", 
+		ast_verb(0, "---   ooh323_update_writeformat %s/%d\n", 
 				ast_getformatname(fmt), txframes);
 	
 	p = find_call(call);
@@ -1488,7 +1492,7 @@
 			return;
 		}
 		if (gH323Debug)
-	  		ast_verbose("Writeformat before update %s/%s\n", 
+	  		ast_verb(0, "Writeformat before update %s/%s\n", 
 			  ast_getformatname(&p->owner->writeformat),
 			  ast_getformatname_multiple(formats, sizeof(formats), p->owner->nativeformats));
 		if (txframes)
@@ -1514,7 +1518,7 @@
 	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_update_writeformat\n");
+		ast_verb(0, "+++   ooh323_update_writeformat\n");
 }
 
 void ooh323_set_read_format(ooCallData *call, struct ast_format *fmt)
@@ -1522,7 +1526,7 @@
 	struct ooh323_pvt *p = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_update_readformat %s\n", 
+		ast_verb(0, "---   ooh323_update_readformat %s\n", 
 				ast_getformatname(fmt));
 	
 	p = find_call(call);
@@ -1547,7 +1551,7 @@
 		}
 
 		if (gH323Debug)
-	  		ast_verbose("Readformat before update %s\n", 
+	  		ast_verb(0, "Readformat before update %s\n", 
 				  ast_getformatname(&p->owner->readformat));
 		ast_format_cap_set(p->owner->nativeformats, fmt);
 	  	ast_set_read_format(p->owner, &p->owner->readformat);
@@ -1558,7 +1562,7 @@
 	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_update_readformat\n");
+		ast_verb(0, "+++   ooh323_update_readformat\n");
 }
 
 
@@ -1568,7 +1572,7 @@
 	struct ast_channel *c = NULL;
 
 	if (gH323Debug)
-		ast_verbose("--- onAlerting %s\n", call->callToken);
+		ast_verb(0, "--- onAlerting %s\n", call->callToken);
 
    	p = find_call(call);
 
@@ -1613,7 +1617,7 @@
       	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++ onAlerting %s\n", call->callToken);
+		ast_verb(0, "+++ onAlerting %s\n", call->callToken);
 
 	return OO_OK;
 }
@@ -1624,7 +1628,7 @@
 	struct ast_channel *c = NULL;
 
 	if (gH323Debug)
-		ast_verbose("--- onProgress %s\n", call->callToken);
+		ast_verb(0, "--- onProgress %s\n", call->callToken);
 
    	p = find_call(call);
 
@@ -1669,7 +1673,7 @@
       	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++ onProgress %s\n", call->callToken);
+		ast_verb(0, "+++ onProgress %s\n", call->callToken);
 
 	return OO_OK;
 }
@@ -1730,7 +1734,7 @@
 	char number [OO_MAX_NUMBER_LENGTH];
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_onReceivedSetup %s\n", call->callToken);
+		ast_verb(0, "---   ooh323_onReceivedSetup %s\n", call->callToken);
 
 
 	if (!(p = ooh323_alloc(call->callReference, call->callToken))) {
@@ -1877,7 +1881,7 @@
 	ast_mutex_unlock(&p->lock);
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_onReceivedSetup - Determined context %s, "
+		ast_verb(0, "+++   ooh323_onReceivedSetup - Determined context %s, "
 						"extension %s\n", p->context, p->exten);
 
 	return OO_OK;
@@ -1891,7 +1895,7 @@
 	int i = 0;
 
 	if (gH323Debug)
-		ast_verbose("---   onOutgoingCall %lx: %s\n", (long unsigned int) call, call->callToken);
+		ast_verb(0, "---   onOutgoingCall %lx: %s\n", (long unsigned int) call, call->callToken);
 
 	if (!strcmp(call->callType, "outgoing")) {
 		p = find_call(call);
@@ -1923,13 +1927,13 @@
 
 		if (!ast_strlen_zero(p->caller_dialedDigits)) {
 			if (gH323Debug) {
-				ast_verbose("Setting dialed digits %s\n", p->caller_dialedDigits);
+				ast_verb(0, "Setting dialed digits %s\n", p->caller_dialedDigits);
 			}
 			ooCallAddAliasDialedDigits(call, p->caller_dialedDigits);
 		} else if (!ast_strlen_zero(p->callerid_num)) {
 			if (ooIsDailedDigit(p->callerid_num)) {
 				if (gH323Debug) {
-					ast_verbose("setting callid number %s\n", p->callerid_num);
+					ast_verb(0, "setting callid number %s\n", p->callerid_num);
 				}
 				ooCallAddAliasDialedDigits(call, p->callerid_num);
 			} else if (ast_strlen_zero(p->caller_h323id)) {
@@ -1953,7 +1957,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   onOutgoingCall %s\n", call->callToken);
+		ast_verb(0, "+++   onOutgoingCall %s\n", call->callToken);
 	return OO_OK;
 }
 
@@ -1964,7 +1968,7 @@
 	int i = 0;
 
 	if (gH323Debug)
-		ast_verbose("---   onNewCallCreated %lx: %s\n", (long unsigned int) call, call->callToken);
+		ast_verb(0, "---   onNewCallCreated %lx: %s\n", (long unsigned int) call, call->callToken);
 
    	ast_mutex_lock(&call->Lock);
    	if (ooh323c_start_call_thread(call)) {
@@ -2004,13 +2008,13 @@
 
 		if (!ast_strlen_zero(p->caller_dialedDigits)) {
 			if (gH323Debug) {
-				ast_verbose("Setting dialed digits %s\n", p->caller_dialedDigits);
+				ast_verb(0, "Setting dialed digits %s\n", p->caller_dialedDigits);
 			}
 			ooCallAddAliasDialedDigits(call, p->caller_dialedDigits);
 		} else if (!ast_strlen_zero(p->callerid_num)) {
 			if (ooIsDailedDigit(p->callerid_num)) {
 				if (gH323Debug) {
-					ast_verbose("setting callid number %s\n", p->callerid_num);
+					ast_verb(0, "setting callid number %s\n", p->callerid_num);
 				}
 				ooCallAddAliasDialedDigits(call, p->callerid_num);
 			} else if (ast_strlen_zero(p->caller_h323id)) {
@@ -2031,7 +2035,7 @@
 		if (gH323Debug) {
 			char prefsBuf[256];
 			ast_codec_pref_string(&p->prefs, prefsBuf, sizeof(prefsBuf));
-			ast_verbose(" Outgoing call %s(%s) - Codec prefs - %s\n", 
+			ast_verb(0, " Outgoing call %s(%s) - Codec prefs - %s\n", 
 				p->username?p->username:"NULL", call->callToken, prefsBuf);
 		}
 
@@ -2044,7 +2048,7 @@
 
    	ast_mutex_unlock(&call->Lock);
 	if (gH323Debug)
-		ast_verbose("+++   onNewCallCreated %s\n", call->callToken);
+		ast_verb(0, "+++   onNewCallCreated %s\n", call->callToken);
 	return OO_OK;
 }
 
@@ -2053,7 +2057,7 @@
 	struct ooh323_pvt *p = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   onCallEstablished %s\n", call->callToken);
+		ast_verb(0, "---   onCallEstablished %s\n", call->callToken);
 
 
 	if (!(p = find_call(call))) {
@@ -2099,7 +2103,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   onCallEstablished %s\n", call->callToken);
+		ast_verb(0, "+++   onCallEstablished %s\n", call->callToken);
 
 	return OO_OK;
 }
@@ -2110,7 +2114,7 @@
 	int ownerLock = 0;
 
 	if (gH323Debug)
-		ast_verbose("---   onCallCleared %s \n", call->callToken);
+		ast_verb(0, "---   onCallCleared %s \n", call->callToken);
 
 
    if ((p = find_call(call))) {
@@ -2155,7 +2159,7 @@
     }
 
 	if (gH323Debug)
-		ast_verbose("+++   onCallCleared\n");
+		ast_verb(0, "+++   onCallCleared\n");
 
 	return OO_OK;
 }
@@ -2165,7 +2169,7 @@
 	struct ooh323_user *prev = NULL, *cur = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_delete_user\n");
+		ast_verb(0, "---   ooh323_delete_user\n");
 
 	if (user) {	
 		cur = userl.users;
@@ -2188,7 +2192,7 @@
 	}  
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_delete_user\n");
+		ast_verb(0, "+++   ooh323_delete_user\n");
 
 } */
 
@@ -2197,7 +2201,7 @@
 	struct ooh323_peer *prev = NULL, *cur = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_delete_peer\n");
+		ast_verb(0, "---   ooh323_delete_peer\n");
 
 	if (peer) {	
       cur = peerl.peers;
@@ -2226,7 +2230,7 @@
 	}  
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_delete_peer\n");
+		ast_verb(0, "+++   ooh323_delete_peer\n");
 
 }
 
@@ -2237,7 +2241,7 @@
 	struct ooh323_user *user = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   build_user\n");
+		ast_verb(0, "---   build_user\n");
 
    	user = ast_calloc(1,sizeof(struct ooh323_user));
 	if (user) {
@@ -2366,7 +2370,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   build_user\n");
+		ast_verb(0, "+++   build_user\n");
 
 	return user;
 }
@@ -2376,7 +2380,7 @@
 	struct ooh323_peer *peer = NULL;
 
 	if (gH323Debug)
-		ast_verbose("---   build_peer\n");
+		ast_verb(0, "---   build_peer\n");
 
 	peer = ast_calloc(1, sizeof(*peer));
 	if (peer) {
@@ -2534,7 +2538,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   build_peer\n");
+		ast_verb(0, "+++   build_peer\n");
 
 	return peer;
 }
@@ -2542,13 +2546,13 @@
 static int ooh323_do_reload(void)
 {
 	if (gH323Debug) {
-		ast_verbose("---   ooh323_do_reload\n");
+		ast_verb(0, "---   ooh323_do_reload\n");
 	}
 
    	reload_config(1);
 
 	if (gH323Debug) {
-		ast_verbose("+++   ooh323_do_reload\n");
+		ast_verb(0, "+++   ooh323_do_reload\n");
 	}
 
 	return 0;
@@ -2574,11 +2578,11 @@
                return CLI_SHOWUSAGE;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_reload\n");
+		ast_verb(0, "---   ooh323_reload\n");
 
 	ast_mutex_lock(&h323_reload_lock);
 	if (h323_reloading) {
-		ast_verbose("Previous OOH323 reload not yet done\n");
+		ast_verb(0, "Previous OOH323 reload not yet done\n");
    } else {
 		h323_reloading = 1;
 	}
@@ -2586,7 +2590,7 @@
 	restart_monitor();
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_reload\n");
+		ast_verb(0, "+++   ooh323_reload\n");
 
 	return 0;
 }
@@ -2605,7 +2609,7 @@
 	struct ast_format tmpfmt;
 
 	if (gH323Debug)
-		ast_verbose("---   reload_config\n");
+		ast_verb(0, "---   reload_config\n");
 
 	cfg = ast_config_load((char*)config, config_flags);
 
@@ -2620,7 +2624,7 @@
 		delete_users();
 		delete_peers();
 		if (gH323Debug) {
-			ast_verbose("  reload_config - Freeing up alias list\n");
+			ast_verb(0, "  reload_config - Freeing up alias list\n");
 		}
 		cur = gAliasList;
 		while (cur) {
@@ -2788,8 +2792,7 @@
          strncpy(gLogFile, v->value, sizeof(gLogFile)-1);
 		} else if (!strcasecmp(v->name, "context")) {
          strncpy(gContext, v->value, sizeof(gContext)-1);
-         ast_verbose(VERBOSE_PREFIX_3 "  == Setting default context to %s\n", 
-                                                      gContext);
+         ast_verb(3, "  == Setting default context to %s\n", gContext);
 		} else if (!strcasecmp(v->name, "rtptimeout")) {
 			gRTPTimeout = atoi(v->value);
 			if (gRTPTimeout <= 0)
@@ -2926,7 +2929,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   reload_config\n");
+		ast_verb(0, "+++   reload_config\n");
 
 	return 0;
 
@@ -3760,10 +3763,10 @@
 	struct ooh323_user *user = NULL;
 
 	if (gH323Debug) {
-		ast_verbose("---   ooh323_destroy \n");
+		ast_verb(0, "---   ooh323_destroy \n");
 
 		if (p)
-			ast_verbose(" Destroying %s\n", p->username);
+			ast_verb(0, " Destroying %s\n", p->username);
 	}
 
 	cur = iflist;
@@ -3782,7 +3785,7 @@
 
 		if (cur->callToken) {
 	 		if (gH323Debug) 
-				ast_verbose(" Destroying %s\n", cur->callToken);
+				ast_verb(0, " Destroying %s\n", cur->callToken);
 			ast_free(cur->callToken);
 			cur->callToken = 0;
 		}
@@ -3858,7 +3861,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   ooh323_destroy\n");
+		ast_verb(0, "+++   ooh323_destroy\n");
 
 	return 0;
 }
@@ -3935,7 +3938,7 @@
 	struct ooAliases *cur = NULL, *prev = NULL;
 
 	if (gH323Debug) {
-		ast_verbose("--- ooh323  unload_module \n");
+		ast_verb(0, "--- ooh323  unload_module \n");
 	}
 	/* First, take us out of the channel loop */
 	ast_cli_unregister_multiple(cli_ooh323, sizeof(cli_ooh323) / sizeof(struct ast_cli_entry));
@@ -3947,7 +3950,7 @@
 #endif
 
 	if (gH323Debug) {
-		ast_verbose("  unload_module - hanging up all interfaces\n");
+		ast_verb(0, "  unload_module - hanging up all interfaces\n");
 	}
 	if (!ast_mutex_lock(&iflock)) {
 		/* Hangup all interfaces if they have an owner */
@@ -3967,7 +3970,7 @@
 
 
 	if (gH323Debug) {
-		ast_verbose("  unload_module - stopping monitor thread\n");
+		ast_verb(0, "  unload_module - stopping monitor thread\n");
 	}  
 	if (monitor_thread != AST_PTHREADT_NULL) {
 		if (!ast_mutex_lock(&monlock)) {
@@ -3986,13 +3989,13 @@
 
 
 	if (gH323Debug) {
-		ast_verbose("   unload_module - stopping stack thread\n");
+		ast_verb(0, "   unload_module - stopping stack thread\n");
 	}
 	ooh323c_stop_stack_thread();
 
 
 	if (gH323Debug) {
-		ast_verbose("   unload_module - freeing up memory used by interfaces\n");
+		ast_verb(0, "   unload_module - freeing up memory used by interfaces\n");
 	}
 	if (!ast_mutex_lock(&iflock)) {
 		struct ooh323_pvt *pl;
@@ -4014,19 +4017,19 @@
  
 
 	if (gH323Debug) {
-		ast_verbose("  unload_module - deleting users\n");
+		ast_verb(0, "  unload_module - deleting users\n");
 	}
 	delete_users();
 
 
 	if (gH323Debug) {
-		ast_verbose("  unload_module - deleting peers\n");
+		ast_verb(0, "  unload_module - deleting peers\n");
 	}
 	delete_peers();
 
 
 	if (gH323Debug) {
-		ast_verbose("  unload_module - Freeing up alias list\n");
+		ast_verb(0, "  unload_module - Freeing up alias list\n");
 	}
 	cur = gAliasList;
 	while (cur) {
@@ -4039,12 +4042,12 @@
 
 
 	if (gH323Debug) {
-		ast_verbose("	unload_module- destroying OOH323 endpoint \n");
+		ast_verb(0, "	unload_module- destroying OOH323 endpoint \n");
 	}
 	ooH323EpDestroy();
 
 	if (gH323Debug) {
-		ast_verbose("+++ ooh323  unload_module \n");
+		ast_verb(0, "+++ ooh323  unload_module \n");
 	}
 
 	gCap = ast_format_cap_destroy(gCap);
@@ -4158,7 +4161,7 @@
 	int mode;
 
 	if (gH323Debug)
-		ast_verbose("---   ooh323_set_peer - %s\n", chan->name);
+		ast_verb(0, "---   ooh323_set_peer - %s\n", chan->name);
 
 	if (!rtp) {
 		return 0;
@@ -4194,7 +4197,7 @@
 	ast_format_clear(&tmpfmt);
 
 	if (gH323Debug)
-		ast_verbose("---   configure_local_rtp\n");
+		ast_verb(0, "---   configure_local_rtp\n");
 
 
 	if (ast_parse_arg(call->localIP, PARSE_ADDR, &tmp)) {
@@ -4262,7 +4265,7 @@
 
 	if (p->rtdrcount) {
 		if (gH323Debug)
-			ast_verbose("Setup RTDR info: %d, %d\n", p->rtdrinterval, p->rtdrcount);
+			ast_verb(0, "Setup RTDR info: %d, %d\n", p->rtdrinterval, p->rtdrcount);
 		call->rtdrInterval = p->rtdrinterval;
 		call->rtdrCount = p->rtdrcount;
 	}
@@ -4307,7 +4310,7 @@
 	}
 
 	if (gH323Debug)
-		ast_verbose("+++   configure_local_rtp\n");
+		ast_verb(0, "+++   configure_local_rtp\n");
 
 	return 1;
 }
@@ -4319,7 +4322,7 @@
 	struct ast_sockaddr tmp;
 
 	if (gH323Debug)
-		ast_verbose("---   setup_rtp_connection %s:%d\n", remoteIp, remotePort);
+		ast_verb(0, "---   setup_rtp_connection %s:%d\n", remoteIp, remotePort);
 
 	/* Find the call or allocate a private structure if call not found */
 	p = find_call(call); 
@@ -4338,7 +4341,7 @@
 							"audio", "G726-32", AST_RTP_OPT_G726_NONSTANDARD);
 
 	if(gH323Debug)
-		ast_verbose("+++   setup_rtp_connection\n");
+		ast_verb(0, "+++   setup_rtp_connection\n");
 
 	return;
 }
@@ -4348,7 +4351,7 @@
 	struct ooh323_pvt *p = NULL;
 
    if(gH323Debug)
-		ast_verbose("---   close_rtp_connection\n");
+		ast_verb(0, "---   close_rtp_connection\n");
 
 	p = find_call(call);
 	if (!p) {
@@ -4363,7 +4366,7 @@
 	ast_mutex_unlock(&p->lock);
 
    if(gH323Debug)
-		ast_verbose("+++   close_rtp_connection\n");
+		ast_verb(0, "+++   close_rtp_connection\n");
 
 	return;
 }
@@ -4414,7 +4417,7 @@
 	struct ast_sockaddr them;
 
 	if (gH323Debug)
-		ast_verbose("---   setup_udptl_connection\n");
+		ast_verb(0, "---   setup_udptl_connection\n");
 
 	/* Find the call or allocate a private structure if call not found */
 	p = find_call(call); 
@@ -4463,7 +4466,7 @@
 	ast_mutex_unlock(&p->lock);
 
 	if(gH323Debug)
-		ast_verbose("+++   setup_udptl_connection\n");
+		ast_verb(0, "+++   setup_udptl_connection\n");
 
 	return;
 }
@@ -4473,7 +4476,7 @@
 	struct ooh323_pvt *p = NULL;
 
    	if(gH323Debug)
-		ast_verbose("---   close_udptl_connection\n");
+		ast_verb(0, "---   close_udptl_connection\n");
 
 	p = find_call(call);
 	if (!p) {
@@ -4509,7 +4512,7 @@
 	ast_mutex_unlock(&p->lock);
 
    	if(gH323Debug)
-		ast_verbose("+++   close_udptl_connection\n");
+		ast_verb(0, "+++   close_udptl_connection\n");
 
 	return;
 }
@@ -4600,7 +4603,7 @@
 		/* Switch to T.38 ON CED*/
 		if (!p->faxmode && !p->chmodepend && (dfr->subclass.integer == 'e') && (p->t38support != T38_DISABLED)) {
 			if (gH323Debug)
-				ast_verbose("request to change %s to t.38 because fax ced\n", p->callToken);
+				ast_verb(0, "request to change %s to t.38 because fax ced\n", p->callToken);
 			p->chmodepend = 1;
 			p->faxdetected = 1;
 			ooRequestChangeMode(p->callToken, 1);

Modified: trunk/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/res_config_mysql.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/addons/res_config_mysql.c (original)
+++ trunk/addons/res_config_mysql.c Tue Nov 29 12:43:16 2011
@@ -1379,8 +1379,7 @@
 	parse_config(0);
 
 	ast_config_engine_register(&mysql_engine);
-	if (option_verbose > 1)
-		ast_verbose(VERBOSE_PREFIX_2 "MySQL RealTime driver loaded.\n");
+	ast_verb(2, "MySQL RealTime driver loaded.\n");
 	ast_cli_register_multiple(cli_realtime_mysql_status, sizeof(cli_realtime_mysql_status) / sizeof(struct ast_cli_entry));
 	return 0;
 }
@@ -1392,8 +1391,7 @@
 
 	ast_cli_unregister_multiple(cli_realtime_mysql_status, sizeof(cli_realtime_mysql_status) / sizeof(struct ast_cli_entry));
 	ast_config_engine_deregister(&mysql_engine);
-	if (option_verbose > 1)
-		ast_verbose(VERBOSE_PREFIX_2 "MySQL RealTime unloaded.\n");
+	ast_verb(2, "MySQL RealTime unloaded.\n");
 
 	ast_module_user_hangup_all();
 

Modified: trunk/apps/app_rpt.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_rpt.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/apps/app_rpt.c (original)
+++ trunk/apps/app_rpt.c Tue Nov 29 12:43:16 2011
@@ -2254,8 +2254,7 @@
 static char *cs_keywords[] = {"rptena","rptdis","apena","apdis","lnkena","lnkdis","totena","totdis","skena","skdis",
 				"ufena","ufdis","atena","atdis",NULL};
 
-	if (option_verbose > 2)
-		ast_verbose(VERBOSE_PREFIX_3 "%s config for repeater %s\n",
+	ast_verb(3, "%s config for repeater %s\n",
 			(init) ? "Loading initial" : "Re-Loading",rpt_vars[n].name);
 	ast_mutex_lock(&rpt_vars[n].lock);
 	if (rpt_vars[n].cfg) ast_config_destroy(rpt_vars[n].cfg);
@@ -10411,9 +10410,8 @@
 #endif
 		l->chan->appl = "Apprpt";
 		l->chan->data = "(Remote Rx)";
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "rpt (attempt_reconnect) initiating call to %s/%s on %s\n",
-				deststr, tele, l->chan->name);
+		ast_verb(3, "rpt (attempt_reconnect) initiating call to %s/%s on %s\n",
+			deststr, tele, l->chan->name);
 		l->chan->caller.id.number.valid = 1;
 		ast_free(l->chan->caller.id.number.str);
 		l->chan->caller.id.number.str = ast_strdup(myrpt->name);
@@ -10422,9 +10420,8 @@
 	}
 	else 
 	{
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "Unable to place call to %s/%s on %s\n",
-				deststr,tele,l->chan->name);
+		ast_verb(3, "Unable to place call to %s/%s on %s\n",
+			deststr,tele,l->chan->name);
 		return -1;
 	}
 	rpt_mutex_lock(&myrpt->lock);
@@ -10848,8 +10845,7 @@
 #endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Repeater Rx)";
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "rpt (Rx) initiating call to %s/%s on %s\n",
+		ast_verb(3, "rpt (Rx) initiating call to %s/%s on %s\n",
 				tmpstr,tele,myrpt->rxchannel->name);
 		ast_call(myrpt->rxchannel,tele,999);
 		if (myrpt->rxchannel->_state != AST_STATE_UP)
@@ -10907,8 +10903,7 @@
 #endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Repeater Tx)";
-			if (option_verbose > 2)
-				ast_verbose(VERBOSE_PREFIX_3 "rpt (Tx) initiating call to %s/%s on %s\n",
+			ast_verb(3, "rpt (Tx) initiating call to %s/%s on %s\n",
 					tmpstr,tele,myrpt->txchannel->name);
 			ast_call(myrpt->txchannel,tele,999);
 			if (myrpt->rxchannel->_state != AST_STATE_UP)
@@ -13447,14 +13442,12 @@
 			chan->priority++;
 		}
 
-		if(option_verbose > 2) {
-			ast_verbose(VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n",
-				chan->context, chan->exten, chan->priority,
-				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""));
-			if(!ast_exists_extension(chan, chan->context, chan->exten, chan->priority,
-				S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
-				ast_verbose( VERBOSE_PREFIX_3 "Warning: Return Context Invalid, call will return to default|s\n");
-			}
+		ast_verb(3, "Return Context: (%s,%s,%d) ID: %s\n",
+			chan->context, chan->exten, chan->priority,
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""));
+		if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority,
+			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) {
+			ast_verb(3, "Warning: Return Context Invalid, call will return to default|s\n");
 		}
   
 		/* we are using masq_park here to protect * from touching the channel once we park it.  If the channel comes out of timeout
@@ -13462,7 +13455,7 @@
 
 		ast_masq_park_call(chan, NULL, timeout, &lot);
 
-		if (option_verbose > 2) ast_verbose( VERBOSE_PREFIX_3 "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
+		ast_verb(3, "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
 
 		snprintf(buffer, sizeof(buffer) - 1, "%d,%s", lot, template + 1);
 
@@ -13833,9 +13826,8 @@
 #endif
 		myrpt->rxchannel->appl = "Apprpt";
 		myrpt->rxchannel->data = "(Link Rx)";
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "rpt (Rx) initiating call to %s/%s on %s\n",
-				myrpt->rxchanname,tele,myrpt->rxchannel->name);
+		ast_verb(3, "rpt (Rx) initiating call to %s/%s on %s\n",
+			myrpt->rxchanname,tele,myrpt->rxchannel->name);
 		rpt_mutex_unlock(&myrpt->lock);
 		ast_call(myrpt->rxchannel,tele,999);
 		rpt_mutex_lock(&myrpt->lock);
@@ -13876,9 +13868,8 @@
 #endif
 			myrpt->txchannel->appl = "Apprpt";
 			myrpt->txchannel->data = "(Link Tx)";
-			if (option_verbose > 2)
-				ast_verbose(VERBOSE_PREFIX_3 "rpt (Tx) initiating call to %s/%s on %s\n",
-					myrpt->txchanname,tele,myrpt->txchannel->name);
+			ast_verb(3, "rpt (Tx) initiating call to %s/%s on %s\n",
+				myrpt->txchanname,tele,myrpt->txchannel->name);
 			rpt_mutex_unlock(&myrpt->lock);
 			ast_call(myrpt->txchannel,tele,999);
 			rpt_mutex_lock(&myrpt->lock);

Modified: trunk/apps/app_verbose.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_verbose.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/apps/app_verbose.c (original)
+++ trunk/apps/app_verbose.c Tue Nov 29 12:43:16 2011
@@ -103,19 +103,19 @@
 	if (option_verbose >= vsize) {
 		switch (vsize) {
 		case 0:
-			ast_verbose("%s\n", args.msg);
+			ast_verb(0, "%s\n", args.msg);
 			break;
 		case 1:
-			ast_verbose(VERBOSE_PREFIX_1 "%s\n", args.msg);
+			ast_verb(1, "%s\n", args.msg);
 			break;
 		case 2:
-			ast_verbose(VERBOSE_PREFIX_2 "%s\n", args.msg);
+			ast_verb(2, "%s\n", args.msg);
 			break;
 		case 3:
-			ast_verbose(VERBOSE_PREFIX_3 "%s\n", args.msg);
+			ast_verb(3, "%s\n", args.msg);
 			break;
 		default:
-			ast_verbose(VERBOSE_PREFIX_4 "%s\n", args.msg);
+			ast_verb(4, "%s\n", args.msg);
 		}
 	}
 

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Nov 29 12:43:16 2011
@@ -13044,16 +13044,14 @@
 		}
 		
 	} else {
-		if (option_verbose > 2)
-			ast_verbose( VERBOSE_PREFIX_3 "Destination number is CID number '%s'\n", num);
+		ast_verb(3, "Destination number is CID number '%s'\n", num);
 		ast_copy_string(destination, num, sizeof(destination));
 	}
 
 	if (!ast_strlen_zero(destination)) {
 		if (destination[strlen(destination) -1 ] == '*')
 			return 0; 
-		if (option_verbose > 2)
-			ast_verbose( VERBOSE_PREFIX_3 "Placing outgoing call to extension '%s' in context '%s' from context '%s'\n", destination, outgoing_context, chan->context);
+		ast_verb(3, "Placing outgoing call to extension '%s' in context '%s' from context '%s'\n", destination, outgoing_context, chan->context);
 		ast_copy_string(chan->exten, destination, sizeof(chan->exten));
 		ast_copy_string(chan->context, outgoing_context, sizeof(chan->context));
 		chan->priority = 0;
@@ -13388,11 +13386,11 @@
 			if (outsidecaller) {  /* only mark vm messages */
 				/* Mark Urgent */
 				if ((flag && ast_strlen_zero(flag)) || (!ast_strlen_zero(flag) && strcmp(flag, "Urgent"))) {
-					ast_verbose(VERBOSE_PREFIX_3 "marking message as Urgent\n");
+					ast_verb(3, "marking message as Urgent\n");
 					res = ast_play_and_wait(chan, "vm-marked-urgent");
 					strcpy(flag, "Urgent");
 				} else if (flag) {
-					ast_verbose(VERBOSE_PREFIX_3 "UNmarking message as Urgent\n");
+					ast_verb(3, "UNmarking message as Urgent\n");
 					res = ast_play_and_wait(chan, "vm-urgent-removed");
 					strcpy(flag, "");
 				} else {

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Nov 29 12:43:16 2011
@@ -7471,7 +7471,7 @@
 				S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, NULL))) {
 				ast_channel_lock(ast);
 				sip_pvt_lock(p);
-				ast_verbose(VERBOSE_PREFIX_2 "Redirecting '%s' to fax extension due to CNG detection\n", ast->name);
+				ast_verb(2, "Redirecting '%s' to fax extension due to CNG detection\n", ast->name);
 				pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
 				if (ast_async_goto(ast, target_context, "fax", 1)) {
 					ast_log(LOG_NOTICE, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context);
@@ -9426,7 +9426,7 @@
 						ast_channel_unlock(p->owner);
 						if (ast_exists_extension(p->owner, target_context, "fax", 1,
 							S_COR(p->owner->caller.id.number.valid, p->owner->caller.id.number.str, NULL))) {
-							ast_verbose(VERBOSE_PREFIX_2 "Redirecting '%s' to fax extension due to peer T.38 re-INVITE\n", p->owner->name);
+							ast_verb(2, "Redirecting '%s' to fax extension due to peer T.38 re-INVITE\n", p->owner->name);
 							pbx_builtin_setvar_helper(p->owner, "FAXEXTEN", p->owner->exten);
 							if (ast_async_goto(p->owner, target_context, "fax", 1)) {
 								ast_log(LOG_NOTICE, "Failed to async goto '%s' into fax of '%s'\n", p->owner->name, target_context);
@@ -14260,13 +14260,13 @@
 	manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\n", peer->name,  ast_sockaddr_stringify(&peer->addr));
 
 	/* Is this a new IP address for us? */
-	if (VERBOSITY_ATLEAST(2) && ast_sockaddr_cmp(&peer->addr, &oldsin)) {
-		ast_verbose(VERBOSE_PREFIX_3 "Registered SIP '%s' at %s\n", peer->name,
-				ast_sockaddr_stringify(&peer->addr));
+	if (ast_sockaddr_cmp(&peer->addr, &oldsin)) {
+		ast_verb(3, "Registered SIP '%s' at %s\n", peer->name,
+			ast_sockaddr_stringify(&peer->addr));
 	}
 	sip_poke_peer(peer, 0);
 	register_peer_exten(peer, 1);
-	
+
 	/* Save User agent */
 	useragent = sip_get_header(req, "User-Agent");
 	if (strcasecmp(useragent, peer->useragent)) {

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Tue Nov 29 12:43:16 2011
@@ -5927,9 +5927,9 @@
 	SKINNY_DEVONLY(if (skinnydebug > 1) {
 		ast_verb(4, "Received OFFHOOK_MESSAGE from %s, instance=%d, callid=%d\n", d->name, instance, reference);
 	})
-	
+
 	if (d->hookstate == SKINNY_OFFHOOK) {
-		ast_verbose(VERBOSE_PREFIX_3 "Got offhook message when device (%s) already offhook\n", d->name);
+		ast_verb(3, "Got offhook message when device (%s) already offhook\n", d->name);
 		return 0;
 	}
 

Modified: trunk/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_usbradio.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/channels/chan_usbradio.c (original)
+++ trunk/channels/chan_usbradio.c Tue Nov 29 12:43:16 2011
@@ -1546,8 +1546,7 @@
 			/* Check to see if duplex set (FreeBSD Bug) */
 			res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt);
 			if (res == 0 && (fmt & DSP_CAP_DUPLEX)) {
-				if (option_verbose > 1)
-					ast_verbose(VERBOSE_PREFIX_2 "Console is full duplex\n");
+				ast_verb(2, "Console is full duplex\n");
 				o->duplex = M_FULL;
 			};
 			break;

Modified: trunk/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/codec_dahdi.c?view=diff&rev=346391&r1=346390&r2=346391
==============================================================================
--- trunk/codecs/codec_dahdi.c (original)
+++ trunk/codecs/codec_dahdi.c Tue Nov 29 12:43:16 2011
@@ -603,8 +603,7 @@
 	}
 
 	for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) {
-		if (option_verbose > 1)

[... 795 lines stripped ...]



More information about the asterisk-commits mailing list