[svn-commits] irroot: branch irroot/distrotech-customers-10 r333491 - in /team/irroot/distr...

[SVN commits to the Digium repositories]

Author: irroot
Date: Sat Aug 27 04:42:17 2011
New Revision: 333491

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333491
Log:
Distrotech Patches

1)Set the context to the extension context if not set in mailbox
2)Use mISDN 1 distrotech version for mISDN
3)Custom module path
4)Custom safe_asterisk script

Modified:
    team/irroot/distrotech-customers-10/Makefile
    team/irroot/distrotech-customers-10/channels/chan_sip.c
    team/irroot/distrotech-customers-10/configure.ac
    team/irroot/distrotech-customers-10/contrib/scripts/safe_asterisk

Modified: team/irroot/distrotech-customers-10/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/Makefile?view=diff&rev=333491&r1=333490&r2=333491
==============================================================================
--- team/irroot/distrotech-customers-10/Makefile (original)
+++ team/irroot/distrotech-customers-10/Makefile Sat Aug 27 04:42:17 2011
@@ -127,7 +127,7 @@
 # Asterisk.conf is located in ASTETCDIR or by using the -C flag
 # when starting Asterisk
 ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-MODULES_DIR=$(ASTLIBDIR)/modules
+MODULES_DIR=$(ASTLIBDIR)/modules-10
 AGI_DIR=$(ASTDATADIR)/agi-bin
 
 # If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file

Modified: team/irroot/distrotech-customers-10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/channels/chan_sip.c?view=diff&rev=333491&r1=333490&r2=333491
==============================================================================
--- team/irroot/distrotech-customers-10/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-10/channels/chan_sip.c Sat Aug 27 04:42:17 2011
@@ -27144,6 +27144,11 @@
 		int duplicate = 0;
 		/* remove leading/trailing whitespace from mailbox string */
 		mbox = ast_strip(mbox);
+		if (strstr("@",context) == NULL) {
+			strncat(context,"@",sizeof(context)-2);
+			strncat(context,peer->context,sizeof(context)-strlen(peer->context)-1);
+		}
+
 		strsep(&context, "@");
 
 		if (ast_strlen_zero(mbox)) {

Modified: team/irroot/distrotech-customers-10/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/configure.ac?view=diff&rev=333491&r1=333490&r2=333491
==============================================================================
--- team/irroot/distrotech-customers-10/configure.ac (original)
+++ team/irroot/distrotech-customers-10/configure.ac Sat Aug 27 04:42:17 2011
@@ -1721,7 +1721,7 @@
    AST_EXT_LIB_CHECK([SUPPSERV], [suppserv], [encodeFac], [mISDNuser/suppserv.h])
    AST_C_DEFINE_CHECK([MISDN_FAC_RESULT], [Fac_RESULT], [mISDNuser/suppserv.h])
    AST_C_DEFINE_CHECK([MISDN_FAC_ERROR], [Fac_ERROR], [mISDNuser/suppserv.h])
-   AC_CHECK_HEADER([linux/mISDNdsp.h], [AC_DEFINE_UNQUOTED([MISDN_1_2], 1, [Build chan_misdn for mISDN 1.2 or later.])])
+   AC_CHECK_HEADER([mISDN/mISDNdsp.h], [AC_DEFINE_UNQUOTED([MISDN_1_2], 1, [Build chan_misdn for mISDN 1.2 or later.])])
    AC_CHECK_MEMBER([Q931_info_t.redirect_dn], [], [PBX_MISDN=0], [#include <mISDNuser/mISDNlib.h>])
 fi
 

Modified: team/irroot/distrotech-customers-10/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/contrib/scripts/safe_asterisk?view=diff&rev=333491&r1=333490&r2=333491
==============================================================================
--- team/irroot/distrotech-customers-10/contrib/scripts/safe_asterisk (original)
+++ team/irroot/distrotech-customers-10/contrib/scripts/safe_asterisk Sat Aug 27 04:42:17 2011
@@ -6,14 +6,14 @@
 ASTVARLOGDIR=__ASTERISK_LOG_DIR__
 
 CLIARGS="$*"					# Grab any args passed to safe_asterisk
-TTY=9						# TTY (if you want one) for Asterisk to run on
+#TTY=9						# TTY (if you want one) for Asterisk to run on
 CONSOLE=yes					# Whether or not you want a console
 #NOTIFY=root at localhost.localdomain		# Who to notify about crashes
 #EXEC=/path/to/somescript			# Run this command if Asterisk crashes
 #LOGFILE=${ASTVARLOGDIR}/safe_asterisk.log	# Where to place the normal logfile (disabled if blank)
 #SYSLOG=local0					# Which syslog facility to use (disabled if blank)
 MACHINE=`hostname`				# To specify which machine has crashed when getting the mail
-DUMPDROP=/tmp
+DUMPDROP=/var/cores/asterisk
 SLEEPSECS=4
 ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
 
@@ -22,7 +22,7 @@
 KILLALLMPG123=1
 
 # run asterisk with this priority
-PRIORITY=0
+PRIORITY=-19
 
 # set system filemax on supported OSes if this variable is set
 # SYSMAXFILES=262144
@@ -121,6 +121,9 @@
 		ASTARGS="${ASTARGS} -c"
 	fi
 fi
+if [ ! -d ${DUMPDROP} ] && [ ! -e ${DUMPDROP} ];then
+	mkdir -p ${DUMPDROP}
+fi
 if test ! -w "${DUMPDROP}" ; then	
 	message "Cannot write to ${DUMPDROP}"
 	exit 1