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

wanpipe-3.2.7.tgz

This commit is contained in:
Harald Welte 2021-12-29 18:16:45 +01:00
parent b61b764082
commit 95e4552558
19 changed files with 104 additions and 7620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog.stable
View File

@ -7,6 +7,20 @@ Author: Nenad Corbic <ncorbic@sangoma.com>
Copyright (c) 1995-2008 Sangoma Technologies Inc.
------------------------------------------------------------------------------
* Thu Jul 16 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.7
========================================================================
- Removed the Excessive Error check that disables the port.
This feature was introduced in 3.2.6 release.
Some lines are extremely noisy on startup which can cause
excessive crc errors (5000 per sec). In this case driver would
take the port down for few sec before bringing it back up in order to
avoid irq overlaod. This release will only print the
warning but will not take any up/down actions.
- Added support for new PLX2 or TUNDRA PCIe chip.
* Thu Jun 4 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.6
========================================================================

14
Setup
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash -p
#
# Setup WANPIPE WAN Router Installation/Removal Script.
#
@ -1518,7 +1518,7 @@ create_mataconf()
fi
cat > $META_CONF << ENDOFTEXT
#!/bin/sh
#!/bin/bash
# router.rc WAN router meta-configuration file.
#
# This file defines variables used by the router shell scripts
@ -3491,7 +3491,7 @@ CFLAGS="$CC -Wp,-MD,.wanpipe.o.d -nostdinc -iwithprefix include -D__LINUX__ -Dli
cat <<ENDOFTEXT > $PROD_HOME/Compile_Setup.sh
#!/bin/sh
#!/bin/bash
if [ -e kdrvcmp ]; then
rm -rf kdrvcmp
@ -3525,7 +3525,7 @@ ENDOFTEXT
tmp=${CFLAGS/$CC/}
cat <<ENDOFTEXT > $PROD_HOME/Compile.sh
#!/bin/sh
#!/bin/bash
make CFLAGS="$tmp" PROTOCOL_DEFINES="$PROTOCOL_DEFINES"
@ -4159,7 +4159,7 @@ WANPIPE_OBJS=
cat <<ENDOFTEXT > $CMP_INSTALL
#!/bin/sh
#!/bin/bash
mv *.ko mod/ > /dev/null 2> /dev/null
@ -4204,7 +4204,7 @@ ENDOFTEXT
chmod 755 $CMP_INSTALL
cat <<ENDOFTEXT > .clean.$$
#!/bin/sh
#!/bin/bash
rm -f *.ko
rm -f tmp/*.*o
@ -6357,7 +6357,7 @@ KERNEL_UNAME=`uname -r`
PKG_NAME=wanpipe
DISTR_NAME="WANPIPE"
PROD=wanrouter
PROD_VER=3.2.6
PROD_VER=3.2.7
PROD_HOME=`pwd`
WAN_CONF_DIR=/etc/wanpipe
META_CONF=$PROD_HOME/$PROD.rc

2
deb_control/wanpipe.deb
View File

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

8
patches/kdrivers/include/sdlapci.h
View File

@ -39,6 +39,14 @@
/* Definition for identifying and finding PLX PCI bridge adapters */
#define PLX_VENDOR_ID 0x10b5 /* PLX vendor ID number */
#define PLX_DEVICE_ID 0x8111 /* PLX device ID number */
#define PLX2_DEVICE_ID 0x8112 /* PLX device ID number rev 2 */
#define TUNDRA_VENDOR_ID 0x10E3 /* TUNDRA vendor ID number */
#define TUNDRA_DEVICE_ID 0x8111 /* TUNDRA device ID number */
#define PLX_EEPROM_ENABLE 0x5A
#define PLX_EEPROM_VENDOR_OFF 0xFC /* 2 bytes for Card vendor id */
#define A101_1TE1_SUBSYS_VENDOR 0xA010 /* A101 with T1/E1 1 line */
#define A101_2TE1_SUBSYS_VENDOR 0xA011 /* A101 with T1/E1 2 lines */

