[asterisk-commits] branch oej/metermaids-trunk r36019 - in /team/oej/metermaids-trunk: ./ apps/ ...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Jun 26 08:18:34 2006
New Revision: 36019

URL: http://svn.digium.com/view/asterisk?rev=36019&view=rev
Log:
Forced update

Modified:
    team/oej/metermaids-trunk/   (props changed)
    team/oej/metermaids-trunk/apps/app_dumpchan.c
    team/oej/metermaids-trunk/channels/chan_sip.c

Propchange: team/oej/metermaids-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 26 08:18:34 2006
@@ -1,1 +1,1 @@
-/trunk:1-35965
+/trunk:1-36018

Modified: team/oej/metermaids-trunk/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/apps/app_dumpchan.c?rev=36019&r1=36018&r2=36019&view=diff
==============================================================================
--- team/oej/metermaids-trunk/apps/app_dumpchan.c (original)
+++ team/oej/metermaids-trunk/apps/app_dumpchan.c Mon Jun 26 08:18:34 2006
@@ -50,25 +50,25 @@
 static char *app = "DumpChan";
 static char *synopsis = "Dump Info About The Calling Channel";
 static char *desc = 
-"   DumpChan([<min_verbose_level>])\n"
-"Displays information on channel and listing of all channel\n"
-"variables. If min_verbose_level is specified, output is only\n"
-"displayed when the verbose level is currently set to that number\n"
-"or greater. \n";
+	"   DumpChan([<min_verbose_level>])\n"
+	"Displays information on channel and listing of all channel\n"
+	"variables. If min_verbose_level is specified, output is only\n"
+	"displayed when the verbose level is currently set to that number\n"
+	"or greater. \n";
 
 LOCAL_USER_DECL;
 
-static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
+static int serialize_showchan(struct ast_channel *c, char *buf, size_t size)
 {
 	struct timeval now;
-	long elapsed_seconds=0;
-	int hour=0, min=0, sec=0;
+	long elapsed_seconds = 0;
+	int hour = 0, min = 0, sec = 0;
 	char cgrp[BUFSIZ/2];
 	char pgrp[BUFSIZ/2];
 	char formatbuf[BUFSIZ/2];
 	
 	now = ast_tvnow();
-	memset(buf,0,size);
+	memset(buf, 0, size);
 	if (!c)
 		return 0;
 
@@ -135,27 +135,25 @@
 
 static int dumpchan_exec(struct ast_channel *chan, void *data)
 {
-	int res=0;
 	struct localuser *u;
-	char vars[1024];
+	char vars[BUFSIZ * 4];
 	char info[1024];
 	int level = 0;
 	static char *line = "================================================================================";
 	
 	LOCAL_USER_ADD(u);
 
-	if (!ast_strlen_zero(data)) {
+	if (!ast_strlen_zero(data)) 
 		level = atoi(data);
-	}
 
 	pbx_builtin_serialize_variables(chan, vars, sizeof(vars));
-	ast_serialize_showchan(chan, info, sizeof(info));
+	serialize_showchan(chan, info, sizeof(info));
 	if (option_verbose >= level)
-		ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n",chan->name, line, info, vars, line);
+		ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n", chan->name, line, info, vars, line);
 
 	LOCAL_USER_REMOVE(u);
 	
-	return res;
+	return 0;
 }
 
 static int unload_module(void *mod)

Modified: team/oej/metermaids-trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids-trunk/channels/chan_sip.c?rev=36019&r1=36018&r2=36019&view=diff
==============================================================================
--- team/oej/metermaids-trunk/channels/chan_sip.c (original)
+++ team/oej/metermaids-trunk/channels/chan_sip.c Mon Jun 26 08:18:34 2006
@@ -1614,8 +1614,12 @@
 				break;
 			}
 		}
-		if (!found && option_debug > 2 && sipdebug)
-			ast_log(LOG_DEBUG, "Found no match for SIP option: %s (Please file bug report!)\n", next);
+		if (!found && option_debug > 2 && sipdebug) {
+			if (!strncasecmp(next, "x-", 2))
+				ast_log(LOG_DEBUG, "Found private SIP option, not supported: %s\n", next);
+			else
+				ast_log(LOG_DEBUG, "Found no match for SIP option: %s (Please file bug report!)\n", next);
+		}
 	}
 
 	if (pvt)