[asterisk-commits] russell: branch group/bindings r200840 - in /team/group/bindings: ./ apps/ au...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jun 16 06:57:15 CDT 2009


Author: russell
Date: Tue Jun 16 06:57:03 2009
New Revision: 200840

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200840
Log:
resolve, reset

Modified:
    team/group/bindings/   (props changed)
    team/group/bindings/CHANGES
    team/group/bindings/Makefile
    team/group/bindings/apps/app_externalivr.c
    team/group/bindings/apps/app_fax.c
    team/group/bindings/apps/app_macro.c
    team/group/bindings/apps/app_minivm.c
    team/group/bindings/apps/app_mixmonitor.c
    team/group/bindings/apps/app_page.c
    team/group/bindings/apps/app_queue.c
    team/group/bindings/apps/app_read.c
    team/group/bindings/apps/app_readexten.c
    team/group/bindings/apps/app_skel.c
    team/group/bindings/apps/app_sms.c
    team/group/bindings/apps/app_stack.c
    team/group/bindings/apps/app_url.c
    team/group/bindings/apps/app_voicemail.c
    team/group/bindings/autoconf/ast_gcc_attribute.m4
    team/group/bindings/build_tools/menuselect-deps.in
    team/group/bindings/cdr/cdr_manager.c
    team/group/bindings/channels/chan_agent.c
    team/group/bindings/channels/chan_dahdi.c
    team/group/bindings/channels/chan_h323.c
    team/group/bindings/channels/chan_iax2.c
    team/group/bindings/channels/chan_misdn.c
    team/group/bindings/channels/chan_sip.c
    team/group/bindings/channels/chan_skinny.c
    team/group/bindings/configs/chan_dahdi.conf.sample
    team/group/bindings/configure
    team/group/bindings/configure.ac
    team/group/bindings/doc/CODING-GUIDELINES
    team/group/bindings/doc/tex/channelvariables.tex
    team/group/bindings/formats/format_wav_gsm.c
    team/group/bindings/funcs/func_cdr.c
    team/group/bindings/funcs/func_channel.c
    team/group/bindings/funcs/func_curl.c
    team/group/bindings/funcs/func_cut.c
    team/group/bindings/funcs/func_enum.c
    team/group/bindings/funcs/func_lock.c
    team/group/bindings/funcs/func_odbc.c
    team/group/bindings/funcs/func_realtime.c
    team/group/bindings/funcs/func_vmcount.c
    team/group/bindings/include/asterisk/agi.h
    team/group/bindings/include/asterisk/app.h
    team/group/bindings/include/asterisk/autoconfig.h.in
    team/group/bindings/include/asterisk/calendar.h
    team/group/bindings/include/asterisk/compiler.h
    team/group/bindings/include/asterisk/monitor.h
    team/group/bindings/include/asterisk/optional_api.h
    team/group/bindings/include/asterisk/smdi.h
    team/group/bindings/main/Makefile
    team/group/bindings/main/cli.c
    team/group/bindings/main/db.c
    team/group/bindings/main/devicestate.c
    team/group/bindings/main/event.c
    team/group/bindings/main/features.c
    team/group/bindings/main/file.c
    team/group/bindings/main/http.c
    team/group/bindings/main/image.c
    team/group/bindings/main/loader.c
    team/group/bindings/main/logger.c
    team/group/bindings/main/manager.c
    team/group/bindings/main/xmldoc.c
    team/group/bindings/pbx/pbx_dundi.c
    team/group/bindings/pbx/pbx_lua.c
    team/group/bindings/pbx/pbx_realtime.c
    team/group/bindings/res/res_agi.c
    team/group/bindings/res/res_agi.exports
    team/group/bindings/res/res_calendar.c
    team/group/bindings/res/res_calendar_caldav.c
    team/group/bindings/res/res_calendar_exchange.c
    team/group/bindings/res/res_calendar_icalendar.c
    team/group/bindings/res/res_config_pgsql.c
    team/group/bindings/res/res_jabber.c
    team/group/bindings/res/res_monitor.c
    team/group/bindings/res/res_monitor.exports
    team/group/bindings/res/res_smdi.c
    team/group/bindings/res/res_smdi.exports
    team/group/bindings/res/res_snmp.c

Propchange: team/group/bindings/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/bindings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 16 06:57:03 2009
@@ -1,1 +1,1 @@
-/trunk:1-200437
+/trunk:1-200839

Modified: team/group/bindings/CHANGES
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/CHANGES?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/CHANGES (original)
+++ team/group/bindings/CHANGES Tue Jun 16 06:57:03 2009
@@ -27,6 +27,12 @@
    'rpid' and 'pai'. Setting sendrpid to 'rpid' will cause Remote-Party-ID
    header to be sent (equivalent to setting sendrpid=yes) and setting
    sendrpid to 'pai' will cause P-Asserted-Identity header to be sent.
+ * The 'ignoresdpversion' behavior has been made automatic when the SDP received
+   is in response to a T.38 re-INVITE that Asterisk initiated. In this situation,
+   since the call will fail if Asterisk does not process the incoming SDP, Asterisk
+   will accept the SDP even if the SDP version number is not properly incremented,
+   but will generate a warning in the log indicating that the SIP peer that sent
+   the SDP should have the 'ignoresdpversion' option set.
 
 Applications
 ------------

