retronetworking
/
wanpipe
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wanpipe-3.1.0.1.tgz

This commit is contained in:
Harald Welte 2021-12-29 18:02:36 +01:00
parent 8d0e654e89
commit aca217ab27
11 changed files with 79 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.Setup.swo
View File

Binary file not shown.

74
Setup
View File

@ -2405,6 +2405,26 @@ function build_wanec_module ()
}
function sangoma_64bit_4g_check()
{
eval "uname -a | grep x86_64" > /dev/null 2> /dev/null
if [ $? -ne 0 ] ; then
val=`cat /proc/meminfo | grep MemTotal | cut -d':' -f2`
tmp=${val// /}
b=`expr match "$tmp" '\([0-9]*\)'`
morethan4bg=`expr $b \> 4000000`
if [ $morethan4bg -eq 1 ]; then
#More than 4G of memory
return 0;
else
return 1;
fi
fi
#not 64bit 4G mode
return 1;
}
function create_kernel_mod_file()
{
@ -3182,7 +3202,6 @@ ENDOFTEXT
CONFIG_SMP=NO;
fi
#Find out our processor type. This is needed to properly
#compile our modules.
echo -n "Checking current processor type ..."
@ -3282,10 +3301,6 @@ CFLAGS="$CC -Wp,-MD,.wanpipe.o.d -nostdinc -iwithprefix include -D__LINUX__ -Dli
fi
fi
echo -n "Compiling General ${DISTR_NAME} Driver for 2.6.X Kernel ."
@ -3470,6 +3485,18 @@ ENDOFTEXT
EVALCMD=eval
WANPIPE_OBJS=
if [ 0 -eq 1 ]; then
echo
echo "ALLFLAGS"
echo "--------------------------------------------------"
echo "$CFLAGS"
echo "--------------------------------------------------"
echo
echo
fi
rm -f sdladrv_src.c
ln -s sdladrv.c sdladrv_src.c
build_kernel_module sdladrv "sdladrv_src sdladrv_fe"
@ -4878,7 +4905,12 @@ function tdmv_apply_zaptel_dchan_patch ()
fi
# patch $ZAPTEL_C_FILE
eval "search_and_replace $ZAPTEL_C_FILE $ZAPTEL_C_FILE \"$ZAPTEL_C_SEARCH_STR\" \"$ZAPTEL_C_PATCH\""
eval "grep \"$ZAPTEL_C_SEARCH_STR\" $ZAPTEL_C_FILE > /dev/null 2> /dev/null"
if [ $? -eq 0 ]; then
eval "search_and_replace $ZAPTEL_C_FILE $ZAPTEL_C_FILE \"$ZAPTEL_C_SEARCH_STR\" \"$ZAPTEL_C_PATCH\""
else
eval "search_and_replace $ZAPTEL_C_FILE $ZAPTEL_C_FILE \"$ZAPTEL_C_SEARCH_STR_NEW\" \"$ZAPTEL_C_PATCH_NEW\""
fi
if [ $? -ne 0 ]; then
echo "search_and_replace($ZAPTEL_C_FILE) failed"
@ -5227,8 +5259,22 @@ function tdmv_compile_zaptel()
fi
else
echo "OK"
if [ -e menuselect/mxml ]; then
cd menuselect/mxml
eval "grep \" $ZAPTEL_MENUSELECT_SEARCH_STR\" Makefile.in > /dev/null 2> /dev/null"
if [ $? -eq 0 ]; then
eval "search_and_replace Makefile.in Makefile.in \"$ZAPTEL_MENUSELECT_SEARCH_STR\" \"$ZAPTEL_MENUSELECT_REMOVE\""
fi
if [ -e Makefile ]; then
eval "grep \" $ZAPTEL_MENUSELECT_SEARCH_STR\" Makefile > /dev/null 2> /dev/null"
if [ $? -eq 0 ]; then
eval "search_and_replace Makefile Makefile \"$ZAPTEL_MENUSELECT_SEARCH_STR\" \"$ZAPTEL_MENUSELECT_REMOVE\""
fi
fi
fi
fi
cd $ZAPTEL_INSTALL_DIR
echo -n " Recompiling/reinstalling Zaptel(make install)..."
eval "make >> $PROD_HOME/zaptel_compilation_log 2>> $PROD_HOME/zaptel_compilation_log"
if [ ! $? -eq 0 ]; then
@ -6117,7 +6163,7 @@ KERNEL_UNAME=`uname -r`
PKG_NAME=wanpipe
DISTR_NAME="WANPIPE"
PROD=wanrouter
PROD_VER=3.1.0
PROD_VER=3.1.0.1
PROD_HOME=`pwd`
META_CONF=$PROD_HOME/$PROD.rc
WAN_INTR_DIR=$PROD_HOME/interfaces
@ -6215,6 +6261,17 @@ ZAPTEL_C_PATCH="if ((chan->flags \& ZT_FLAG_HDLC) \&\& chan->span->ioctl != NULL
}\n\
}\n\
chan->writen[chan->inwritebuf] = amnt;"
# D channel patching for zaptel version 1.2.17.1/1.4.2.1 or above
ZAPTEL_C_SEARCH_STR_NEW="chan->writen\[res\] = amnt;"
ZAPTEL_C_PATCH_NEW="if ((chan->flags \& ZT_FLAG_HDLC) \&\& chan->span->ioctl != NULL){\n\
if (chan->span->ioctl(chan, ZT_DCHAN_TX_V2, amnt)==0){\n\
return amnt;\n\
}\n\
}\n\
chan->writen[res] = amnt;"
# Zaptel 1.4.2.1 "Menuselect" issue
ZAPTEL_MENUSELECT_SEARCH_STR="autoconf"
ZAPTEL_MENUSELECT_REMOVE=" "
#NOTE1: the 'sed' command does NOT work on more than one line, so the
#closing '*/' will be pushed AFTER the inserted strings.
@ -6406,6 +6463,9 @@ if [ "$PKG_NAME" != "wanpipe-lite" ]; then
--noautostart*)
NO_AUTO_START=1
;;
--64bit_4G*)
PROTOCOL_DEFINES="$PROTOCOL_DEFINES -DWANPIPE_64BIT_4G_DMA "
;;
--with-linux*)
SOURCEDIR=`echo $arg | cut -d'=' -f2`;
if [ "$SOURCEDIR" = "" ]; then

