[asterisk-commits] oej: branch oej/videocaps r47924 - in /team/oej/videocaps: ./ channels/ main/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Nov 22 05:33:05 2006
New Revision: 47924

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47924
Log:
Updates

Modified:
    team/oej/videocaps/   (props changed)
    team/oej/videocaps/channels/chan_h323.c
    team/oej/videocaps/main/manager.c
    team/oej/videocaps/main/rtp.c

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 22 05:33:05 2006
@@ -1,1 +1,1 @@
-/trunk:1-47893
+/trunk:1-47923

Modified: team/oej/videocaps/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/channels/chan_h323.c?view=diff&rev=47924&r1=47923&r2=47924
==============================================================================
--- team/oej/videocaps/channels/chan_h323.c (original)
+++ team/oej/videocaps/channels/chan_h323.c Wed Nov 22 05:33:05 2006
@@ -2756,21 +2756,6 @@
 	h323_tokens_show, "Show all active call tokens",
 	show_tokens_usage };
 
-static struct ast_cli_entry cli_h323_debug_deprecated = {
-	{ "h.323", "debug", NULL },
-	h323_do_debug, "Enable H.323 debug",
-	debug_usage };
-
-static struct ast_cli_entry cli_h323_trace_deprecated = {
-	{ "h.323", "trace", NULL },
-	h323_do_trace, "Enable H.323 Stack Tracing",
-	trace_usage };
-
-static struct ast_cli_entry cli_h323_gk_cycle_deprecated = {
-	{ "h323", "cycle", "gk", NULL },
-	h323_gk_cycle, "Manually re-register with the Gatekeper",
-	show_cycle_usage };
-
 static struct ast_cli_entry cli_h323[] = {
 	{ { "h323", "set", "trace", NULL },
 	h323_do_trace, "Enable H.323 Stack Tracing",

Modified: team/oej/videocaps/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/main/manager.c?view=diff&rev=47924&r1=47923&r2=47924
==============================================================================
--- team/oej/videocaps/main/manager.c (original)
+++ team/oej/videocaps/main/manager.c Wed Nov 22 05:33:05 2006
@@ -1981,6 +1981,10 @@
 		return 0;
 	}
 
+	if (!s->authenticated && strcasecmp(action, "Login") && strcasecmp(action, "Logoff") && strcasecmp(action, "Challenge")) {
+		astman_send_error(s, m, "Permission denied");
+		return 0;
+	}
 	/* XXX should we protect the list navigation ? */
 	for (tmp = first_action ; tmp; tmp = tmp->next) {
 		if (!strcasecmp(action, tmp->action)) {

Modified: team/oej/videocaps/main/rtp.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/main/rtp.c?view=diff&rev=47924&r1=47923&r2=47924
==============================================================================
--- team/oej/videocaps/main/rtp.c (original)
+++ team/oej/videocaps/main/rtp.c Wed Nov 22 05:33:05 2006
@@ -1729,7 +1729,7 @@
 			if (isAstFormat &&
 			    (code == AST_FORMAT_G726_AAL2) &&
 			    (options & AST_RTP_OPT_G726_NONSTANDARD))
-				return "AAL2-G726-32";
+				return "G726-32";
 			else
 				return mimeTypes[i].subtype;
 		}