Modified: team/group/bindings/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/Makefile?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/Makefile (original)
+++ team/group/bindings/Makefile Tue Jun 16 06:57:03 2009
@@ -310,7 +310,7 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
-  SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+  SOLINK=-bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
   SOLINK=-shared

Modified: team/group/bindings/apps/app_externalivr.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_externalivr.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_externalivr.c (original)
+++ team/group/bindings/apps/app_externalivr.c Tue Jun 16 06:57:03 2009
@@ -95,11 +95,11 @@
 /* XXX the parser in gcc 2.95 gets confused if you don't put a space between 'name' and the comma */
 #define ast_chan_log(level, channel, format, ...) ast_log(level, "%s: " format, channel->name , ## __VA_ARGS__)
 
-enum {
+enum options_flags {
 	noanswer = (1 << 0),
 	ignore_hangup = (1 << 1),
 	run_dead = (1 << 2),
-} options_flags;
+};
 
 AST_APP_OPTIONS(app_opts, {
 	AST_APP_OPTION('n', noanswer),

Modified: team/group/bindings/apps/app_fax.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_fax.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_fax.c (original)
+++ team/group/bindings/apps/app_fax.c Tue Jun 16 06:57:03 2009
@@ -351,7 +351,7 @@
 	return 0;
 }
 
-struct ast_generator generator = {
+static struct ast_generator generator = {
 	alloc:		fax_generator_alloc,
 	generate: 	fax_generator_generate,
 };

Modified: team/group/bindings/apps/app_macro.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_macro.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_macro.c (original)
+++ team/group/bindings/apps/app_macro.c Tue Jun 16 06:57:03 2009
@@ -159,7 +159,7 @@
 
 static void macro_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
 
-struct ast_datastore_info macro_ds_info = {
+static struct ast_datastore_info macro_ds_info = {
 	.type = "MACRO",
 	.chan_fixup = macro_fixup,
 };

Modified: team/group/bindings/apps/app_minivm.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_minivm.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_minivm.c (original)
+++ team/group/bindings/apps/app_minivm.c Tue Jun 16 06:57:03 2009
@@ -548,19 +548,19 @@
 
 
 
-enum {
+enum minivm_option_flags {
 	OPT_SILENT =	   (1 << 0),
 	OPT_BUSY_GREETING =    (1 << 1),
 	OPT_UNAVAIL_GREETING = (1 << 2),
 	OPT_TEMP_GREETING = (1 << 3),
 	OPT_NAME_GREETING = (1 << 4),
 	OPT_RECORDGAIN =  (1 << 5),
-} minivm_option_flags;
-
-enum {
+};
+
+enum minivm_option_args {
 	OPT_ARG_RECORDGAIN = 0,
 	OPT_ARG_ARRAY_SIZE = 1,
-} minivm_option_args;
+};
 
 AST_APP_OPTIONS(minivm_app_options, {
 	AST_APP_OPTION('s', OPT_SILENT),
@@ -670,7 +670,7 @@
 AST_MUTEX_DEFINE_STATIC(minivmlock);	/*!< Lock to protect voicemail system */
 AST_MUTEX_DEFINE_STATIC(minivmloglock);	/*!< Lock to protect voicemail system log file */
 
-FILE *minivmlogfile;			/*!< The minivm log file */
+static FILE *minivmlogfile;		/*!< The minivm log file */
 
 static int global_vmminmessage;		/*!< Minimum duration of messages */
 static int global_vmmaxmessage;		/*!< Maximum duration of message */

Modified: team/group/bindings/apps/app_mixmonitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_mixmonitor.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_mixmonitor.c (original)
+++ team/group/bindings/apps/app_mixmonitor.c Tue Jun 16 06:57:03 2009
@@ -132,8 +132,6 @@
 
 static const char * const stop_app = "StopMixMonitor";
 
-struct module_symbols *me;
-
 static const char * const mixmonitor_spy_type = "MixMonitor";
 
 struct mixmonitor {
@@ -145,20 +143,20 @@
 	struct ast_autochan *autochan;
 };
 
-enum {
+enum mixmonitor_flags {
 	MUXFLAG_APPEND = (1 << 1),
 	MUXFLAG_BRIDGED = (1 << 2),
 	MUXFLAG_VOLUME = (1 << 3),
 	MUXFLAG_READVOLUME = (1 << 4),
 	MUXFLAG_WRITEVOLUME = (1 << 5),
-} mixmonitor_flags;
-
-enum {
+};
+
+enum mixmonitor_args {
 	OPT_ARG_READVOLUME = 0,
 	OPT_ARG_WRITEVOLUME,
 	OPT_ARG_VOLUME,
 	OPT_ARG_ARRAY_SIZE,
-} mixmonitor_args;
+};
 
 AST_APP_OPTIONS(mixmonitor_opts, {
 	AST_APP_OPTION('a', MUXFLAG_APPEND),

Modified: team/group/bindings/apps/app_page.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_page.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_page.c (original)
+++ team/group/bindings/apps/app_page.c Tue Jun 16 06:57:03 2009
@@ -101,13 +101,13 @@
  ***/
 static const char * const app_page= "Page";
 
-enum {
+enum page_opt_flags {
 	PAGE_DUPLEX = (1 << 0),
 	PAGE_QUIET = (1 << 1),
 	PAGE_RECORD = (1 << 2),
 	PAGE_SKIP = (1 << 3),
 	PAGE_IGNORE_FORWARDS = (1 << 4),
-} page_opt_flags;
+};
 
 AST_APP_OPTIONS(page_opts, {
 	AST_APP_OPTION('d', PAGE_DUPLEX),

Modified: team/group/bindings/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_queue.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_queue.c (original)
+++ team/group/bindings/apps/app_queue.c Tue Jun 16 06:57:03 2009
@@ -977,7 +977,7 @@
 	AST_LIST_ENTRY(rule_list) list;
 };
 
-AST_LIST_HEAD_STATIC(rule_lists, rule_list);
+static AST_LIST_HEAD_STATIC(rule_lists, rule_list);
 
 static struct ao2_container *queues;
 
@@ -4256,18 +4256,16 @@
 				else
 					which = peer;
 				ast_channel_unlock(qe->chan);
-				if (ast_monitor_start) {
-					if (monitorfilename) {
-						ast_monitor_start(which, qe->parent->monfmt, monitorfilename, 1, X_REC_IN | X_REC_OUT);
-					} else if (qe->chan->cdr && ast_monitor_start) {
-						ast_monitor_start(which, qe->parent->monfmt, qe->chan->cdr->uniqueid, 1, X_REC_IN | X_REC_OUT);
-					} else if (ast_monitor_start) {
-						/* Last ditch effort -- no CDR, make up something */
-						snprintf(tmpid, sizeof(tmpid), "chan-%lx", ast_random());
-						ast_monitor_start(which, qe->parent->monfmt, tmpid, 1, X_REC_IN | X_REC_OUT);
-					}
+				if (monitorfilename) {
+					ast_monitor_start(which, qe->parent->monfmt, monitorfilename, 1, X_REC_IN | X_REC_OUT);
+				} else if (qe->chan->cdr) {
+					ast_monitor_start(which, qe->parent->monfmt, qe->chan->cdr->uniqueid, 1, X_REC_IN | X_REC_OUT);
+				} else {
+					/* Last ditch effort -- no CDR, make up something */
+					snprintf(tmpid, sizeof(tmpid), "chan-%lx", ast_random());
+					ast_monitor_start(which, qe->parent->monfmt, tmpid, 1, X_REC_IN | X_REC_OUT);
 				}
-				if (!ast_strlen_zero(monexec) && ast_monitor_setjoinfiles) {
+				if (!ast_strlen_zero(monexec)) {
 					ast_monitor_setjoinfiles(which, 1);
 				}
 			} else {

Modified: team/group/bindings/apps/app_read.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_read.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_read.c (original)
+++ team/group/bindings/apps/app_read.c Tue Jun 16 06:57:03 2009
@@ -108,11 +108,11 @@
 	</application>
  ***/
 
-enum {
+enum read_option_flags {
 	OPT_SKIP = (1 << 0),
 	OPT_INDICATION = (1 << 1),
 	OPT_NOANSWER = (1 << 2),
-} read_option_flags;
+};
 
 AST_APP_OPTIONS(read_app_options, {
 	AST_APP_OPTION('s', OPT_SKIP),

Modified: team/group/bindings/apps/app_readexten.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_readexten.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_readexten.c (original)
+++ team/group/bindings/apps/app_readexten.c Tue Jun 16 06:57:03 2009
@@ -111,11 +111,11 @@
 	</function>
  ***/
 
-enum {
+enum readexten_option_flags {
 	OPT_SKIP = (1 << 0),
 	OPT_INDICATION = (1 << 1),
 	OPT_NOANSWER = (1 << 2),
-} readexten_option_flags;
+};
 
 AST_APP_OPTIONS(readexten_app_options, {
 	AST_APP_OPTION('s', OPT_SKIP),

Modified: team/group/bindings/apps/app_skel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_skel.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_skel.c (original)
+++ team/group/bindings/apps/app_skel.c Tue Jun 16 06:57:03 2009
@@ -74,18 +74,18 @@
 
 static char *app = "Skel";
 
-enum {
+enum option_flags {
 	OPTION_A = (1 << 0),
 	OPTION_B = (1 << 1),
 	OPTION_C = (1 << 2),
-} option_flags;
+};
 
-enum {
+enum option_args {
 	OPTION_ARG_B = 0,
 	OPTION_ARG_C = 1,
 	/* This *must* be the last value in this enum! */
 	OPTION_ARG_ARRAY_SIZE = 2,
-} option_args;
+};
 
 AST_APP_OPTIONS(app_opts,{
 	AST_APP_OPTION('a', OPTION_A),

Modified: team/group/bindings/apps/app_sms.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_sms.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_sms.c (original)
+++ team/group/bindings/apps/app_sms.c Tue Jun 16 06:57:03 2009
@@ -1832,19 +1832,19 @@
  *	- AST_APP_OPTIONS() to drive the parsing routine
  *	- in the function, AST_DECLARE_APP_ARGS(...) for the arguments.
  */
-enum {
+enum sms_flags {
 	OPTION_BE_SMSC	= (1 << 0),             /* act as sms center */
 	OPTION_ANSWER	= (1 << 1),             /* answer on incoming calls */
 	OPTION_TWO	= (1 << 2),                 /* Use Protocol Two */
 	OPTION_PAUSE	= (1 << 3),             /* pause before sending data, in ms */
 	OPTION_SRR	= (1 << 4),                 /* set srr */
 	OPTION_DCS	= (1 << 5),                 /* set dcs */
-} sms_flags;
-
-enum {
+};
+
+enum sms_opt_args {
 	OPTION_ARG_PAUSE = 0,
 	OPTION_ARG_ARRAY_SIZE
-} sms_opt_args;
+};
 
 AST_APP_OPTIONS(sms_options, {
 	AST_APP_OPTION('s', OPTION_BE_SMSC),

Modified: team/group/bindings/apps/app_stack.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_stack.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_stack.c (original)
+++ team/group/bindings/apps/app_stack.c Tue Jun 16 06:57:03 2009
@@ -642,14 +642,12 @@
 	return RESULT_SUCCESS;
 }
 
-struct agi_command gosub_agi_command =
+static struct agi_command gosub_agi_command =
 	{ { "gosub", NULL }, handle_gosub, NULL, NULL, 0 };
 
 static int unload_module(void)
 {
-	if (ast_agi_unregister) {
-		 ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
-	}
+	ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
 
 	ast_unregister_application(app_return);
 	ast_unregister_application(app_pop);
@@ -663,9 +661,7 @@
 
 static int load_module(void)
 {
-	if (ast_agi_register) {
-		 ast_agi_register(ast_module_info->self, &gosub_agi_command);
-	}
+	ast_agi_register(ast_module_info->self, &gosub_agi_command);
 
 	ast_register_application_xml(app_pop, pop_exec);
 	ast_register_application_xml(app_return, return_exec);

Modified: team/group/bindings/apps/app_url.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_url.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_url.c (original)
+++ team/group/bindings/apps/app_url.c Tue Jun 16 06:57:03 2009
@@ -82,9 +82,9 @@
 
 static char *app = "SendURL";
 
-enum {
+enum option_flags {
 	OPTION_WAIT = (1 << 0),
-} option_flags;
+};
 
 AST_APP_OPTIONS(app_opts,{
 	AST_APP_OPTION('w', OPTION_WAIT),

Modified: team/group/bindings/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/apps/app_voicemail.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/apps/app_voicemail.c (original)
+++ team/group/bindings/apps/app_voicemail.c Tue Jun 16 06:57:03 2009
@@ -425,16 +425,16 @@
 #define ERROR_LOCK_PATH  -100
 
 
-enum {
+enum vm_box {
 	NEW_FOLDER,
 	OLD_FOLDER,
 	WORK_FOLDER,
 	FAMILY_FOLDER,
 	FRIENDS_FOLDER,
 	GREETINGS_FOLDER
-} vm_box;
-
-enum {
+};
+
+enum vm_option_flags {
 	OPT_SILENT =           (1 << 0),
 	OPT_BUSY_GREETING =    (1 << 1),
 	OPT_UNAVAIL_GREETING = (1 << 2),
@@ -444,15 +444,15 @@
 	OPT_DTMFEXIT =         (1 << 7),
 	OPT_MESSAGE_Urgent =   (1 << 8),
 	OPT_MESSAGE_PRIORITY = (1 << 9)
-} vm_option_flags;
-
-enum {
+};
+
+enum vm_option_args {
 	OPT_ARG_RECORDGAIN = 0,
 	OPT_ARG_PLAYFOLDER = 1,
 	OPT_ARG_DTMFEXIT   = 2,
 	/* This *must* be the last value in this enum! */
 	OPT_ARG_ARRAY_SIZE = 3,
-} vm_option_args;
+};
 
 AST_APP_OPTIONS(vm_app_options, {
 	AST_APP_OPTION('s', OPT_SILENT),
@@ -10699,10 +10699,10 @@
 		if ((val = ast_variable_retrieve(cfg, "general", "smdienable")) && ast_true(val)) {
 			ast_debug(1, "Enabled SMDI voicemail notification\n");
 			if ((val = ast_variable_retrieve(cfg, "general", "smdiport"))) {
-				smdi_iface = ast_smdi_interface_find ? ast_smdi_interface_find(val) : NULL;
+				smdi_iface = ast_smdi_interface_find(val);
 			} else {
 				ast_debug(1, "No SMDI interface set, trying default (/dev/ttyS0)\n");
-				smdi_iface = ast_smdi_interface_find ? ast_smdi_interface_find("/dev/ttyS0") : NULL;
+				smdi_iface = ast_smdi_interface_find("/dev/ttyS0");
 			}
 			if (!smdi_iface) {
 				ast_log(AST_LOG_ERROR, "No valid SMDI interface specfied, disabling SMDI voicemail notification\n");

Modified: team/group/bindings/autoconf/ast_gcc_attribute.m4
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/autoconf/ast_gcc_attribute.m4?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/autoconf/ast_gcc_attribute.m4 (original)
+++ team/group/bindings/autoconf/ast_gcc_attribute.m4 Tue Jun 16 06:57:03 2009
@@ -5,12 +5,12 @@
 [
 AC_MSG_CHECKING(for compiler 'attribute $1' support)
 saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS -Wall -Wno-unused -Werror"
 
 if test "x$2" = "x"
 then
 AC_COMPILE_IFELSE(
-	AC_LANG_PROGRAM([void __attribute__(($1)) *test(void *muffin, ...) {}],
+	AC_LANG_PROGRAM([static void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}],
 			[]),
 	AC_MSG_RESULT(yes)
 	AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),
@@ -18,7 +18,7 @@
 )
 else
 AC_COMPILE_IFELSE(
-	AC_LANG_PROGRAM([void __attribute__(($2)) *test(void *muffin, ...) {}],
+	AC_LANG_PROGRAM([static void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
 			[]),
 	AC_MSG_RESULT(yes)
 	AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]),

Modified: team/group/bindings/build_tools/menuselect-deps.in
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/build_tools/menuselect-deps.in?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/build_tools/menuselect-deps.in (original)
+++ team/group/bindings/build_tools/menuselect-deps.in Tue Jun 16 06:57:03 2009
@@ -37,6 +37,7 @@
 PORTAUDIO=@PBX_PORTAUDIO@
 PRI=@PBX_PRI@
 PYTHON=@PBX_PYTHON@
+OPENR2=@PBX_OPENR2@
 RESAMPLE=@PBX_RESAMPLE@
 AIS=@PBX_AIS@
 RADIUS=@PBX_RADIUS@

Modified: team/group/bindings/cdr/cdr_manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/cdr/cdr_manager.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/cdr/cdr_manager.c (original)
+++ team/group/bindings/cdr/cdr_manager.c Tue Jun 16 06:57:03 2009
@@ -46,7 +46,7 @@
 static char *name = "cdr_manager";
 
 static int enablecdr = 0;
-struct ast_str *customfields;
+static struct ast_str *customfields;
 
 static int manager_log(struct ast_cdr *cdr);
 

Modified: team/group/bindings/channels/chan_agent.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_agent.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_agent.c (original)
+++ team/group/bindings/channels/chan_agent.c Tue Jun 16 06:57:03 2009
@@ -2283,7 +2283,7 @@
 	return 0;
 }
 
-struct ast_custom_function agent_function = {
+static struct ast_custom_function agent_function = {
 	.name = "AGENT",
 	.read = function_agent,
 };

Modified: team/group/bindings/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_dahdi.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_dahdi.c (original)
+++ team/group/bindings/channels/chan_dahdi.c Tue Jun 16 06:57:03 2009
@@ -583,6 +583,9 @@
 	int max_ani;
 	int max_dnis;
 	int get_ani_first:1;
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
+	int skip_category_request:1;
+#endif
 	int call_files:1;
 	int allow_collect_calls:1;
 	int charge_calls:1;
@@ -1418,6 +1421,9 @@
 			.max_ani = 10,
 			.max_dnis = 4,
 			.get_ani_first = -1,
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
+			.skip_category_request = -1,
+#endif
 			.call_files = 0,
 			.allow_collect_calls = 0,
 			.charge_calls = 1,
@@ -2438,7 +2444,7 @@
 	.decrease_ss_count = my_decrease_ss_count,
 };
 
-struct dahdi_pvt *round_robin[32];
+static struct dahdi_pvt *round_robin[32];
 
 #if defined(HAVE_PRI)
 static inline int pri_grab(struct dahdi_pvt *pvt, struct dahdi_pri *pri)
@@ -5327,8 +5333,8 @@
 		r2cause = OR2_CAUSE_NORMAL_CLEARING;
 		break;
 	}
-	ast_log(LOG_DEBUG, "dahdi_ast_cause_to_r2_cause returned %d/%s for ast cause %d\n",
-			r2cause, openr2_proto_get_disconnect_string(r2cause), cause);
+	ast_log(LOG_DEBUG, "ast cause %d resulted in openr2 cause %d/%s\n",
+			cause, r2cause, openr2_proto_get_disconnect_string(r2cause));
 	return r2cause;
 }
 #endif
@@ -11080,6 +11086,9 @@
 	}
 	openr2_context_set_log_level(r2_link->protocol_context, conf->mfcr2.loglevel);
 	openr2_context_set_ani_first(r2_link->protocol_context, conf->mfcr2.get_ani_first);
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
+	openr2_context_set_skip_category_request(r2_link->protocol_context, conf->mfcr2.skip_category_request);
+#endif
 	openr2_context_set_mf_threshold(r2_link->protocol_context, threshold);
 	openr2_context_set_mf_back_timeout(r2_link->protocol_context, conf->mfcr2.mfback_timeout);
 	openr2_context_set_metering_pulse_timeout(r2_link->protocol_context, conf->mfcr2.metering_pulse_timeout);
@@ -11301,7 +11310,8 @@
 						                      tmp->subs[SUB_REAL].dfd,
 						                      NULL, NULL);
 				if (!tmp->r2chan) {
-					ast_log(LOG_ERROR, "Cannot create OpenR2 channel.\n");
+					openr2_liberr_t err = openr2_context_get_last_error(r2_link->protocol_context);
+					ast_log(LOG_ERROR, "Cannot create OpenR2 channel: %s\n", openr2_context_error_string(err));
 					destroy_dahdi_pvt(&tmp);
 					return NULL;
 				}
@@ -16193,6 +16203,9 @@
 				ast_cli(a->fd, "MFC/R2 Max ANI: %d\n", openr2_context_get_max_ani(r2context));
 				ast_cli(a->fd, "MFC/R2 Max DNIS: %d\n", openr2_context_get_max_dnis(r2context));
 				ast_cli(a->fd, "MFC/R2 Get ANI First: %s\n", openr2_context_get_ani_first(r2context) ? "Yes" : "No");
+#if defined(OR2_LIB_INTERFACE) && OR2_LIB_INTERFACE > 1
+				ast_cli(a->fd, "MFC/R2 Skip Category Request: %s\n", openr2_context_get_skip_category_request(r2context) ? "Yes" : "No");
+#endif
 				ast_cli(a->fd, "MFC/R2 Immediate Accept: %s\n", openr2_context_get_immediate_accept(r2context) ? "Yes" : "No");
 				ast_cli(a->fd, "MFC/R2 Accept on Offer: %s\n", tmp->mfcr2_accept_on_offer ? "Yes" : "No");
 				ast_cli(a->fd, "MFC/R2 Charge Calls: %s\n", tmp->mfcr2_charge_calls ? "Yes" : "No");

Modified: team/group/bindings/channels/chan_h323.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_h323.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_h323.c (original)
+++ team/group/bindings/channels/chan_h323.c Tue Jun 16 06:57:03 2009
@@ -147,7 +147,7 @@
 static call_options_t global_options;
 
 /*! \brief Private structure of a OpenH323 channel */
-struct oh323_pvt {
+static struct oh323_pvt {
 	ast_mutex_t lock;			/*!< Channel private lock */
 	call_options_t options;			/*!<!< Options to be used during call setup */
 	int alreadygone;			/*!< Whether or not we've already been destroyed by our peer */

Modified: team/group/bindings/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_iax2.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_iax2.c (original)
+++ team/group/bindings/channels/chan_iax2.c Tue Jun 16 06:57:03 2009
@@ -305,7 +305,7 @@
 static struct ast_netsock_list *outsock;		/*!< used if sourceaddress specified and bindaddr == INADDR_ANY */
 static int defaultsockfd = -1;
 
-int (*iax2_regfunk)(const char *username, int onoff) = NULL;
+static int (*iax2_regfunk)(const char *username, int onoff) = NULL;
 
 /* Ethernet, etc */
 #define IAX_CAPABILITY_FULLBANDWIDTH 	0xFFFF
@@ -12318,7 +12318,7 @@
 	return 0;
 }
 
-struct ast_custom_function iaxpeer_function = {
+static struct ast_custom_function iaxpeer_function = {
 	.name = "IAXPEER",
 	.read = function_iaxpeer,
 };

Modified: team/group/bindings/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_misdn.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_misdn.c (original)
+++ team/group/bindings/channels/chan_misdn.c Tue Jun 16 06:57:03 2009
@@ -94,7 +94,7 @@
 #include "chan_misdn_config.h"
 #include "isdn_lib.h"
 
-char global_tracefile[BUFFERSIZE + 1];
+static char global_tracefile[BUFFERSIZE + 1];
 
 static int g_config_initialized = 0;
 
@@ -290,7 +290,7 @@
 #define MISDN_ERROR_MSG		"MISDN_ERROR_MSG"
 #endif	/* defined(AST_MISDN_ENHANCEMENTS) */
 
-ast_mutex_t release_lock;
+static ast_mutex_t release_lock;
 
 enum misdn_chan_state {
 	MISDN_NOTHING = 0,         /*!< at beginning */
@@ -683,13 +683,11 @@
 static int *misdn_in_calls;
 static int *misdn_out_calls;
 
-struct chan_list dummy_cl;
-
 /*!
  * \brief Global channel call record list head.
  */
-struct chan_list *cl_te=NULL;
-ast_mutex_t cl_te_lock;
+static struct chan_list *cl_te=NULL;
+static ast_mutex_t cl_te_lock;
 
 static enum event_response_e
 cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data);

Modified: team/group/bindings/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/bindings/channels/chan_sip.c?view=diff&rev=200840&r1=200839&r2=200840
==============================================================================
--- team/group/bindings/channels/chan_sip.c (original)
+++ team/group/bindings/channels/chan_sip.c Tue Jun 16 06:57:03 2009
@@ -1068,7 +1068,7 @@
 	\todo This string should be set dynamically. We only support REFER and SUBSCRIBE if we have
 	allowsubscribe and allowrefer on in sip.conf.
 */
-#define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY"
+#define ALLOWED_METHODS "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO"
 
 /*! \brief SIP Extensions we support 
 	\note This should be generated based on the previous array
@@ -1222,8 +1222,8 @@
 static unsigned int global_cos_audio;		/*!< 802.1p class of service for audio RTP packets */
 static unsigned int global_cos_video;		/*!< 802.1p class of service for video RTP packets */
 static unsigned int global_cos_text;		/*!< 802.1p class of service for text RTP packets */
-static int recordhistory;		/*!< Record SIP history. Off by default */
-static int dumphistory;			/*!< Dump history to verbose before destroying SIP dialog */
+static unsigned int recordhistory;		/*!< Record SIP history. Off by default */
+static unsigned int dumphistory;		/*!< Dump history to verbose before destroying SIP dialog */
 static char global_regcontext[AST_MAX_CONTEXT];		/*!< Context for auto-extensions */
 static char global_useragent[AST_MAX_EXTENSION];	/*!< Useragent for the SIP channel */
 static char global_sdpsession[AST_MAX_EXTENSION];	/*!< SDP session name for the SIP channel */
@@ -1232,7 +1232,7 @@
 static int global_t1;			/*!< T1 time */
 static int global_t1min;		/*!< T1 roundtrip time minimum */
 static int global_timer_b;    			/*!< Timer B - RFC 3261 Section 17.1.1.2 */
-static int global_autoframing;          	/*!< Turn autoframing on or off. */
+static unsigned int global_autoframing;        	/*!< Turn autoframing on or off. */
 static int global_qualifyfreq;			/*!< Qualify frequency */
 static int global_qualify_gap;              /*!< Time between our group of peer pokes */
 static int global_qualify_peers;          /*!< Number of peers to poke at a given time */
@@ -1757,15 +1757,21 @@
 	int lastnoninvite;                      /*!< Last Cseq of non-invite */
 	struct ast_flags flags[2];		/*!< SIP_ flags */
 
-	/* boolean or small integers that don't belong in flags */
-	char do_history;			/*!< Set if we want to record history */
-	char alreadygone;			/*!< already destroyed by our peer */
-	char needdestroy;			/*!< need to be destroyed by the monitor thread */
-	char outgoing_call;			/*!< this is an outgoing call */
-	char answered_elsewhere;		/*!< This call is cancelled due to answer on another channel */
-	char novideo;				/*!< Didn't get video in invite, don't offer */
-	char notext;				/*!< Text not supported  (?) */
-
+	/* boolean flags that don't belong in flags */
+	unsigned short do_history:1;		/*!< Set if we want to record history */
+	unsigned short alreadygone:1;		/*!< already destroyed by our peer */
+	unsigned short needdestroy:1;		/*!< need to be destroyed by the monitor thread */
+	unsigned short outgoing_call:1;		/*!< this is an outgoing call */
+	unsigned short answered_elsewhere:1;	/*!< This call is cancelled due to answer on another channel */
+	unsigned short novideo:1;		/*!< Didn't get video in invite, don't offer */
+	unsigned short notext:1;		/*!< Text not supported  (?) */
+	unsigned short session_modify:1;	/*!< Session modification request true/false  */
+	unsigned short route_persistent:1;	/*!< Is this the "real" route? */
+	unsigned short autoframing:1;		/*!< Whether to use our local configuration for frame sizes (off)
+						 *   or respect the other endpoint's request for frame sizes (on)
+						 *   for incoming calls
+						 */
+	char tag[11];				/*!< Our tag for this session */
 	int timer_t1;				/*!< SIP timer T1, ms rtt */
 	int timer_b;                            /*!< SIP timer B, ms */
 	unsigned int sipoptions;		/*!< Supported SIP options on the other end */
@@ -1779,20 +1785,19 @@
 	int jointnoncodeccapability;            /*!< Joint Non codec capability */
 	int redircodecs;			/*!< Redirect codecs */
 	int maxcallbitrate;			/*!< Maximum Call Bitrate for Video Calls */	
+	int request_queue_sched_id;		/*!< Scheduler ID of any scheduled action to process queued requests */
+	int authtries;				/*!< Times we've tried to authenticate */
 	struct sip_proxy *outboundproxy;	/*!< Outbound proxy for this dialog. Use ref_proxy to set this instead of setting it directly*/
 	struct t38properties t38;		/*!< T38 settings */
 	struct sockaddr_in udptlredirip;	/*!< Where our T.38 UDPTL should be going if not to us */
 	struct ast_udptl *udptl;		/*!< T.38 UDPTL session */
 	int callingpres;			/*!< Calling presentation */
-	int authtries;				/*!< Times we've tried to authenticate */
 	int expiry;				/*!< How long we take to expire */
+	int sessionversion;			/*!< SDP Session Version */
+	int sessionid;				/*!< SDP Session ID */
 	long branch;				/*!< The branch identifier of this session */
 	long invite_branch;			/*!< The branch used when we sent the initial INVITE */
-	char tag[11];				/*!< Our tag for this session */
-	int sessionid;				/*!< SDP Session ID */
-	int sessionversion;			/*!< SDP Session Version */
 	uint64_t sessionversion_remote;		/*!< Remote UA's SDP Session Version */
-	int session_modify;			/*!< Session modification request true/false  */
 	struct sockaddr_in sa;			/*!< Our peer */
 	struct sockaddr_in redirip;		/*!< Where our RTP should be going if not to us */
 	struct sockaddr_in vredirip;		/*!< Where our Video RTP should be going if not to us */
@@ -1802,9 +1807,9 @@
 	int rtptimeout;				/*!< RTP timeout time */
 	struct sockaddr_in recv;		/*!< Received as */
 	struct sockaddr_in ourip;		/*!< Our IP (as seen from the outside) */
+	enum transfermodes allowtransfer;	/*!< REFER: restriction scheme */
 	struct ast_channel *owner;		/*!< Who owns us (if we have an owner) */
 	struct sip_route *route;		/*!< Head of linked list of routing steps (fm Record-Route) */
-	int route_persistant;			/*!< Is this the "real" route? */
 	struct ast_variable *notify_headers;    /*!< Custom notify type */
 	struct sip_auth *peerauth;		/*!< Realm authentication */
 	int noncecount;				/*!< Nonce-count */
@@ -1822,7 +1827,6 @@
 	int waitid;				/*!< Wait ID for scheduler after 491 or other delays */
 	int autokillid;				/*!< Auto-kill ID (scheduler) */
 	int t38id;                              /*!< T.38 Response ID */
-	enum transfermodes allowtransfer;	/*!< REFER: restriction scheme */
 	struct sip_refer *refer;		/*!< REFER: SIP transfer data structure */
 	enum subscriptiontype subscribed;	/*!< SUBSCRIBE: Is this dialog a subscription?  */
 	int stateid;				/*!< SUBSCRIBE: ID for devicestate subscriptions */
@@ -1842,12 +1846,7 @@
 	size_t history_entries;			/*!< Number of entires in the history */
 	struct ast_variable *chanvars;		/*!< Channel variables to set for inbound call */
 	AST_LIST_HEAD_NOLOCK(request_queue, sip_request) request_queue; /*!< Requests that arrived but could not be processed immediately */
-	int request_queue_sched_id;		/*!< Scheduler ID of any scheduled action to process queued requests */
 	struct sip_invite_param *options;	/*!< Options for INVITE */
-	int autoframing;			/*!< The number of Asters we group in a Pyroflax
-							before strolling to the Grokyzpå
-							(A bit unsure of this, please correct if
-							you know more) */
 	struct sip_st_dlg *stimer;		/*!< SIP Session-Timers */              
   
 	int red; 				/*!< T.140 RTP Redundancy */
@@ -1870,7 +1869,7 @@
  * the container and individual items, and functions to add/remove
  * references to the individual items.
  */
-struct ao2_container *dialogs;
+static struct ao2_container *dialogs;
 
 #define sip_pvt_lock(x) ao2_lock(x)
 #define sip_pvt_trylock(x) ao2_trylock(x)
@@ -1989,8 +1988,18 @@
 		);
 	struct sip_socket socket;	/*!< Socket used for this peer */
 	enum sip_transport default_outbound_transport;    /*!< Peer Registration may change the default outbound transport.
-												If register expires, default should be reset. to this value */
-	unsigned int transports:3;      /*!< Transports (enum sip_transport) that are acceptable for this peer */
+							    If register expires, default should be reset. to this value */
+	/* things that don't belong in flags */
+	unsigned short transports:3;	/*!< Transports (enum sip_transport) that are acceptable for this peer */
+	unsigned short is_realtime:1;	/*!< this is a 'realtime' peer */
+	unsigned short rt_fromcontact:1;/*!< copy fromcontact from realtime */
+	unsigned short host_dynamic:1;	/*!< Dynamic Peers register with Asterisk */
+	unsigned short selfdestruct:1;	/*!< Automatic peers need to destruct themselves */
+	unsigned short the_mark:1;	/*!< moved out of ASTOBJ into struct proper; That which bears the_mark should be deleted! */
+	unsigned short autoframing:1;	/*!< Whether to use our local configuration for frame sizes (off)
+					 *   or respect the other endpoint's request for frame sizes (on)
+					 *   for incoming calls
+					 */
 	struct sip_auth *auth;		/*!< Realm authentication list */
 	int amaflags;			/*!< AMA Flags (for billing) */
 	int callingpres;		/*!< Calling id presentation */
@@ -2008,13 +2017,7 @@
 	/*! Mailboxes that this peer cares about */
 	AST_LIST_HEAD_NOLOCK(, sip_mailbox) mailboxes;
 
-	/* things that don't belong in flags */
-	char is_realtime;		/*!< this is a 'realtime' peer */
-	char rt_fromcontact;		/*!< copy fromcontact from realtime */
-	char host_dynamic;		/*!< Dynamic Peers register with Asterisk */
-	char selfdestruct;		/*!< Automatic peers need to destruct themselves */
-	char the_mark;			/*!< moved out of ASTOBJ into struct proper; That which bears the_mark should be deleted! */
-
+	int maxcallbitrate;		/*!< Maximum Bitrate for a video call */
 	int expire;			/*!<  When to expire this peer registration */
 	int capability;			/*!<  Codec capability */
 	int rtptimeout;			/*!<  RTP timeout */
@@ -2025,8 +2028,6 @@
 	struct sip_proxy *outboundproxy;	/*!< Outbound proxy for this peer */
 	struct ast_dnsmgr_entry *dnsmgr;/*!<  DNS refresh manager for peer */
 	struct sockaddr_in addr;	/*!<  IP address of peer */
-	int maxcallbitrate;		/*!< Maximum Bitrate for a video call */
-
 	/* Qualification */
 	struct sip_pvt *call;		/*!<  Call pointer */
 	int pokeexpire;			/*!<  When to expire poke (qualify= checking) */
@@ -2039,7 +2040,6 @@
 	struct ast_ha *contactha;       /*!<  Restrict what IPs are allowed in the Contact header (for registration) */
 	struct ast_variable *chanvars;	/*!<  Variables to set for channel created by user */
 	struct sip_pvt *mwipvt;		/*!<  Subscription for MWI */
-	int autoframing;

[... 1913 lines stripped ...]



More information about the asterisk-commits mailing list