wanpipe-3.5.2.tgz
This commit is contained in:
parent
d401f20f8c
commit
59f48227f2
|
|
@ -8,6 +8,12 @@ Copyright (c) 1995-2009 Sangoma Technologies Inc.
|
|||
For more info visit: http://wiki.sangoma.com
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
* Fri May 08 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.2
|
||||
===================================================================
|
||||
|
||||
- B700 PCIe cards were being desplayed as PCI cards in hwprobe
|
||||
- Bug fix in wancfg_zaptel
|
||||
|
||||
* Thu May 07 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.1
|
||||
===================================================================
|
||||
|
||||
|
|
|
|||
2
Setup
2
Setup
|
|
@ -7178,7 +7178,7 @@ KERNEL_UNAME=`uname -r`
|
|||
PKG_NAME=wanpipe
|
||||
DISTR_NAME="WANPIPE"
|
||||
PROD=wanrouter
|
||||
PROD_VER=3.5.1
|
||||
PROD_VER=3.5.2
|
||||
PROD_HOME=`pwd`
|
||||
META_CONF=$PROD_HOME/$PROD.rc
|
||||
WAN_INTR_DIR=$PROD_HOME/interfaces
|
||||
|
|
|
|||
|
|
@ -75,18 +75,6 @@ svn:wc:ra_dav:version-url
|
|||
V 60
|
||||
/svn/libsangoma/!svn/ver/135/trunk/libsangoma-doxygen.config
|
||||
END
|
||||
config.sub
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 43
|
||||
/svn/libsangoma/!svn/ver/1/trunk/config.sub
|
||||
END
|
||||
libsangoma.c
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 47
|
||||
/svn/libsangoma/!svn/ver/148/trunk/libsangoma.c
|
||||
END
|
||||
compile.bat
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
|
|
@ -99,6 +87,18 @@ svn:wc:ra_dav:version-url
|
|||
V 42
|
||||
/svn/libsangoma/!svn/ver/1/trunk/ltmain.sh
|
||||
END
|
||||
config.sub
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 43
|
||||
/svn/libsangoma/!svn/ver/1/trunk/config.sub
|
||||
END
|
||||
libsangoma.c
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 47
|
||||
/svn/libsangoma/!svn/ver/157/trunk/libsangoma.c
|
||||
END
|
||||
cleanup.sh
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
|
|
@ -186,8 +186,8 @@ END
|
|||
configure.in
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 45
|
||||
/svn/libsangoma/!svn/ver/1/trunk/configure.in
|
||||
V 47
|
||||
/svn/libsangoma/!svn/ver/157/trunk/configure.in
|
||||
END
|
||||
ChangeLog
|
||||
K 25
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ file
|
|||
|
||||
|
||||
|
||||
2009-03-31T16:11:47.000000Z
|
||||
2009-05-08T16:30:09.000000Z
|
||||
f84c30e2597ef02a8b7ae6e7abc79cba
|
||||
2009-02-13T23:05:55.921736Z
|
||||
91
|
||||
|
|
@ -58,7 +58,7 @@ file
|
|||
|
||||
|
||||
|
||||
2009-03-31T16:11:47.000000Z
|
||||
2009-05-05T14:59:21.000000Z
|
||||
b64570263ebee3d9e6ba2d2337fd986f
|
||||
2009-02-13T23:05:55.921736Z
|
||||
91
|
||||
|
|
@ -195,14 +195,14 @@ davidr
|
|||
|
||||
libsangoma.c
|
||||
file
|
||||
157
|
||||
|
||||
|
||||
|
||||
|
||||
2009-05-01T15:10:42.000000Z
|
||||
44ce83abbd73b123a56d25e5ff50278a
|
||||
2009-04-29T19:20:14.452199Z
|
||||
148
|
||||
2009-05-08T16:29:30.000000Z
|
||||
4cd810f2bcbadf8088a1ef20c41dabe1
|
||||
2009-05-08T18:19:43.882390Z
|
||||
157
|
||||
ncorbic
|
||||
|
||||
ltmain.sh
|
||||
|
|
@ -405,15 +405,15 @@ ncorbic
|
|||
|
||||
configure.in
|
||||
file
|
||||
157
|
||||
|
||||
|
||||
|
||||
|
||||
2009-02-04T23:12:17.000000Z
|
||||
5b9888fc365c4ebffdbb55656c091a2f
|
||||
2008-02-28T18:51:53.196120Z
|
||||
1
|
||||
root
|
||||
2009-05-01T20:59:30.000000Z
|
||||
d1b810723de5af3fa5ef31ebabfca2a7
|
||||
2009-05-08T18:19:43.882390Z
|
||||
157
|
||||
ncorbic
|
||||
|
||||
ChangeLog
|
||||
file
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT(libsangoma, 1.0.0, anthmct@yahoo.com)
|
||||
AM_INIT_AUTOMAKE(libsangoma,1.0.0)
|
||||
AC_INIT([libsangoma],[2.0.1],[ncorbic@sangoma.com])
|
||||
AM_INIT_AUTOMAKE(libsangoma,2.0.1)
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_RANLIB
|
||||
AC_CHECK_PROG(AR, ar, ar, no)
|
||||
# Checks for libraries.
|
||||
|
||||
AC_CHECK_HEADERS(fcntl.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h math.h)
|
||||
|
|
@ -26,3 +27,4 @@ AC_FUNC_SELECT_ARGTYPES
|
|||
AC_CHECK_FUNCS([gettimeofday memset select socket])
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
|
|
|
|||
|
|
@ -1058,7 +1058,7 @@ int _SAPI_CALL sangoma_get_full_cfg(sng_fd_t fd, wanpipe_api_t *tdm_api)
|
|||
return err;
|
||||
}
|
||||
|
||||
#if 1
|
||||
#if 0
|
||||
printf("TDM API CFG:\n");
|
||||
printf("\thw_tdm_coding:\t%d\n",tdm_api->wp_cmd.hw_tdm_coding);
|
||||
printf("\thw_mtu_mru:\t%d\n",tdm_api->wp_cmd.hw_mtu_mru);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for libsangoma 2.0.1.
|
||||
# Generated by GNU Autoconf 2.59 for libsangoma 1.0.0.
|
||||
#
|
||||
# Report bugs to <ncorbic@sangoma.com>.
|
||||
# Report bugs to <anthmct@yahoo.com>.
|
||||
#
|
||||
# Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
# This configure script is free software; the Free Software Foundation
|
||||
|
|
@ -423,9 +423,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='libsangoma'
|
||||
PACKAGE_TARNAME='libsangoma'
|
||||
PACKAGE_VERSION='2.0.1'
|
||||
PACKAGE_STRING='libsangoma 2.0.1'
|
||||
PACKAGE_BUGREPORT='ncorbic@sangoma.com'
|
||||
PACKAGE_VERSION='1.0.0'
|
||||
PACKAGE_STRING='libsangoma 1.0.0'
|
||||
PACKAGE_BUGREPORT='anthmct@yahoo.com'
|
||||
|
||||
# Factoring default headers for most tests.
|
||||
ac_includes_default="\
|
||||
|
|
@ -953,7 +953,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures libsangoma 2.0.1 to adapt to many kinds of systems.
|
||||
\`configure' configures libsangoma 1.0.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1019,7 +1019,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of libsangoma 2.0.1:";;
|
||||
short | recursive ) echo "Configuration of libsangoma 1.0.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1063,7 +1063,7 @@ Some influential environment variables:
|
|||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <ncorbic@sangoma.com>.
|
||||
Report bugs to <anthmct@yahoo.com>.
|
||||
_ACEOF
|
||||
fi
|
||||
|
||||
|
|
@ -1159,7 +1159,7 @@ fi
|
|||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
libsangoma configure 2.0.1
|
||||
libsangoma configure 1.0.0
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
|
|
@ -1173,7 +1173,7 @@ cat >&5 <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by libsangoma $as_me 2.0.1, which was
|
||||
It was created by libsangoma $as_me 1.0.0, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -1816,7 +1816,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE=libsangoma
|
||||
VERSION=2.0.1
|
||||
VERSION=1.0.0
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -4450,9 +4450,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
|
|||
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ---------------------------------- ##
|
||||
## Report this to ncorbic@sangoma.com ##
|
||||
## ---------------------------------- ##
|
||||
## -------------------------------- ##
|
||||
## Report this to anthmct@yahoo.com ##
|
||||
## -------------------------------- ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
|
|
@ -18691,42 +18691,6 @@ else
|
|||
RANLIB="$ac_cv_prog_RANLIB"
|
||||
fi
|
||||
|
||||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_AR+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$AR"; then
|
||||
ac_cv_prog_AR="$AR" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_AR="ar"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="no"
|
||||
fi
|
||||
fi
|
||||
AR=$ac_cv_prog_AR
|
||||
if test -n "$AR"; then
|
||||
echo "$as_me:$LINENO: result: $AR" >&5
|
||||
echo "${ECHO_T}$AR" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
# Checks for libraries.
|
||||
|
||||
|
||||
|
|
@ -18859,9 +18823,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
|
|||
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ---------------------------------- ##
|
||||
## Report this to ncorbic@sangoma.com ##
|
||||
## ---------------------------------- ##
|
||||
## -------------------------------- ##
|
||||
## Report this to anthmct@yahoo.com ##
|
||||
## -------------------------------- ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
|
|
@ -19098,9 +19062,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&
|
|||
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
|
||||
(
|
||||
cat <<\_ASBOX
|
||||
## ---------------------------------- ##
|
||||
## Report this to ncorbic@sangoma.com ##
|
||||
## ---------------------------------- ##
|
||||
## -------------------------------- ##
|
||||
## Report this to anthmct@yahoo.com ##
|
||||
## -------------------------------- ##
|
||||
_ASBOX
|
||||
) |
|
||||
sed "s/^/$as_me: WARNING: /" >&2
|
||||
|
|
@ -19745,7 +19709,7 @@ _ASBOX
|
|||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by libsangoma $as_me 2.0.1, which was
|
||||
This file was extended by libsangoma $as_me 1.0.0, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -19803,7 +19767,7 @@ _ACEOF
|
|||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
libsangoma config.status 2.0.1
|
||||
libsangoma config.status 1.0.0
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
@ -20540,4 +20504,3 @@ if test "$no_create" != yes; then
|
|||
$ac_cs_success || { (exit 1); exit 1; }
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1058,7 +1058,7 @@ int _SAPI_CALL sangoma_get_full_cfg(sng_fd_t fd, wanpipe_api_t *tdm_api)
|
|||
return err;
|
||||
}
|
||||
|
||||
#if 1
|
||||
#if 0
|
||||
printf("TDM API CFG:\n");
|
||||
printf("\thw_tdm_coding:\t%d\n",tdm_api->wp_cmd.hw_tdm_coding);
|
||||
printf("\thw_mtu_mru:\t%d\n",tdm_api->wp_cmd.hw_mtu_mru);
|
||||
|
|
|
|||
|
|
@ -3,3 +3,15 @@ svn:wc:ra_dav:version-url
|
|||
V 62
|
||||
/svn/libsangoma/!svn/ver/155/trunk/sample_c/regression/latency
|
||||
END
|
||||
sample.c
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 71
|
||||
/svn/libsangoma/!svn/ver/157/trunk/sample_c/regression/latency/sample.c
|
||||
END
|
||||
Makefile.Linux
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 77
|
||||
/svn/libsangoma/!svn/ver/157/trunk/sample_c/regression/latency/Makefile.Linux
|
||||
END
|
||||
|
|
|
|||
|
|
@ -28,26 +28,15 @@ ncorbic
|
|||
|
||||
sample.c
|
||||
file
|
||||
155
|
||||
|
||||
|
||||
add
|
||||
|
||||
9c3d43435534fe23358b483fd9b63b3f
|
||||
157
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
copied
|
||||
https://www.sangomapbx.com/svn/libsangoma/trunk/sample_c/regression/latency/sample_dtmf.c
|
||||
155
|
||||
2009-05-05T20:53:34.000000Z
|
||||
2a12b767a760ddfb4355e9e744deedec
|
||||
2009-05-08T18:19:43.882390Z
|
||||
157
|
||||
ncorbic
|
||||
|
||||
short-dtmf.wav
|
||||
file
|
||||
|
|
@ -76,25 +65,37 @@ ncorbic
|
|||
|
||||
Makefile.Linux
|
||||
file
|
||||
157
|
||||
|
||||
|
||||
|
||||
|
||||
2009-05-04T12:34:59.000000Z
|
||||
5f0316a21bfb3b31d2603de44b150173
|
||||
2009-05-04T14:23:31.206565Z
|
||||
155
|
||||
2009-05-04T12:39:55.000000Z
|
||||
5d1313f1e45ef0989f70fc11f808605b
|
||||
2009-05-08T18:19:43.882390Z
|
||||
157
|
||||
ncorbic
|
||||
|
||||
sample_dtmf.c
|
||||
file
|
||||
157
|
||||
|
||||
|
||||
|
||||
delete
|
||||
2009-05-04T12:34:59.000000Z
|
||||
9c3d43435534fe23358b483fd9b63b3f
|
||||
2009-05-04T14:23:31.206565Z
|
||||
155
|
||||
ncorbic
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
deleted
|
||||
|
||||
|
|
|
|||
|
|
@ -5,19 +5,19 @@ INCLUDES=-I../ -I/usr/include -I/usr/src/libpri -I$(WANINC) -I. -I/usr/local/in
|
|||
CFLAGS=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -O2 -DWANPIPE_TDM_API
|
||||
CCFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g
|
||||
|
||||
all: sample_dtmf
|
||||
all: sample
|
||||
|
||||
everything: sample_dtmf
|
||||
everything: sample
|
||||
|
||||
|
||||
lib_api.o: lib_api.c
|
||||
$(CC) $(CCFLAGS) $(INCLUDES) $(CFLAGS) -c -o lib_api.o lib_api.c
|
||||
|
||||
sample_dtmf.o: sample_dtmf.c
|
||||
$(CC) $(CCFLAGS) $(INCLUDES) $(CFLAGS) -c -o sample_dtmf.o sample_dtmf.c
|
||||
sample.o: sample.c
|
||||
$(CC) $(CCFLAGS) $(INCLUDES) $(CFLAGS) -c -o sample.o sample.c
|
||||
|
||||
sample_dtmf: sample_dtmf.o lib_api.o
|
||||
$(CC) $(CCFLAGS) $(INCLUDES) $(CFLAGS) -o sample_dtmf sample_dtmf.o lib_api.o -L. -lsangoma -lm -lpthread
|
||||
sample: sample.o lib_api.o
|
||||
$(CC) $(CCFLAGS) $(INCLUDES) $(CFLAGS) -o sample sample.o lib_api.o -L. -lsangoma -lm -lpthread
|
||||
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ typedef struct {
|
|||
int elapsed_max;
|
||||
int elapsed_min;
|
||||
|
||||
unsigned char rx_sync;
|
||||
unsigned char tx_sync;
|
||||
struct timeval tv_sync_start;
|
||||
|
||||
wanpipe_chan_stats_t stats;
|
||||
}sangoma_channel_t;
|
||||
|
||||
|
|
@ -244,12 +248,30 @@ int read_data(sangoma_channel_t *schan)
|
|||
sangoma_tdm_write_rbs(dev_fd, &tdm_api, schan->chan, schan->rx_rbs_bits);
|
||||
}
|
||||
|
||||
if (schan->tx_sync && !schan->rx_sync) {
|
||||
int i;
|
||||
for (i=0;i<Rx_lgth;i++) {
|
||||
if (rx_el->data[i]==tx_data) {
|
||||
struct timeval last;
|
||||
int elapsed;
|
||||
gettimeofday(&last, NULL);
|
||||
elapsed = abs((((last.tv_sec * 1000) + last.tv_usec / 1000) - ((schan->tv_sync_start.tv_sec * 1000) + schan->tv_sync_start.tv_usec / 1000)));
|
||||
|
||||
|
||||
printf("wanpipe%d: Rx Sync Time %i ms Data=0x%X\n",
|
||||
schan->span, elapsed, tx_data);
|
||||
schan->rx_sync=1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* if user needs Rx data to be written into a file: */
|
||||
if(files_used & RX_FILE_USED){
|
||||
write_data_to_file(schan, rx_el->data, Rx_lgth);
|
||||
}
|
||||
|
||||
return 0;
|
||||
return Rx_lgth;
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
@ -329,12 +351,22 @@ int handle_data(sangoma_channel_t *schan)
|
|||
#endif
|
||||
|
||||
if(api_poll_status & POLLIN){
|
||||
|
||||
if(read_data(schan) == 0){
|
||||
|
||||
int err;
|
||||
|
||||
err = read_data(schan);
|
||||
if(err > 0) {
|
||||
if(rx2tx){
|
||||
/* Send back received data (create a "software loopback"), just a test. */
|
||||
int err=write_data(schan, &rx_el->hdr, rx_el->data);
|
||||
if (tx_data) {
|
||||
memset(rx_el->data, tx_data, err);
|
||||
}
|
||||
if (!schan->tx_sync) {
|
||||
schan->tx_sync=1;
|
||||
sangoma_flush_bufs(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
sangoma_flush_stats(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
gettimeofday(&schan->tv_sync_start, NULL);
|
||||
}
|
||||
err=write_data(schan, &rx_el->hdr, rx_el->data);
|
||||
if (err) {
|
||||
return err;
|
||||
}
|
||||
|
|
@ -342,6 +374,7 @@ int handle_data(sangoma_channel_t *schan)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
if((api_poll_status & POLLOUT) && write_enable){
|
||||
|
||||
int err;
|
||||
|
|
@ -363,12 +396,20 @@ int handle_data(sangoma_channel_t *schan)
|
|||
}
|
||||
}
|
||||
|
||||
if (!schan->tx_sync) {
|
||||
schan->tx_sync=1;
|
||||
sangoma_flush_bufs(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
sangoma_flush_stats(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
gettimeofday(&schan->tv_sync_start, NULL);
|
||||
}
|
||||
|
||||
err=write_data(schan, api_tx_hdr, tx_el->data);
|
||||
if (err != 0) {
|
||||
return err;
|
||||
}
|
||||
|
||||
}/* if() */
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -691,8 +732,12 @@ static void *handle_span_chan(void *obj)
|
|||
if (flush_period &&
|
||||
schan->loop_cnt % flush_period == 0) {
|
||||
printf("%s: Flushing Buffers\n",schan->name);
|
||||
sangoma_flush_bufs(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
sangoma_get_print_stats(schan);
|
||||
//sangoma_flush_bufs(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
tdm_api.wp_cmd.cmd = WP_API_CMD_GEN_FIFO_ERR;
|
||||
sangoma_cmd_exec(schan->sangoma_wait_object.fd,&tdm_api);
|
||||
schan->tx_sync=0;
|
||||
schan->rx_sync=0;
|
||||
//sangoma_get_print_stats(schan);
|
||||
}
|
||||
|
||||
}/* for() */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
Package: wanpipe
|
||||
Version: 3.5.1-0
|
||||
Version: 3.5.2-0
|
||||
Section: networking
|
||||
Priority: optional
|
||||
Architecture: all
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#define WANPIPE_COMPANY "Sangoma Technologies Inc"
|
||||
|
||||
/********** LINUX **********/
|
||||
#define WANPIPE_VERSION "3.5.1"
|
||||
#define WANPIPE_VERSION "3.5.2"
|
||||
#define WANPIPE_SUB_VERSION "0"
|
||||
#define WANPIPE_VERSION_BETA 1
|
||||
#define WANPIPE_LITE_VERSION "1.1.1"
|
||||
|
|
@ -18,8 +18,8 @@
|
|||
#if defined(__LINUX__)
|
||||
#define WANPIPE_VERSION_MAJOR 3
|
||||
#define WANPIPE_VERSION_MINOR 5
|
||||
#define WANPIPE_VERSION_MINOR1 0
|
||||
#define WANPIPE_VERSION_MINOR2 49
|
||||
#define WANPIPE_VERSION_MINOR1 2
|
||||
#define WANPIPE_VERSION_MINOR2 0
|
||||
#endif
|
||||
|
||||
/********** FreeBSD **********/
|
||||
|
|
|
|||
|
|
@ -2968,6 +2968,7 @@ sdla_pci_probe_aft(sdlahw_t *hw, int bus_no, int slot_no, int irq)
|
|||
case AFT_2SERIAL_RS232_SUBSYS_VENDOR:
|
||||
case AFT_4SERIAL_RS232_SUBSYS_VENDOR:
|
||||
case AFT_A600_SUBSYS_VENDOR:
|
||||
case A700_SHARK_SUBSYS_VENDOR:
|
||||
sdla_pcibridge_detect(hwcard);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
%define WANPIPE_VER wanpipe-modules
|
||||
%define name %{WANPIPE_VER}
|
||||
%define version 3.5.1
|
||||
%define version 3.5.2
|
||||
%define release 0
|
||||
%define serial 1
|
||||
%define MODULES_DIR /lib/modules
|
||||
|
|
@ -51,6 +51,12 @@ echo "Wanpipe Modules located in %{MODULES_DIR}/%{KVERSION}"
|
|||
|
||||
%changelog
|
||||
|
||||
* Fri May 08 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.2
|
||||
===================================================================
|
||||
|
||||
- B700 PCIe cards were being desplayed as PCI cards in hwprobe
|
||||
- Bug fix in wancfg_zaptel
|
||||
|
||||
* Thu May 07 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.1
|
||||
===================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%define KERNEL_VERSION %{?kern_ver}
|
||||
%define WANPIPE_VER wanpipe-util
|
||||
%define name %{WANPIPE_VER}
|
||||
%define version 3.5.1
|
||||
%define version 3.5.2
|
||||
%define release 0
|
||||
%define serial 1
|
||||
%define ETC_DIR /etc
|
||||
|
|
@ -328,6 +328,12 @@ enable_smg_log;
|
|||
|
||||
%changelog
|
||||
|
||||
* Fri May 08 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.2
|
||||
===================================================================
|
||||
|
||||
- B700 PCIe cards were being desplayed as PCI cards in hwprobe
|
||||
- Bug fix in wancfg_zaptel
|
||||
|
||||
* Thu May 07 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.1
|
||||
===================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%define KERNEL_VERSION %{?kern_ver}
|
||||
%define WANPIPE_VER wanpipe
|
||||
%define name %{WANPIPE_VER}
|
||||
%define version 3.5.1
|
||||
%define version 3.5.2
|
||||
%define release 0
|
||||
%define serial 1
|
||||
%define UTILS_DIR /usr/sbin
|
||||
|
|
@ -255,6 +255,12 @@ install_init;
|
|||
|
||||
%changelog
|
||||
|
||||
* Fri May 08 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.2
|
||||
===================================================================
|
||||
|
||||
- B700 PCIe cards were being desplayed as PCI cards in hwprobe
|
||||
- Bug fix in wancfg_zaptel
|
||||
|
||||
* Thu May 07 2009 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.5.1
|
||||
===================================================================
|
||||
|
||||
|
|
|
|||
|
|
@ -2205,7 +2205,7 @@ init_global_params()
|
|||
{
|
||||
|
||||
if [ $OSYSTEM = "Linux" ]; then
|
||||
ROUTER_VERSION=3.5.1
|
||||
ROUTER_VERSION=3.5.2
|
||||
IFCONFIG_LIST=ifconfig
|
||||
MODULE_STAT=lsmod
|
||||
WAN_DRIVERS="wanpipe"
|
||||
|
|
|
|||
|
|
@ -21,23 +21,23 @@ svn:wc:ra_dav:version-url
|
|||
V 97
|
||||
/svn/wanpipe/!svn/ver/7323/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/uninstall.sh
|
||||
END
|
||||
boostspan.pm
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 97
|
||||
/svn/wanpipe/!svn/ver/7535/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/boostspan.pm
|
||||
END
|
||||
setup-sangoma
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 98
|
||||
/svn/wanpipe/!svn/ver/7323/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/setup-sangoma
|
||||
END
|
||||
wancfg_zaptel
|
||||
boostspan.pm
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 98
|
||||
/svn/wanpipe/!svn/ver/7323/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_zaptel
|
||||
V 97
|
||||
/svn/wanpipe/!svn/ver/7535/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/boostspan.pm
|
||||
END
|
||||
A10x.pm
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 92
|
||||
/svn/wanpipe/!svn/ver/7635/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/A10x.pm
|
||||
END
|
||||
Card.pm
|
||||
K 25
|
||||
|
|
@ -45,11 +45,11 @@ svn:wc:ra_dav:version-url
|
|||
V 92
|
||||
/svn/wanpipe/!svn/ver/7608/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/Card.pm
|
||||
END
|
||||
A10x.pm
|
||||
wancfg_zaptel
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 92
|
||||
/svn/wanpipe/!svn/ver/7635/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/A10x.pm
|
||||
V 98
|
||||
/svn/wanpipe/!svn/ver/7323/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_zaptel
|
||||
END
|
||||
A20x.pm
|
||||
K 25
|
||||
|
|
@ -81,18 +81,18 @@ svn:wc:ra_dav:version-url
|
|||
V 94
|
||||
/svn/wanpipe/!svn/ver/7535/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_fs
|
||||
END
|
||||
wancfg_zaptel.pl
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 101
|
||||
/svn/wanpipe/!svn/ver/7682/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_zaptel.pl
|
||||
END
|
||||
wancfg_dahdi
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 97
|
||||
/svn/wanpipe/!svn/ver/7323/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_dahdi
|
||||
END
|
||||
wancfg_zaptel.pl
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 101
|
||||
/svn/wanpipe/!svn/ver/7669/wanpipe_common/branches/jpatel_new/wantools/wancfg_zaptel/wancfg_zaptel.pl
|
||||
END
|
||||
analogspan.pm
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
|
|
|
|||
|
|
@ -64,6 +64,18 @@ file
|
|||
sangoma
|
||||
has-props
|
||||
|
||||
boostspan.pm
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2009-04-07T21:16:44.000000Z
|
||||
8948e0709dd4dd21a73477daed531949
|
||||
2009-04-08T15:24:10.094544Z
|
||||
7535
|
||||
jpatel
|
||||
|
||||
setup-sangoma
|
||||
file
|
||||
|
||||
|
|
@ -77,29 +89,18 @@ c631bf29819aed1b49bcd46369e06b59
|
|||
sangoma
|
||||
has-props
|
||||
|
||||
boostspan.pm
|
||||
wancfg_zaptel
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2009-04-07T21:16:44.000000Z
|
||||
8948e0709dd4dd21a73477daed531949
|
||||
2009-04-08T15:24:10.094544Z
|
||||
7535
|
||||
jpatel
|
||||
|
||||
A10x.pm
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2009-04-29T18:33:09.000000Z
|
||||
30e5452dacdc312595c854c1b7ca3fb8
|
||||
2009-04-27T23:10:02.151043Z
|
||||
7635
|
||||
jpatel
|
||||
2009-04-01T18:10:26.000000Z
|
||||
0c2f52a3b64e425d9b18b3d1a29586e8
|
||||
2008-01-08T21:32:19.000000Z
|
||||
5238
|
||||
sangoma
|
||||
has-props
|
||||
|
||||
Card.pm
|
||||
file
|
||||
|
|
@ -113,18 +114,17 @@ dc1c67323bcd74e1c0a64c7b33af5c5f
|
|||
7608
|
||||
jpatel
|
||||
|
||||
wancfg_zaptel
|
||||
A10x.pm
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2009-04-01T18:10:26.000000Z
|
||||
0c2f52a3b64e425d9b18b3d1a29586e8
|
||||
2008-01-08T21:32:19.000000Z
|
||||
5238
|
||||
sangoma
|
||||
has-props
|
||||
2009-04-29T18:33:09.000000Z
|
||||
30e5452dacdc312595c854c1b7ca3fb8
|
||||
2009-04-27T23:10:02.151043Z
|
||||
7635
|
||||
jpatel
|
||||
|
||||
A20x.pm
|
||||
file
|
||||
|
|
@ -189,6 +189,9 @@ b0dd0ff9bb1ecad55b1306f13bd2580f
|
|||
jpatel
|
||||
has-props
|
||||
|
||||
templates
|
||||
dir
|
||||
|
||||
wancfg_dahdi
|
||||
file
|
||||
|
||||
|
|
@ -202,19 +205,16 @@ file
|
|||
jpatel
|
||||
has-props
|
||||
|
||||
templates
|
||||
dir
|
||||
|
||||
wancfg_zaptel.pl
|
||||
file
|
||||
7682
|
||||
|
||||
|
||||
|
||||
|
||||
2009-05-05T18:45:53.000000Z
|
||||
630ed59c6badbae7aa4d9b5d7e6c9d7e
|
||||
2009-05-06T17:18:16.245239Z
|
||||
7669
|
||||
2009-05-08T16:08:01.000000Z
|
||||
741d97bced1a1b7305edbaa51903bee9
|
||||
2009-05-08T17:56:28.376256Z
|
||||
7682
|
||||
jpatel
|
||||
has-props
|
||||
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ if ($os_type_list =~ m/FreeBSD/ && $zaptel_dahdi_installed==$TRUE) {
|
|||
update_zaptel_cfg_script();
|
||||
}
|
||||
|
||||
if( $zaptel_installed==$TRUE && $os_type_list =~ m/Linux/ ) {
|
||||
if( $zaptel_installed==$TRUE && $os_type_list =~ m/Linux/ && $is_fs == $FALSE) {
|
||||
set_zaptel_hwhdlc();
|
||||
}
|
||||
|
||||
|
|
@ -376,11 +376,13 @@ if ($os_type_list =~ m/FreeBSD/){
|
|||
config_boot_freebsd();
|
||||
} else {
|
||||
config_boot_linux();
|
||||
config_smg_ctrl_boot();
|
||||
}
|
||||
|
||||
config_ztcfg_start();
|
||||
config_smg_ctrl_start();
|
||||
if($os_type_list =~ m/Linux/){
|
||||
config_smg_ctrl_boot();
|
||||
}
|
||||
clean_files();
|
||||
print "Sangoma cards configuration complete, exiting...\n\n";
|
||||
|
||||
|
|
@ -3411,7 +3413,7 @@ sub config_smg_ctrl_boot {
|
|||
if($silent==$FALSE){
|
||||
print ("Would you like $script_name to start on system boot?\n");
|
||||
$res= &prompt_user_list("YES","NO","");
|
||||
if($res=='NO'){
|
||||
if($res eq "NO"){
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ if ($os_type_list =~ m/FreeBSD/ && $zaptel_dahdi_installed==$TRUE) {
|
|||
update_zaptel_cfg_script();
|
||||
}
|
||||
|
||||
if( $zaptel_installed==$TRUE && $os_type_list =~ m/Linux/ ) {
|
||||
if( $zaptel_installed==$TRUE && $os_type_list =~ m/Linux/ && $is_fs == $FALSE) {
|
||||
set_zaptel_hwhdlc();
|
||||
}
|
||||
|
||||
|
|
@ -376,11 +376,13 @@ if ($os_type_list =~ m/FreeBSD/){
|
|||
config_boot_freebsd();
|
||||
} else {
|
||||
config_boot_linux();
|
||||
config_smg_ctrl_boot();
|
||||
}
|
||||
|
||||
config_ztcfg_start();
|
||||
config_smg_ctrl_start();
|
||||
if($os_type_list =~ m/Linux/){
|
||||
config_smg_ctrl_boot();
|
||||
}
|
||||
clean_files();
|
||||
print "Sangoma cards configuration complete, exiting...\n\n";
|
||||
|
||||
|
|
@ -3411,7 +3413,7 @@ sub config_smg_ctrl_boot {
|
|||
if($silent==$FALSE){
|
||||
print ("Would you like $script_name to start on system boot?\n");
|
||||
$res= &prompt_user_list("YES","NO","");
|
||||
if($res=='NO'){
|
||||
if($res eq "NO"){
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue