[asterisk-commits] branch oej/siptransfer r12043 - in /team/oej/siptransfer: ./ res/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar  6 05:22:01 2006
New Revision: 12043

URL: http://svn.digium.com/view/asterisk?rev=12043&view=rev
Log:
Reset automerge

Modified:
    team/oej/siptransfer/   (props changed)
    team/oej/siptransfer/channel.c
    team/oej/siptransfer/res/Makefile
    team/oej/siptransfer/utils.c

Propchange: team/oej/siptransfer/
------------------------------------------------------------------------------
    automerge = go

Propchange: team/oej/siptransfer/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/siptransfer/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar  6 05:22:01 2006
@@ -1,1 +1,1 @@
-/trunk:1-12003
+/trunk:1-12042

Modified: team/oej/siptransfer/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/siptransfer/channel.c?rev=12043&r1=12042&r2=12043&view=diff
==============================================================================
--- team/oej/siptransfer/channel.c (original)
+++ team/oej/siptransfer/channel.c Mon Mar  6 05:22:01 2006
@@ -2127,7 +2127,7 @@
 		if (f->frametype == AST_FRAME_CONTROL && f->subclass == AST_CONTROL_HANGUP)
 			done = 1;	/* force a break */
 		else if (f->frametype == AST_FRAME_TEXT) {		/* what we want */
-			buf = strndup((char *) f->data, f->datalen);	/* dup and break */
+			buf = ast_strndup((char *) f->data, f->datalen);	/* dup and break */
 			done = 1;
 		}
 		ast_frfree(f);

Modified: team/oej/siptransfer/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/siptransfer/res/Makefile?rev=12043&r1=12042&r2=12043&view=diff
==============================================================================
--- team/oej/siptransfer/res/Makefile (original)
+++ team/oej/siptransfer/res/Makefile Mon Mar  6 05:22:01 2006
@@ -32,11 +32,22 @@
   MODS:=$(filter-out res_osp.so,$(MODS))
 endif
 
-#ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
-  #MODS:=$(filter-out res_snmp.so,$(MODS))
-#else
-  #SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
-#endif
+# NETsnmp has some difficulties on some platforms (conflict with unload_module)
+# Until we figure out if the collission is version-specific or what to do
+# we have disabled res_snmp on OS/X and *BSD
+ifeq ($(OSARCH),Darwin)
+  MODS:=$(filter-out res_snmp.so,$(MODS))
+else
+  ifeq ($(findstring BSD,$(OSARCH)),BSD)
+    MODS:=$(filter-out res_snmp.so,$(MODS))
+  endif
+endif
+
+ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
+  MODS:=$(filter-out res_snmp.so,$(MODS))
+else
+  SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
+endif
 
 ifeq (${WITH_SMDI},)
   MODS:=$(filter-out res_smdi.so,$(MODS))

Modified: team/oej/siptransfer/utils.c
URL: http://svn.digium.com/view/asterisk/team/oej/siptransfer/utils.c?rev=12043&r1=12042&r2=12043&view=diff
==============================================================================
--- team/oej/siptransfer/utils.c (original)
+++ team/oej/siptransfer/utils.c Mon Mar  6 05:22:01 2006
@@ -1022,7 +1022,11 @@
 	va_list ap1, ap2;
 
 	va_start(ap1, format);
+#if defined(__FreeBSD__)
+	va_start(ap2, format);		/* va_copy does not exist on FreeBSD */
+#else
 	va_copy(ap2, ap1);
+#endif
 
 	needed = vsnprintf(mgr->pool->base + mgr->used, mgr->space, format, ap1) + 1;