2
deb_control/wanpipe.deb
View File

@ -1,5 +1,5 @@
Package: wanpipe
Version: 3.1.0-0
Version: 3.1.0.1-0
Section: networking
Priority: optional
Architecture: all

BIN
patches/kdrivers/src/net/.sdla_aft_te1.c.swp Normal file
View File

Binary file not shown.

6
patches/kdrivers/src/net/sdla_aft_te1.c
View File

@ -54,6 +54,7 @@
#endif
#if 0
# define AFT_XTEST_UPDATE 1
#else
@ -149,6 +150,9 @@
#undef AFT_API_SUPPORT
#endif
#if defined(WANPIPE_64BIT_4G_DMA)
#warning "Wanpipe compiled for 64bit 4G DMA"
#endif
/* Trigger on Number of transactions
* 1= 1x8 byte transactions
@ -4151,7 +4155,7 @@ static int aft_alloc_rx_dma_buff(sdla_t *card, private_area_t *chan, int num, in
for (i=0;i<num;i++){
if (chan->channelized_cfg && !chan->hdlc_eng){
#if defined(__LINUX__) && defined(CONFIG_X86_4G)
#if defined(WANPIPE_64BIT_4G_DMA)
/* On 64bit Systems greater than 4GB we must
* allocated our DMA buffers using GFP_DMA
* flag */

4
patches/kdrivers/wanec/.tmp_versions/wanec.mod
View File

@ -1,2 +1,2 @@
/hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/wanec.ko
/hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/wanec_iface.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/wanec_cmd.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/wanec_utils.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/wanec_dev.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/apilib/bt/octapi_bt0.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/apilib/largmath/octapi_largmath.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/apilib/llman/octapi_llman.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_events.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
/hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/wanec.ko
/hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/wanec_iface.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/wanec_cmd.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/wanec_utils.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/wanec_dev.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/apilib/bt/octapi_bt0.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/apilib/largmath/octapi_largmath.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/apilib/llman/octapi_llman.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_events.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.o /hda5/wanpipe/3.1.X/wanpipe-3.1.0.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o

2
rpmspec/wanpipe-mod.spec
View File

@ -1,6 +1,6 @@
%define WANPIPE_VER wanpipe-modules
%define name %{WANPIPE_VER}
%define version 3.1.0
%define version 3.1.0.1
%define release 0
%define serial 1
%define MODULES_DIR /lib/modules

2
rpmspec/wanpipe-util.spec
View File

@ -1,7 +1,7 @@
%define KERNEL_VERSION %{?kern_ver}
%define WANPIPE_VER wanpipe-util
%define name %{WANPIPE_VER}
%define version 3.1.0
%define version 3.1.0.1
%define release 0
%define serial 1
%define UTILS_DIR /usr/sbin

2
rpmspec/wanpipe.spec
View File

@ -1,7 +1,7 @@
%define KERNEL_VERSION %{?kern_ver}
%define WANPIPE_VER wanpipe
%define name %{WANPIPE_VER}
%define version 3.1.0
%define version 3.1.0.1
%define release 0
%define serial 1
%define UTILS_DIR /usr/sbin

2
samples/wanrouter
View File

@ -1883,7 +1883,7 @@ WANPIPE_IS_RUNNING=/var/run/wanpipe_is_running
RUGGEDCOM=No
if [ $OSYSTEM = "Linux" ]; then
ROUTER_VERSION=3.1.0
ROUTER_VERSION=3.1.0.1
IFCONFIG_LIST=ifconfig
MODULE_STAT=lsmod
WAN_DRIVERS="wanpipe"

0
tmp.12150 Normal file
View File