2
patches/kdrivers/include/wanpipe_version.h
View File

@ -6,7 +6,7 @@
#define WANPIPE_COMPANY "Sangoma Technologies Inc"
/********** LINUX **********/
#define WANPIPE_VERSION "3.2.6"
#define WANPIPE_VERSION "3.2.7"
#define WANPIPE_SUB_VERSION "0"
#define WANPIPE_VERSION_BETA 0
#define WANPIPE_LITE_VERSION "1.1.1"

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

@ -5256,6 +5256,14 @@ aft_global_isr_exit:
card->u.aft.rx_errors_over_cnt++;
DEBUG_EVENT("%s: Excessive Rx Errors ... %i (errs/s=%i)!\n",
card->devname,card->u.aft.rx_errors_over_cnt,card->u.aft.rx_errors_hist);
#if 0
/* NC: This is very dangrous. We have seen on some lines that it takes up to
9 rx_errors_over_cnt for the line to stabilize. I will continue to print the
warning but will not disable the line. This way a customer would know that there
is something wrong with his system. Ericsson uses this feature in their systems
The driver stop on excess errors should be configurable. */
if (card->u.aft.rx_errors_over_cnt >= 2) {
DEBUG_EVENT("%s: Excessive Rx Errors ... stopping device!\n",card->devname);
card->u.aft.rx_errors_over_cnt=0;
@ -5264,6 +5272,7 @@ aft_global_isr_exit:
aft_wdt_set(card,AFT_WDTCTRL_TIMEOUT);
card->u.aft.rx_errors_down_timeout = SYSTEM_TICKS;
}
#endif
} else {
card->u.aft.rx_errors_over_cnt=0;
card->u.aft.rx_errors_down_timeout=0;

15
patches/kdrivers/src/net/sdladrv.c
View File

@ -1748,14 +1748,25 @@ static int sdla_pci_probe(sdlahw_t *hw)
bus = pci_dev->bus;
if (bus->self == NULL) break;
pci_bridge_dev = bus->self;
if (pci_bridge_dev->vendor == PLX_VENDOR_ID &&
pci_bridge_dev->device == PLX_DEVICE_ID){
(pci_bridge_dev->device == PLX_DEVICE_ID ||
pci_bridge_dev->device == PLX2_DEVICE_ID)){
hwcard->pci_bridge_dev = pci_bridge_dev;
DEBUG_TEST("%s: PCI-Express card (bus:%d, slot:%d)\n",
DEBUG_TEST("%s: PCI-Express PLX card (bus:%d, slot:%d)\n",
wan_drvname,
pci_bridge_dev->bus->number,
((pci_bridge_dev->devfn >> 3) & PCI_DEV_SLOT_MASK));
}else if (pci_bridge_dev->vendor == TUNDRA_VENDOR_ID &&
pci_bridge_dev->device == TUNDRA_DEVICE_ID){
hwcard->pci_bridge_dev = pci_bridge_dev;
DEBUG_TEST("%s: PCI-Express card (TUNDRA PCI Bridge, bus:%d, slot:%d)\n",
wan_drvname, hwcard->bus_no, hwcard->slot_no);
}
break;
}

16
rpmspec/wanpipe-mod.spec
View File

@ -1,6 +1,6 @@
%define WANPIPE_VER wanpipe-modules
%define name %{WANPIPE_VER}
%define version 3.2.6
%define version 3.2.7
%define release 0
%define serial 1
%define MODULES_DIR /lib/modules
@ -50,6 +50,20 @@ echo "Wanpipe Modules located in %{MODULES_DIR}/%{KVERSION}"
%changelog
* Thu Jul 16 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.7
========================================================================
- Removed the Excessive Error check that disables the port.
This feature was introduced in 3.2.6 release.
Some lines are extremely noisy on startup which can cause
excessive crc errors (5000 per sec). In this case driver would
take the port down for few sec before bringing it back up in order to
avoid irq overlaod. This release will only print the
warning but will not take any up/down actions.
- Added support for new PLX2 or TUNDRA PCIe chip.
* Thu Jun 4 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.6
========================================================================

16
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.2.6
%define version 3.2.7
%define release 0
%define serial 1
%define ETC_DIR /etc
@ -246,6 +246,20 @@ install_init;
%changelog
* Thu Jul 16 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.7
========================================================================
- Removed the Excessive Error check that disables the port.
This feature was introduced in 3.2.6 release.
Some lines are extremely noisy on startup which can cause
excessive crc errors (5000 per sec). In this case driver would
take the port down for few sec before bringing it back up in order to
avoid irq overlaod. This release will only print the
warning but will not take any up/down actions.
- Added support for new PLX2 or TUNDRA PCIe chip.
* Thu Jun 4 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.6
========================================================================

16
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.2.6
%define version 3.2.7
%define release 0
%define serial 1
%define UTILS_DIR /usr/sbin
@ -254,6 +254,20 @@ install_init;
%changelog
* Thu Jul 16 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.7
========================================================================
- Removed the Excessive Error check that disables the port.
This feature was introduced in 3.2.6 release.
Some lines are extremely noisy on startup which can cause
excessive crc errors (5000 per sec). In this case driver would
take the port down for few sec before bringing it back up in order to
avoid irq overlaod. This release will only print the
warning but will not take any up/down actions.
- Added support for new PLX2 or TUNDRA PCIe chip.
* Thu Jun 4 2008 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.6
========================================================================

2
samples/wanrouter
View File

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

BIN
tmp/.diff.swp
View File

Binary file not shown.

254
tmp/Makefile
View File

@ -1,254 +0,0 @@
#
# Makefile WANPIPE WAN Router Installation/Removal Makefile
#
# Copyright (c) 2007, Sangoma Technologies Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.
# ----------------------------------------------------------------------------
# Author: Nenad Corbic <ncorbic@sangoma.com>
#
PWD=$(shell pwd)
KBUILD_VERBOSE=0
#Default zaptel directory to be overwritten by user
ifndef ZAPDIR
ZAPDIR=/usr/src/zaptel
endif
#Kernel version and location
ifndef KVER
KVER=$(shell uname -r)
endif
ifndef KMOD
KMOD=/lib/modules/$(KVER)
endif
ifndef KDIR
KDIR=$(KMOD)/build
endif
ifndef KINSTDIR
KINSTDIR=$(KMOD)/kernel
endif
ifndef ARCH
ARCH=$(shell uname -m)
endif
INSTALLPREFIX=
#Local wanpipe includes
WINCLUDE=patches/kdrivers/include
HWECINC=patches/kdrivers/wanec/oct6100_api
KMODDIR=patches/kdrivers
#Location of wanpipe source in release
WAN_DIR=$(PWD)/$(KMODDIR)/src/net
WANEC_DIR=$(PWD)/$(KMODDIR)/wanec
MODTYPE=ko
WANPIPE_ETC=/etc/wanpipe
#Setup include path and extra cflags
EXTRA_CFLAGS := -I$(PWD)/$(WINCLUDE) -I$(PWD)/$(WINCLUDE)/annexg -I$(PWD)/patches/kdrivers/wanec -D__LINUX__
EXTRA_CFLAGS += -I$(WANEC_DIR) -I$(WANEC_DIR)/oct6100_api -I$(WANEC_DIR)/oct6100_api/include
EXTRA_CFLAGS += -I$(KDIR)/include/linux -I$(ZAPDIR)
#Setup utility extra flags and include path
EXTRA_UTIL_FLAGS = -I$(PWD)/$(WINCLUDE) -I$(KDIR)/include/ -I$(INSTALLPREFIX)/include -I$(INSTALLPREFIX)/usr/include
EXTRA_UTIL_FLAGS += -I$(PWD)/patches/kdrivers/wanec -I$(PWD)/patches/kdrivers/wanec/oct6100_api/include
ENABLE_WANPIPEMON_ZAP=NO
#Check if zaptel exists
ifneq (,$(wildcard $(ZAPDIR)/zaptel.h))
ZAPDIR_PRIV=$(ZAPDIR)
ENABLE_WANPIPEMON_ZAP=YES
EXTRA_CFLGS+= -DSTANDALONE_ZAPATA -DBUILDING_TONEZONE
ZAP_OPTS= --zaptel-path=$(ZAPDIR)
ZAP_PROT=TDM
else
ZAP_OPTS=
ZAP_PROT=
ZAPDIR_PRIV=
ENABLE_WANPIPEMON_ZAP=NO
endif
RM = @rm -rf
JUNK = *~ *.bak DEADJOE
# First pass, kernel Makefile reads module objects
ifneq ($(KERNELRELEASE),)
obj-m := sdladrv.o wanrouter.o wanpipe.o wanpipe_syncppp.o wanec.o
# Second pass, the actual build.
else
#This will check for zaptel, kenrel source and build utilites and kernel modules
#within local directory structure
all: _checkzap _checksrc all_util all_kmod
#Build only kernel modules
all_kmod: _checkzap _checksrc _cleanoldwanpipe _check_kver
@if [ -e $(PWD)/ast_build_dir ]; then \
rm -rf $(PWD)/ast_build_dir; \
fi
@mkdir -p $(PWD)/ast_build_dir
./Setup drivers --builddir=$(PWD)/ast_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=DEF-$(ZAP_PROT) --no-zaptel-compile --noautostart --silent
cp -f $(PWD)/ast_build_dir/lib/modules/$(KVER)/kernel/drivers/net/wan/* $(WAN_DIR)/
cp -f $(PWD)/ast_build_dir/lib/modules/$(KVER)/kernel/net/wanrouter/* $(WAN_DIR)/
#Clean utilites and kernel modules
clean: clean_util _cleanoldwanpipe
$(MAKE) -C $(KDIR) SUBDIRS=$(WAN_DIR) clean
@find patches/kdrivers -name '.*.cmd' | xargs rm -f
#Clean old wanpipe headers from linux include
_cleanoldwanpipe: _checksrc
@eval "./patches/build_links.sh"
@eval "./patches/clean_old_wanpipe.sh $(WINCLUDE) $(KDIR)/include/linux"
#Check for linux headers
_checksrc:
@if [ ! -e $(KDIR) ]; then \
echo " Error linux headers/source not found: $(KDIR) !"; \
echo ; \
exit 1; \
fi
@if [ ! -e $(KDIR)/.config ]; then \
echo " Error linux headers/source not configured: missing $(KDIR)/.config !"; \
echo ; \
exit 1; \
fi
@if [ ! -e $(KDIR)/include ]; then \
echo " Error linux headers/source incomplete: missing $(KDIR)/include dir !"; \
echo ; \
exit 1; \
fi
_check_kver:
@eval "./patches/kern_i_private_check.sh $(KDIR)"
@echo > ./patches/kfeatures;
@if [ -e ./patches/i_private_found ]; then \
echo "-DWANPIPE_USE_I_PRIVATE " >> ./patches/kfeatures; \
fi
#Check for zaptel
_checkzap:
@echo
@echo " +--------- Wanpipe Build Info --------------+"
@echo
@if [ ! -e $(ZAPDIR)/zaptel.h ]; then \
echo " Compiling Wanpipe without ZAPTEL Support!"; \
ZAPDIR_PRIV=; \
ENABLE_WANPIPEMON_ZAP=NO; \
else \
echo " Compiling Wanpipe with ZAPTEL Support!"; \
echo " Zaptel Dir: $(ZAPDIR)"; \
echo; \
eval "$(PWD)/patches/sangoma-zaptel-patch.sh $(ZAPDIR)"; \
ZAPDIR_PRIV=$(ZAPDIR); \
ENABLE_WANPIPEMON_ZAP=YES; \
echo ; \
echo "Please recompile and reinstall ZAPTEL after installation"; \
fi
@echo
@echo " +-------------------------------------------+"
@echo
@sleep 2;
#Install all utilities etc and modules
install: install_util install_etc install_kmod install_inc
#Install kernel modules only
install_kmod:
@echo
@echo "Wanpipe kmod";
@echo
install -m 644 -D $(WAN_DIR)/wanrouter.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanrouter.${MODTYPE}
install -m 644 -D $(WAN_DIR)/af_wanpipe.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/af_wanpipe.${MODTYPE}
install -m 644 -D $(WAN_DIR)/wanec.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanec.${MODTYPE}
install -m 644 -D $(WAN_DIR)/wan_aften.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wan_aften.${MODTYPE}
install -m 644 -D $(WAN_DIR)/sdladrv.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/sdladrv.${MODTYPE}
install -m 644 -D $(WAN_DIR)/wanpipe.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/wanpipe.${MODTYPE}
@rm -f $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/wanpipe_syncppp.${MODTYPE}
@if [ -f $(WAN_DIR)/wanpipe_syncppp.${MODTYPE} ]; then \
install -m 644 -D $(WAN_DIR)/wanpipe_syncppp.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/drivers/net/wan/wanpipe_syncppp.${MODTYPE}; \
fi
@rm -f $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanpipe_lip.${MODTYPE};
@if [ -f $(WAN_DIR)/wanpipe_lip.${MODTYPE} ]; then \
install -m 644 -D $(WAN_DIR)/wanpipe_lip.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanpipe_lip.${MODTYPE}; \
fi
@eval "./patches/rundepmod.sh"
endif
#Compile utilities only
all_util:
$(MAKE) -C util all EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I $(PWD)/api/libsangoma/include" CC=$(CC) \
PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(ARCH)
$(MAKE) -C util all_wancfg EXTRA_FLAGS="$(EXTRA_UTIL_FLAGS)" SYSINC="$(PWD)/$(WINCLUDE) -I$(PWD)/api/libsangoma/include" CC=$(CC) \
PREFIX=$(INSTALLPREFIX) HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" HOSTCFLAGS="$(EXTRA_UTIL_FLAGS)" ARCH=$(ARCH)
#Clean utilities only
clean_util:
$(MAKE) -C util clean SYSINC=$(PWD)/$(WINCLUDE) CC=$(CC) PREFIX=$(INSTALLPREFIX)
#Install utilities only
install_util:
@echo
@echo "Install util";
@echo
$(MAKE) -C util install SYSINC=$(PWD)/$(WINCLUDE) CC=$(CC) PREFIX=$(INSTALLPREFIX)
#Install etc files
install_etc:
@echo
@echo "Wanpipe etc installing in $(INSTALLPREFIX)/$(WANPIPE_ETC)";
@echo
@if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC) ]; then \
mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC); \
fi
@if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC)/wanrouter.rc ]; then \
install -D -m 644 samples/wanrouter.rc $(INSTALLPREFIX)/$(WANPIPE_ETC)/wanrouter.rc; \
fi
@if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib ]; then \
mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib; \
fi
@\cp -f util/wancfg_legacy/lib/* $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib/
@\cp -rf firmware $(INSTALLPREFIX)/$(WANPIPE_ETC)/
@if [ ! -f $(INSTALLPREFIX)/$(WANPIPE_ETC)/interfaces ]; then \
mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/interfaces; \
fi
@\cp -rf samples $(INSTALLPREFIX)/$(WANPIPE_ETC)
@if [ ! -d $(INSTALLPREFIX)/$(WANPIPE_ETC)/scripts ]; then \
mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/scripts; \
fi
@\cp -rf wan_ec $(INSTALLPREFIX)/$(WANPIPE_ETC)/
@install -D -m 755 samples/wanrouter $(INSTALLPREFIX)/usr/sbin/wanrouter
@echo
@echo "Wanpipe etc installed in $(INSTALLPREFIX)/$(WANPIPE_ETC)";
@echo
install_inc:
@echo
@echo "Install inc";
@echo
@if [ -e $(INSTALLPREFIX)/usr/include/wanpipe ]; then \
\rm -rf $(INSTALLPREFIX)/usr/include/wanpipe; \
fi
@\mkdir -p $(INSTALLPREFIX)/usr/include/wanpipe
@\cp -f $(PWD)/patches/kdrivers/include/*.h $(INSTALLPREFIX)/usr/include/wanpipe/
@\cp -rf $(PWD)/patches/kdrivers/wanec/oct6100_api/include/ $(INSTALLPREFIX)/usr/include/wanpipe/oct6100_api
@\cp -rf $(PWD)/patches/kdrivers/wanec/*.h $(INSTALLPREFIX)/usr/include/wanpipe/
@echo
@echo "End of inc";
@echo

7138
tmp/Setup
View File

File diff suppressed because it is too large Load Diff

101
tmp/diff
View File

@ -1,101 +0,0 @@
--- ../Makefile 2007-10-16 19:21:14.000000000 -0400
+++ Makefile 2007-10-16 21:35:41.000000000 -0400
@@ -48,6 +48,7 @@
WAN_DIR=$(PWD)/$(KMODDIR)/src/net
WANEC_DIR=$(PWD)/$(KMODDIR)/wanec
MODTYPE=ko
+WANPIPE_ETC=/etc/wanpipe
#Setup include path and extra cflags
EXTRA_CFLAGS := -I$(PWD)/$(WINCLUDE) -I$(PWD)/$(WINCLUDE)/annexg -I$(PWD)/patches/kdrivers/wanec -D__LINUX__
@@ -96,8 +97,8 @@
fi
@mkdir -p $(PWD)/ast_build_dir
./Setup drivers --builddir=$(PWD)/ast_build_dir --with-linux=$(KDIR) $(ZAP_OPTS) --usr-cc=$(CC) --protocol=DEF-$(ZAP_PROT) --no-zaptel-compile --noautostart --silent
- cp -f $(PWD)/ast_build_dir/$(KMOD)/kernel/drivers/net/wan/* $(WAN_DIR)/
- cp -f $(PWD)/ast_build_dir/$(KMOD)/kernel/net/wanrouter/* $(WAN_DIR)/
+ cp -f $(PWD)/ast_build_dir/lib/modules/$(KVER)/kernel/drivers/net/wan/* $(WAN_DIR)/
+ cp -f $(PWD)/ast_build_dir/lib/modules/$(KVER)/kernel/net/wanrouter/* $(WAN_DIR)/
#Clean utilites and kernel modules
@@ -166,6 +167,9 @@
#Install kernel modules only
install_kmod:
+ @echo
+ @echo "Wanpipe kmod";
+ @echo
install -m 644 -D $(WAN_DIR)/wanrouter.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanrouter.${MODTYPE}
install -m 644 -D $(WAN_DIR)/af_wanpipe.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/af_wanpipe.${MODTYPE}
install -m 644 -D $(WAN_DIR)/wanec.${MODTYPE} $(INSTALLPREFIX)/$(KINSTDIR)/net/wanrouter/wanec.${MODTYPE}
@@ -197,35 +201,44 @@
#Install utilities only
install_util:
+ @echo
+ @echo "Install util";
+ @echo
$(MAKE) -C util install SYSINC=$(PWD)/$(WINCLUDE) CC=$(CC) PREFIX=$(INSTALLPREFIX)
#Install etc files
install_etc:
- @if [ ! -e $(INSTALLPREFIX)/etc/wanpipe ]; then \
- mkdir -p $(INSTALLPREFIX)/etc/wanpipe; \
+ @echo
+ @echo "Wanpipe etc installing in $(INSTALLPREFIX)/$(WANPIPE_ETC)";
+ @echo
+ @if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC) ]; then \
+ mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC); \
fi
- @if [ ! -e $(INSTALLPREFIX)/etc/wanpipe/wanrouter.rc ]; then \
- install -D -m 644 samples/wanrouter.rc $(INSTALLPREFIX)/etc/wanpipe/wanrouter.rc; \
+ @if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC)/wanrouter.rc ]; then \
+ install -D -m 644 samples/wanrouter.rc $(INSTALLPREFIX)/$(WANPIPE_ETC)/wanrouter.rc; \
fi
- @if [ ! -e $(INSTALLPREFIX)/etc/wanpipe/lib ]; then \
- mkdir -p $(INSTALLPREFIX)/etc/wanpipe/lib; \
+ @if [ ! -e $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib ]; then \
+ mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib; \
fi
- @\cp -f util/wancfg_legacy/lib/* $(INSTALLPREFIX)/etc/wanpipe/lib/
- @\cp -rf firmware $(INSTALLPREFIX)/etc/wanpipe/
- @if [ ! -f $(INSTALLPREFIX)/etc/wanpipe/interfaces ]; then \
- mkdir -p $(INSTALLPREFIX)/etc/wanpipe/interfaces; \
+ @\cp -f util/wancfg_legacy/lib/* $(INSTALLPREFIX)/$(WANPIPE_ETC)/lib/
+ @\cp -rf firmware $(INSTALLPREFIX)/$(WANPIPE_ETC)/
+ @if [ ! -f $(INSTALLPREFIX)/$(WANPIPE_ETC)/interfaces ]; then \
+ mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/interfaces; \
fi
- @\cp -rf samples $(INSTALLPREFIX)/etc/wanpipe
- @if [ ! -d $(INSTALLPREFIX)/etc/wanpipe/scripts ]; then \
- mkdir -p $(INSTALLPREFIX)/etc/wanpipe/scripts; \
+ @\cp -rf samples $(INSTALLPREFIX)/$(WANPIPE_ETC)
+ @if [ ! -d $(INSTALLPREFIX)/$(WANPIPE_ETC)/scripts ]; then \
+ mkdir -p $(INSTALLPREFIX)/$(WANPIPE_ETC)/scripts; \
fi
- @\cp -rf wan_ec $(INSTALLPREFIX)/etc/wanpipe/
+ @\cp -rf wan_ec $(INSTALLPREFIX)/$(WANPIPE_ETC)/
@install -D -m 755 samples/wanrouter $(INSTALLPREFIX)/usr/sbin/wanrouter
@echo
- @echo "Wanpipe etc installed in $(INSTALLPREFIX)/etc/wanpipe";
+ @echo "Wanpipe etc installed in $(INSTALLPREFIX)/$(WANPIPE_ETC)";
@echo
install_inc:
+ @echo
+ @echo "Install inc";
+ @echo
@if [ -e $(INSTALLPREFIX)/usr/include/wanpipe ]; then \
\rm -rf $(INSTALLPREFIX)/usr/include/wanpipe; \
fi
@@ -233,3 +246,9 @@
@\cp -f $(PWD)/patches/kdrivers/include/*.h $(INSTALLPREFIX)/usr/include/wanpipe/
@\cp -rf $(PWD)/patches/kdrivers/wanec/oct6100_api/include/ $(INSTALLPREFIX)/usr/include/wanpipe/oct6100_api
@\cp -rf $(PWD)/patches/kdrivers/wanec/*.h $(INSTALLPREFIX)/usr/include/wanpipe/
+ @echo
+ @echo "End of inc";
+ @echo
+
+
+

53
tmp/kbuild/Makefile
View File

@ -1,53 +0,0 @@
# Makefile for hello world kernel 2.6 module. -*-makefile-*-
#
# Copyright (C) 2004 Joachim Nilsson <joachim.nilsson@member.fsf.org>
#
# Licensed under the GNU General Public License, v2.0 or later,
# at your option. See the file COPYING for details, or the web
# page http://www.gnu.org/copyleft/gpl.html
#
OBJS =
MODULE_NAME =
EXTRA_CFLAGS =
KDIR =
$(MODULE_NAME)-objs = $(OBJS)
SUBDIRS=$(PWD)
RM = @rm -rf
JUNK = *~ *.bak DEADJOE
# First pass, kernel Makefile reads module objects
ifneq ($(KERNELRELEASE),)
obj-m := $(MODULE_NAME).o
# Second pass, the actual build.
else
KVER ?= $(shell uname -r)
PWD := $(shell pwd)
KBUILD_VERBOSE=
all:
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) CC=$(CC) KBUILD_VERBOSE=$(KBUILD_VERBOSE) modules
clean:
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) clean
distclean: clean
$(RM) $(JUNK) $(OBJS)
help:
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) help
# Indents the kernel source the way linux/Documentation/CodingStyle.txt
# wants it to be.
indent:
indent -kr -i8 $($(MODULE_NAME)-objs:.o=.c)
install:
$(MAKE) -C $(KDIR) M=$(SUBDIRS) modules_install
endif

57
tmp/kbuild/Makefile.wanec
View File

@ -1,57 +0,0 @@
# Makefile for hello world kernel 2.6 module. -*-makefile-*-
#
# Copyright (C) 2004 Joachim Nilsson <joachim.nilsson@member.fsf.org>
#
# Licensed under the GNU General Public License, v2.0 or later,
# at your option. See the file COPYING for details, or the web
# page http://www.gnu.org/copyleft/gpl.html
#
OBJS =
MODULE_NAME =
EXTRA_CFLAGS =
KDIR =
$(MODULE_NAME)-objs = $(OBJS)
RM = @rm -rf
JUNK = *~ *.bak DEADJOE
PWD := $(shell pwd)
SUBDIRS=$(PWD)
# First pass, kernel Makefile reads module objects
ifneq ($(KERNELRELEASE),)
obj-m := $(MODULE_NAME).o
# Second pass, the actual build.
else
KVER ?= $(shell uname -r)
PWD := $(shell pwd)
KBUILD_VERBOSE=
all:
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) CC=$(CC) KBUILD_VERBOSE=$(KBUILD_VERBOSE) modules
clean:
$(shell find $(SUBDIRS) -name '*.*o' | xargs rm)
$(shell find $(SUBDIRS) -name '.*.o.cmd' | xargs rm)
$(shell rm -f build.sh)
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) clean
distclean: clean
$(RM) $(JUNK) $(OBJS)
help:
$(MAKE) -C $(KDIR) SUBDIRS=$(SUBDIRS) help
# Indents the kernel source the way linux/Documentation/CodingStyle.txt
# wants it to be.
indent:
indent -kr -i8 $($(MODULE_NAME)-objs:.o=.c)
install:
$(MAKE) -C $(KDIR) M=$(SUBDIRS) modules_install
endif

BIN
tmp/setup.tgz
View File

Binary file not shown.

7
util/wancfg_zaptel/wancfg_zaptel.pl
View File

@ -9,6 +9,7 @@
# as published by the Free Software Foundation; either version
# 2 of the License, or (at your option) any later version.
# ----------------------------------------------------------------------------
# Jun 26 2008 2.13 Jingesh Patel Fixed scritp for wancfg_smg and tdm_api
# May 22 2008 2.12 Jignesh Patel Added confirmation check /dev/zap* for hardhdlc
# May 22 2008 2.12 Jignesh Patel Update zaptel module list
# Jan 02 2008 2.11 David Yat Sin Support for per span configuration in silent mode
@ -32,7 +33,7 @@
system('clear');
print "\n#############################################i##########################";
print "\n# Sangoma Wanpipe: Zaptel/SMG/TDMAPI/BOOT Configuration Script #";
print "\n# v2.12 #";
print "\n# v2.13 #";
print "\n# Sangoma Technologies Inc. #";
print "\n# Copyright(c) 2008. #";
print "\n########################################################################\n\n";
@ -239,7 +240,9 @@ my $date=`date +%F`;
chomp($date);
my $debug_tarball="$wanpipe_conf_dir/debug-".$date.".tgz";
set_zaptel_hwhdlc();
if( $zaptel_installed= $TRUE){
set_zaptel_hwhdlc();
}
prepare_files();
config_t1e1();
config_bri();