[asterisk-commits] rmudgett: branch rmudgett/misdn_facility r187718 - in /team/rmudgett/misdn_fa...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Apr 10 11:29:17 CDT 2009
Author: rmudgett
Date: Fri Apr 10 11:29:14 2009
New Revision: 187718
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187718
Log:
Merged revisions 187634-187636,187673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r187634 | rmudgett | 2009-04-10 09:50:42 -0500 (Fri, 10 Apr 2009) | 1 line
Make chan_misdn_log() avoid generating the log message if logging is disabled.
........
r187635 | rmudgett | 2009-04-10 09:53:59 -0500 (Fri, 10 Apr 2009) | 7 lines
Miscellaneous minor changes to chan_misdn.
* Miscellaneous spacing and comment changes.
* Minor code rearangements.
* Miscellaneous doxygen comments.
........
r187636 | kpfleming | 2009-04-10 10:11:16 -0500 (Fri, 10 Apr 2009) | 3 lines
revert addition of LOG_SECURITY log channel; after further discussion, a much better solution will be used
........
r187673 | dvossel | 2009-04-10 10:49:16 -0500 (Fri, 10 Apr 2009) | 2 lines
Even more changes concerning r187426. Revised where locks are placed yet once again. ast_call() should not be called with a channel locked. could cause deadlock issues with local channels.
........
Modified:
team/rmudgett/misdn_facility/ (props changed)
team/rmudgett/misdn_facility/apps/app_dial.c
team/rmudgett/misdn_facility/apps/app_verbose.c
team/rmudgett/misdn_facility/channels/chan_misdn.c
team/rmudgett/misdn_facility/channels/misdn/isdn_lib.c
team/rmudgett/misdn_facility/configs/logger.conf.sample
team/rmudgett/misdn_facility/include/asterisk/logger.h
team/rmudgett/misdn_facility/main/logger.c
Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
automerge = *
Propchange: team/rmudgett/misdn_facility/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 10 11:29:14 2009
@@ -1,1 +1,1 @@
-/trunk:1-187623
+/trunk:1-187673
Modified: team/rmudgett/misdn_facility/apps/app_dial.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/apps/app_dial.c?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/apps/app_dial.c (original)
+++ team/rmudgett/misdn_facility/apps/app_dial.c Fri Apr 10 11:29:14 2009
@@ -790,9 +790,10 @@
ast_clear_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE);
+ ast_channel_unlock(in);
+ ast_channel_unlock(c);
+
if (ast_call(c, tmpchan, 0)) {
- ast_channel_unlock(in);
- ast_channel_unlock(c);
ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
ast_clear_flag64(o, DIAL_STILLGOING);
ast_hangup(original);
@@ -800,6 +801,10 @@
c = o->chan = NULL;
num->nochan++;
} else {
+ ast_channel_lock(c);
+ while (ast_channel_trylock(in)) {
+ CHANNEL_DEADLOCK_AVOIDANCE(c);
+ }
senddialevent(in, c, stuff);
if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) {
char cidname[AST_MAX_EXTENSION] = "";
Modified: team/rmudgett/misdn_facility/apps/app_verbose.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/apps/app_verbose.c?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/apps/app_verbose.c (original)
+++ team/rmudgett/misdn_facility/apps/app_verbose.c Fri Apr 10 11:29:14 2009
@@ -59,7 +59,7 @@
<syntax>
<parameter name="level">
<para>Level must be one of <literal>ERROR</literal>, <literal>WARNING</literal>, <literal>NOTICE</literal>,
- <literal>DEBUG</literal>, <literal>VERBOSE</literal>, <literal>DTMF</literal> or <literal>SECURITY</literal>.</para>
+ <literal>DEBUG</literal>, <literal>VERBOSE</literal> or <literal>DTMF</literal>.</para>
</parameter>
<parameter name="message" required="true">
<para>Output text message.</para>
@@ -146,8 +146,6 @@
lnum = __LOG_VERBOSE;
} else if (!strcasecmp(args.level, "DTMF")) {
lnum = __LOG_DTMF;
- } else if (!strcasecmp(args.level, "SECURITY")) {
- lnum = __LOG_SECURITY;
} else if (!strcasecmp(args.level, "EVENT")) {
lnum = __LOG_EVENT;
} else {
Modified: team/rmudgett/misdn_facility/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/chan_misdn.c?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/channels/chan_misdn.c (original)
+++ team/rmudgett/misdn_facility/channels/chan_misdn.c Fri Apr 10 11:29:14 2009
@@ -10580,7 +10580,6 @@
ast_custom_function_register(&misdn_cc_function);
#endif /* defined(AST_MISDN_ENHANCEMENTS) */
-
misdn_cfg_get(0, MISDN_GEN_TRACEFILE, global_tracefile, sizeof(global_tracefile));
/* start the l1 watchers */
@@ -11759,7 +11758,7 @@
char buf[1024];
char port_buf[8];
- if (! ((0 <= port) && (port <= max_ports))) {
+ if (!(0 <= port && port <= max_ports)) {
ast_log(LOG_WARNING, "cb_log called with out-of-range port number! (%d)\n", port);
port = 0;
level = -1;
Modified: team/rmudgett/misdn_facility/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/channels/misdn/isdn_lib.c?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/channels/misdn/isdn_lib.c (original)
+++ team/rmudgett/misdn_facility/channels/misdn/isdn_lib.c Fri Apr 10 11:29:14 2009
@@ -1499,7 +1499,7 @@
return stack;
}
-static struct misdn_stack * find_stack_by_mgr(manager_t* mgr_nt)
+static struct misdn_stack *find_stack_by_mgr(manager_t *mgr_nt)
{
struct misdn_stack *stack;
@@ -1530,7 +1530,7 @@
}
}
#endif /* defined(AST_MISDN_ENHANCEMENTS) */
- return stack_holder_find(stack,l3id);
+ return stack_holder_find(stack, l3id);
}
@@ -1551,7 +1551,7 @@
}
}
#endif /* defined(AST_MISDN_ENHANCEMENTS) */
- return stack_holder_find(stack,l3id);
+ return stack_holder_find(stack, l3id);
}
static struct misdn_bchannel *find_bc_holded(struct misdn_stack *stack)
Modified: team/rmudgett/misdn_facility/configs/logger.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/configs/logger.conf.sample?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/configs/logger.conf.sample (original)
+++ team/rmudgett/misdn_facility/configs/logger.conf.sample Fri Apr 10 11:29:14 2009
@@ -70,7 +70,6 @@
; error
; verbose
; dtmf
-; security
;
; Special filename "console" represents the system console
;
@@ -90,7 +89,6 @@
;console => notice,warning,error,debug
messages => notice,warning,error
;full => notice,warning,error,debug,verbose
-security => security
;syslog keyword : This special keyword logs to syslog facility
;
Modified: team/rmudgett/misdn_facility/include/asterisk/logger.h
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/include/asterisk/logger.h?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/include/asterisk/logger.h (original)
+++ team/rmudgett/misdn_facility/include/asterisk/logger.h Fri Apr 10 11:29:14 2009
@@ -189,18 +189,7 @@
#endif
#define AST_LOG_DTMF __LOG_DTMF, _A_
-#ifdef LOG_SECURITY
-#undef LOG_SECURITY
-#endif
-#define __LOG_SECURITY 7
-#define LOG_SECURITY __LOG_SECURITY, _A_
-
-#ifdef AST_LOG_SECURITY
-#undef AST_LOG_SECURITY
-#endif
-#define AST_LOG_SECURITY __LOG_SECURITY, _A_
-
-#define NUMLOGLEVELS 7
+#define NUMLOGLEVELS 6
/*!
* \brief Get the debug level for a file
Modified: team/rmudgett/misdn_facility/main/logger.c
URL: http://svn.digium.com/svn-view/asterisk/team/rmudgett/misdn_facility/main/logger.c?view=diff&rev=187718&r1=187717&r2=187718
==============================================================================
--- team/rmudgett/misdn_facility/main/logger.c (original)
+++ team/rmudgett/misdn_facility/main/logger.c Fri Apr 10 11:29:14 2009
@@ -162,8 +162,7 @@
"WARNING",
"ERROR",
"VERBOSE",
- "DTMF",
- "SECURITY",
+ "DTMF"
};
/*! \brief Colors used in the console for logging */
@@ -205,8 +204,6 @@
res |= (1 << __LOG_VERBOSE);
else if (!strcasecmp(w, "dtmf"))
res |= (1 << __LOG_DTMF);
- else if (!strcasecmp(w, "security"))
- res |= (1 << __LOG_SECURITY);
else {
fprintf(stderr, "Logfile Warning: Unknown keyword '%s' at line %d of logger.conf\n", w, lineno);
}
@@ -359,7 +356,7 @@
if (!(chan = ast_calloc(1, sizeof(*chan))))
return;
chan->type = LOGTYPE_CONSOLE;
- chan->logmask = (1 << __LOG_WARNING) | (1 << __LOG_NOTICE) | (1 << __LOG_ERROR);
+ chan->logmask = 28; /*warning,notice,error */
if (!locked)
AST_RWLIST_WRLOCK(&logchannels);
AST_RWLIST_INSERT_HEAD(&logchannels, chan, list);
@@ -805,8 +802,6 @@
ast_cli(a->fd, "Debug ");
if (chan->logmask & (1 << __LOG_DTMF))
ast_cli(a->fd, "DTMF ");
- if (chan->logmask & (1 << __LOG_SECURITY))
- ast_cli(a->fd, "Security ");
if (chan->logmask & (1 << __LOG_VERBOSE))
ast_cli(a->fd, "Verbose ");
if (chan->logmask & (1 << __LOG_WARNING))
More information about the asterisk-commits
mailing list