webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update:

Browse Source 
* Asterisk und Konsorten auf neuesten Stand gebracht.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@243 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-08-12 12:40:44 +00:00
parent 5ac2da9f10
commit ae179f6ea6
9 changed files with 2585 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/packages-list.txt
View File

@@ -34,6 +34,7 @@
* applejuice-0.30 * applejuice-0.30
* arping-2.05 * arping-2.05
* as86-0.16.17 * as86-0.16.17
* asterisk-1.2.10
* asterisk-1.2.9.1 * asterisk-1.2.9.1
* autoconf-2.59 * autoconf-2.59
* automake-1.8.4 * automake-1.8.4
@@ -46,13 +47,13 @@
* bootsplash-3.2 * bootsplash-3.2
* bridge-utils-1.1 * bridge-utils-1.1
* bristuff-0.3.0-PRE-1q * bristuff-0.3.0-PRE-1q
* bristuff-0.3.0-PRE-1s
* busybox-0.60.5 * busybox-0.60.5
* bzip2-1.0.3 * bzip2-1.0.3
* capi4k-utils-2004-10-06 * capi4k-utils-2004-10-06
* ccache-2.3 * ccache-2.3
* cdrtools-2.01 * cdrtools-2.01
* cftp-0.12 * cftp-0.12
* clamav-0.88.3
* clamav-0.88.4 * clamav-0.88.4
* coreutils-5.93 * coreutils-5.93
* cups-1.1.23-source * cups-1.1.23-source
@@ -99,7 +100,6 @@
* glibc-2.3.3-lfs-5.1 * glibc-2.3.3-lfs-5.1
* gmp-4.1.2 * gmp-4.1.2
* gnump3d-2.9.8 * gnump3d-2.9.8
* gnupg-1.4.2
* gnupg-1.4.5 * gnupg-1.4.5
* grep-2.5.1 * grep-2.5.1
* groff-1.19 * groff-1.19
@@ -114,6 +114,7 @@
* inetutils-1.4.2 * inetutils-1.4.2
* ipac-ng-1.31 * ipac-ng-1.31
* ipaddr-1.2 * ipaddr-1.2
* ipfire-logs-2006-08-09-18:56.tgz
* iproute2-2.4.7-now-ss010824 * iproute2-2.4.7-now-ss010824
* iptables-1.3.5 * iptables-1.3.5
* iptstate-1.4 * iptstate-1.4
@@ -140,7 +141,6 @@
* libvorbis-1.1.2 * libvorbis-1.1.2
* libwww-perl-5.803 * libwww-perl-5.803
* libxml2-2.6.22 * libxml2-2.6.22
* linux-2.4.31
* linux-2.4.32 * linux-2.4.32
* linux-atm-2.4.1 * linux-atm-2.4.1
* logrotate-3.7 * logrotate-3.7
@@ -201,7 +201,6 @@
* razor-agents-2.81 * razor-agents-2.81
* rp-pppoe-3.5 * rp-pppoe-3.5
* rrdtool-1.0.49 * rrdtool-1.0.49
* samba-3.0.22
* samba-3.0.23a * samba-3.0.23a
* sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15 * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15
* screen-4.0.2 * screen-4.0.2
@@ -241,4 +240,5 @@
* xinetd-2.3.14 * xinetd-2.3.14
* xmbmon205 * xmbmon205
* zaptel-1.2.6 * zaptel-1.2.6
* zaptel-1.2.7
* zlib-1.2.3 * zlib-1.2.3

26
lfs/asterisk
View File

@@ -26,7 +26,7 @@
include Config include Config
VER = 1.2.9.1 VER = 1.2.10
THISAPP = asterisk-$(VER) THISAPP = asterisk-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -44,19 +44,28 @@ objects = $(DL_FILE) \
app_rxfax.c \ app_rxfax.c \
app_txfax.c \ app_txfax.c \
apps_Makefile.patch \ apps_Makefile.patch \
asterisk-sounds-de-1.2.5.tar.gz asterisk-sounds-de-1.2.5.tar.gz \
asterisk-sounds-1.2.1.tar.gz \
asterisk-addons-1.2.3.tar.gz \
asterisk-perl-0.08.tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
app_rxfax.c = $(URL_IPFIRE)/app_rxfax.c app_rxfax.c = $(URL_IPFIRE)/app_rxfax.c
app_txfax.c = $(URL_IPFIRE)/app_txfax.c app_txfax.c = $(URL_IPFIRE)/app_txfax.c
apps_Makefile.patch = $(URL_IPFIRE)/apps_Makefile.patch apps_Makefile.patch = $(URL_IPFIRE)/apps_Makefile.patch
asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz
asterisk-sounds-1.2.1.tar.gz = $(URL_IPFIRE)/asterisk-sounds-1.2.1.tar.gz
asterisk-addons-1.2.3.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.2.3.tar.gz
asterisk-perl-0.08.tar.gz = $(URL_IPFIRE)/asterisk-perl-0.08.tar.gz
$(DL_FILE)_MD5 = d98fc3dc5ee8df691ca2b0bd309bb251 $(DL_FILE)_MD5 = ec52095bb5cfe583df1dd5f98366797a
app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999 app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999
app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439 app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439
apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583 apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583
asterisk-sounds-1.2.1.tar.gz_MD5 = bed4259905a7d7bc070c6319142b2075
asterisk-sounds-de-1.2.5.tar.gz_MD5 = 3793735c44de899dbacb8c192501aa14 asterisk-sounds-de-1.2.5.tar.gz_MD5 = 3793735c44de899dbacb8c192501aa14
asterisk-addons-1.2.3.tar.gz_MD5 = 2089e119985508b5a4a1916e2242184d
asterisk-perl-0.08.tar.gz_MD5 = 73a47caaff8cafbf78053692f408ceb6
install : $(TARGET) install : $(TARGET)
@@ -99,5 +108,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make samples ASTETCDIR=/var/ipfire/asterisk cd $(DIR_APP) && make samples ASTETCDIR=/var/ipfire/asterisk
tar xfz $(DIR_DL)/asterisk-sounds-de-1.2.5.tar.gz -C /var/lib/asterisk/sounds/ tar xfz $(DIR_DL)/asterisk-sounds-de-1.2.5.tar.gz -C /var/lib/asterisk/sounds/
rm -f /var/lib/asterisk/sounds/README.txt rm -f /var/lib/asterisk/sounds/README.txt
cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-sounds-1.2.1.tar.gz
cd $(DIR_SRC)/asterisk-sounds-1.2.1/ && make all install
rm -rf $(DIR_SRC)/asterisk-sounds-1.2.1
cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.2.3.tar.gz
cd $(DIR_SRC)/asterisk-addons-1.2.3/ && make all install
rm -rf $(DIR_SRC)/asterisk-addons-1.2.3
cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-perl-0.08.tar.gz
cd $(DIR_SRC)/asterisk-perl-0.08/ && perl Makefile.PL
cd $(DIR_SRC)/asterisk-perl-0.08/ && make
cd $(DIR_SRC)/asterisk-perl-0.08/ && make install
rm -rf $(DIR_SRC)/asterisk-perl-0.08
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

4
lfs/bristuff
View File

@@ -26,7 +26,7 @@
include Config include Config
VER = 0.3.0-PRE-1q VER = 0.3.0-PRE-1s
THISAPP = bristuff-$(VER) THISAPP = bristuff-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9b3ef09eca7166b7277e8519a11844bf $(DL_FILE)_MD5 = 760eba19b03d03cd1dc8648d6239b4af
install : $(TARGET) install : $(TARGET)

4
lfs/zaptel
View File

@@ -26,7 +26,7 @@
include Config include Config
VER = 1.2.6 VER = 1.2.7
THISAPP = zaptel-$(VER) THISAPP = zaptel-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = c6058b74f43ae12a29e486cf1e919562 $(DL_FILE)_MD5 = 5134f361d92e5ec7342d7e80bad7d30a
install : $(TARGET) install : $(TARGET)

3
make.sh
View File

@@ -879,7 +879,9 @@ ipfirepackages() {
ipfiredist gnump3d ipfiredist gnump3d
ipfiredist java ipfiredist java
ipfiredist lame ipfiredist lame
ipfiredist libogg
ipfiredist libtiff ipfiredist libtiff
ipfiredist libvorbis
ipfiredist libxml2 ipfiredist libxml2
ipfiredist mailx ipfiredist mailx
ipfiredist mldonkey ipfiredist mldonkey
@@ -889,6 +891,7 @@ ipfirepackages() {
ipfiredist postfix ipfiredist postfix
ipfiredist procmail ipfiredist procmail
ipfiredist samba ipfiredist samba
ipfiredist sox
ipfiredist spamassassin ipfiredist spamassassin
ipfiredist web-cyradm ipfiredist web-cyradm
ipfiredist xampp ipfiredist xampp

1344
src/paks/asterisk/ROOTFILES
View File

File diff suppressed because it is too large Load Diff

1530
src/patches/asterisk.patch
View File

File diff suppressed because it is too large Load Diff

247
src/patches/libpri.patch
View File

@@ -1,22 +1,26 @@
diff -urN libpri-1.2.3.orig/Makefile libpri-1.2.3/Makefile diff -urN libpri-1.2.3.orig/Makefile libpri-1.2.3/Makefile
--- libpri-1.2.3.orig/Makefile 2006-04-30 17:17:47.000000000 +0200 --- libpri-1.2.3.orig/Makefile 2006-04-30 17:17:47.000000000 +0200
+++ libpri-1.2.3/Makefile 2006-06-09 10:18:25.000000000 +0200 +++ libpri-1.2.3/Makefile 2006-07-27 17:45:09.000000000 +0200
@@ -27,6 +27,9 @@ @@ -27,6 +27,13 @@
# Uncomment if you want libpri to count number of Q921/Q931 sent/received # Uncomment if you want libpri to count number of Q921/Q931 sent/received
#LIBPRI_COUNTERS=-DLIBPRI_COUNTERS #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
+# Uncomment if you want libpri to always keep layer 2 up +# Uncomment if you want libpri to always keep layer 2 up
+#LAYER2ALWAYSUP=-DLAYER2ALWAYSUP +#LAYER2ALWAYSUP=-DLAYER2ALWAYSUP
+
+# Uncomment if you want libpri to hangup a call to an NT (p2mp) port if one
+# device sends a RELEASE COMPLETE with cause 17
+#FASTBUSYONBUSY=-DFASTBUSYONBUSY
+ +
CC=gcc CC=gcc
OSARCH=$(shell uname -s) OSARCH=$(shell uname -s)
@@ -38,7 +41,7 @@ @@ -38,7 +45,7 @@
DYNAMIC_LIBRARY=libpri.so.1.0 DYNAMIC_LIBRARY=libpri.so.1.0
STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) -CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) -DRELAX_TRB +CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB
INSTALL_PREFIX=$(DESTDIR) INSTALL_PREFIX=$(DESTDIR)
INSTALL_BASE=/usr INSTALL_BASE=/usr
SOFLAGS = -Wl,-hlibpri.so.1.0 SOFLAGS = -Wl,-hlibpri.so.1.0
@@ -72,7 +76,7 @@ diff -urN libpri-1.2.3.orig/TODO libpri-1.2.3/TODO
+-- more facilities +-- more facilities
diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
--- libpri-1.2.3.orig/libpri.h 2006-04-27 18:08:39.000000000 +0200 --- libpri-1.2.3.orig/libpri.h 2006-04-27 18:08:39.000000000 +0200
+++ libpri-1.2.3/libpri.h 2006-06-06 14:28:32.000000000 +0200 +++ libpri-1.2.3/libpri.h 2006-07-11 11:34:59.000000000 +0200
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
* *
* Copyright (C) 2001, Linux Support Services, Inc. * Copyright (C) 2001, Linux Support Services, Inc.
@@ -109,10 +113,14 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
/* Simple states */ /* Simple states */
#define PRI_STATE_DOWN 0 #define PRI_STATE_DOWN 0
@@ -250,11 +262,13 @@ @@ -250,11 +262,17 @@
#define PRI_NSF_ATT_MULTIQUEST 0xF0 #define PRI_NSF_ATT_MULTIQUEST 0xF0
#define PRI_NSF_CALL_REDIRECTION_SERVICE 0xF7 #define PRI_NSF_CALL_REDIRECTION_SERVICE 0xF7
+#ifdef RELAX_TRB
+#define PRI_RELAX_TRB
+#endif
+
+typedef struct q921_call q921_call; +typedef struct q921_call q921_call;
typedef struct q931_call q931_call; typedef struct q931_call q931_call;
@@ -123,7 +131,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
} pri_event_generic; } pri_event_generic;
typedef struct pri_event_error { typedef struct pri_event_error {
@@ -273,18 +287,19 @@ @@ -273,18 +291,19 @@
int cref; int cref;
int progress; int progress;
int progressmask; int progressmask;
@@ -145,7 +153,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
} pri_event_answer; } pri_event_answer;
typedef struct pri_event_facname { typedef struct pri_event_facname {
@@ -302,32 +317,37 @@ @@ -302,32 +321,37 @@
int e; int e;
int channel; /* Channel requested */ int channel; /* Channel requested */
int callingpres; /* Presentation of Calling CallerID */ int callingpres; /* Presentation of Calling CallerID */
@@ -192,7 +200,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
} pri_event_ring; } pri_event_ring;
typedef struct pri_event_hangup { typedef struct pri_event_hangup {
@@ -335,6 +355,8 @@ @@ -335,6 +359,8 @@
int channel; /* Channel requested */ int channel; /* Channel requested */
int cause; int cause;
int cref; int cref;
@@ -201,7 +209,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
q931_call *call; /* Opaque call pointer */ q931_call *call; /* Opaque call pointer */
long aoc_units; /* Advise of Charge number of charged units */ long aoc_units; /* Advise of Charge number of charged units */
char useruserinfo[260]; /* User->User info */ char useruserinfo[260]; /* User->User info */
@@ -375,20 +397,80 @@ @@ -375,20 +401,80 @@
char digits[64]; char digits[64];
} pri_event_keypad_digit; } pri_event_keypad_digit;
@@ -283,7 +291,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
pri_event_keypad_digit digit; /* Digits that come during a call */ pri_event_keypad_digit digit; /* Digits that come during a call */
} pri_event; } pri_event;
@@ -403,7 +485,9 @@ @@ -403,7 +489,9 @@
channel operating in HDLC mode with FCS computed by the fd's driver. Also it channel operating in HDLC mode with FCS computed by the fd's driver. Also it
must be NON-BLOCKING! Frames received on the fd should include FCS. Nodetype must be NON-BLOCKING! Frames received on the fd should include FCS. Nodetype
must be one of PRI_NETWORK or PRI_CPE. switchtype should be PRI_SWITCH_* */ must be one of PRI_NETWORK or PRI_CPE. switchtype should be PRI_SWITCH_* */
@@ -294,7 +302,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
/* Create D-channel just as above with user defined I/O callbacks and data */ /* Create D-channel just as above with user defined I/O callbacks and data */
extern struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read, pri_io_cb io_write, void *userdata); extern struct pri *pri_new_cb(int fd, int nodetype, int switchtype, pri_io_cb io_read, pri_io_cb io_write, void *userdata);
@@ -427,6 +511,9 @@ @@ -427,6 +515,9 @@
/* Enable transmission support of Facility IEs on the pri */ /* Enable transmission support of Facility IEs on the pri */
extern void pri_facility_enable(struct pri *pri); extern void pri_facility_enable(struct pri *pri);
@@ -304,7 +312,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
/* Run PRI on the given D-channel, taking care of any events that /* Run PRI on the given D-channel, taking care of any events that
need to be handled. If block is set, it will block until an event need to be handled. If block is set, it will block until an event
occurs which needs to be handled */ occurs which needs to be handled */
@@ -463,6 +550,12 @@ @@ -463,6 +554,12 @@
/* Send a digit in overlap mode */ /* Send a digit in overlap mode */
extern int pri_information(struct pri *pri, q931_call *call, char digit); extern int pri_information(struct pri *pri, q931_call *call, char digit);
@@ -317,7 +325,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
/* Answer the incomplete(call without called number) call on the given channel. /* Answer the incomplete(call without called number) call on the given channel.
Set non-isdn to non-zero if you are not connecting to ISDN equipment */ Set non-isdn to non-zero if you are not connecting to ISDN equipment */
extern int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn); extern int pri_need_more_info(struct pri *pri, q931_call *call, int channel, int nonisdn);
@@ -471,6 +564,35 @@ @@ -471,6 +568,35 @@
Set non-isdn to non-zero if you are not connecting to ISDN equipment */ Set non-isdn to non-zero if you are not connecting to ISDN equipment */
extern int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn); extern int pri_answer(struct pri *pri, q931_call *call, int channel, int nonisdn);
@@ -353,7 +361,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
/* Set CRV reference for GR-303 calls */ /* Set CRV reference for GR-303 calls */
@@ -479,14 +601,14 @@ @@ -479,14 +605,14 @@
/* backwards compatibility for those who don't use asterisk with libpri */ /* backwards compatibility for those who don't use asterisk with libpri */
#define pri_release(a,b,c) \ #define pri_release(a,b,c) \
@@ -371,7 +379,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
#define PRI_DESTROYCALL #define PRI_DESTROYCALL
extern void pri_destroycall(struct pri *pri, q931_call *call); extern void pri_destroycall(struct pri *pri, q931_call *call);
@@ -519,14 +641,13 @@ @@ -519,14 +645,13 @@
extern void pri_sr_free(struct pri_sr *sr); extern void pri_sr_free(struct pri_sr *sr);
extern int pri_sr_set_channel(struct pri_sr *sr, int channel, int exclusive, int nonisdn); extern int pri_sr_set_channel(struct pri_sr *sr, int channel, int exclusive, int nonisdn);
@@ -387,7 +395,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
extern void pri_call_set_useruser(q931_call *sr, char *userchars); extern void pri_call_set_useruser(q931_call *sr, char *userchars);
extern int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req); extern int pri_setup(struct pri *pri, q931_call *call, struct pri_sr *req);
@@ -547,8 +668,8 @@ @@ -547,8 +672,8 @@
/* Override message and error stuff */ /* Override message and error stuff */
#define PRI_NEW_SET_API #define PRI_NEW_SET_API
@@ -400,7 +408,7 @@ diff -urN libpri-1.2.3.orig/libpri.h libpri-1.2.3/libpri.h
#define PRI_SET_OVERLAPDIAL #define PRI_SET_OVERLAPDIAL
diff -urN libpri-1.2.3.orig/pri.c libpri-1.2.3/pri.c diff -urN libpri-1.2.3.orig/pri.c libpri-1.2.3/pri.c
--- libpri-1.2.3.orig/pri.c 2005-11-29 19:39:18.000000000 +0100 --- libpri-1.2.3.orig/pri.c 2005-11-29 19:39:18.000000000 +0100
+++ libpri-1.2.3/pri.c 2006-06-09 10:17:29.000000000 +0200 +++ libpri-1.2.3/pri.c 2006-07-11 12:39:20.000000000 +0200
@@ -1,24 +1,14 @@ @@ -1,24 +1,14 @@
/* /*
* libpri: An implementation of Primary Rate ISDN * libpri: An implementation of Primary Rate ISDN
@@ -773,7 +781,7 @@ diff -urN libpri-1.2.3.orig/pri.c libpri-1.2.3/pri.c
return 0; return 0;
} }
@@ -851,3 +979,12 @@ @@ -851,3 +979,14 @@
sr->redirectingreason = reason; sr->redirectingreason = reason;
return 0; return 0;
} }
@@ -781,10 +789,12 @@ diff -urN libpri-1.2.3.orig/pri.c libpri-1.2.3/pri.c
+void pri_shutdown(struct pri *pri) +void pri_shutdown(struct pri *pri)
+{ +{
+#ifndef LAYER2ALWAYSUP +#ifndef LAYER2ALWAYSUP
+#ifndef RELAX_TRB
+ if ((pri->localtype == BRI_NETWORK) || (pri->localtype == BRI_CPE) || (pri->localtype == BRI_CPE_PTMP)) { + if ((pri->localtype == BRI_NETWORK) || (pri->localtype == BRI_CPE) || (pri->localtype == BRI_CPE_PTMP)) {
+ q921_reset(pri, pri->tei, 1); + q921_reset(pri, pri->tei, 1);
+ } + }
+#endif +#endif
+#endif
+} +}
diff -urN libpri-1.2.3.orig/pri_facility.c libpri-1.2.3/pri_facility.c diff -urN libpri-1.2.3.orig/pri_facility.c libpri-1.2.3/pri_facility.c
--- libpri-1.2.3.orig/pri_facility.c 2006-02-14 00:06:02.000000000 +0100 --- libpri-1.2.3.orig/pri_facility.c 2006-02-14 00:06:02.000000000 +0100
@@ -1910,7 +1920,7 @@ diff -urN libpri-1.2.3.orig/pritest.c libpri-1.2.3/pritest.c
} }
diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
--- libpri-1.2.3.orig/q921.c 2005-12-06 22:35:50.000000000 +0100 --- libpri-1.2.3.orig/q921.c 2005-12-06 22:35:50.000000000 +0100
+++ libpri-1.2.3/q921.c 2006-06-15 14:55:46.000000000 +0200 +++ libpri-1.2.3/q921.c 2006-08-01 09:55:53.000000000 +0200
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
/* /*
* libpri: An implementation of Primary Rate ISDN * libpri: An implementation of Primary Rate ISDN
@@ -1935,13 +1945,14 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -50,19 +52,23 @@ @@ -50,19 +52,24 @@
(hf).h.tei = (pri)->tei; \ (hf).h.tei = (pri)->tei; \
} while(0) } while(0)
-static void reschedule_t203(struct pri *pri); -static void reschedule_t203(struct pri *pri);
+static void reschedule_t203(struct pri *pri, int tei); +static void reschedule_t203(struct pri *pri, int tei);
+static void q921_flush_txqueue(struct pri *pri, int tei, int devnull); +static void q921_flush_txqueue(struct pri *pri, int tei, int devnull);
+static void q921_send_teiverify(struct pri *pri,int tei);
-static void q921_discard_retransmissions(struct pri *pri) -static void q921_discard_retransmissions(struct pri *pri)
+static void q921_discard_retransmissions(struct pri *pri, int tei) +static void q921_discard_retransmissions(struct pri *pri, int tei)
@@ -1967,7 +1978,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} }
static int q921_transmit(struct pri *pri, q921_h *h, int len) static int q921_transmit(struct pri *pri, q921_h *h, int len)
@@ -88,11 +94,15 @@ @@ -88,11 +95,15 @@
pri_error(pri, "Short write: %d/%d (%s)\n", res, len + 2, strerror(errno)); pri_error(pri, "Short write: %d/%d (%s)\n", res, len + 2, strerror(errno));
return -1; return -1;
} }
@@ -1985,7 +1996,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
{ {
q921_h h; q921_h h;
Q921_INIT(pri, h); Q921_INIT(pri, h);
@@ -100,6 +110,7 @@ @@ -100,6 +111,7 @@
h.u.m2 = 0; /* M2 = 0 */ h.u.m2 = 0; /* M2 = 0 */
h.u.p_f = pfbit; /* Final bit on */ h.u.p_f = pfbit; /* Final bit on */
h.u.ft = Q921_FRAMETYPE_U; h.u.ft = Q921_FRAMETYPE_U;
@@ -1993,7 +2004,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
switch(pri->localtype) { switch(pri->localtype) {
case PRI_NETWORK: case PRI_NETWORK:
h.h.c_r = 0; h.h.c_r = 0;
@@ -107,6 +118,19 @@ @@ -107,6 +119,19 @@
case PRI_CPE: case PRI_CPE:
h.h.c_r = 1; h.h.c_r = 1;
break; break;
@@ -2013,7 +2024,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
default: default:
pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype); pri_error(pri, "Don't know how to U/A on a type %d node\n", pri->localtype);
return; return;
@@ -116,18 +140,359 @@ @@ -116,18 +141,364 @@
q921_transmit(pri, &h, 3); q921_transmit(pri, &h, 3);
} }
@@ -2118,7 +2129,10 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
+ pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN; + pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN;
+ pri->ev.gen.tei = 0; + pri->ev.gen.tei = 0;
+ pri->sabme_retrans[0] = 0; + pri->sabme_retrans[0] = 0;
+ /* dont try again, they are gone */ + q921_send_teiverify(pri, 127);
+#ifdef RELAX_TRB
+ pri->t202_timer[0] = pri_schedule_event(pri, pri->timers[PRI_TIMER_T202] + 3000, q921_send_teireq, pri);
+#endif
+ return; + return;
+ } + }
+ +
@@ -2369,7 +2383,9 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
+ pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN; + pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN;
+ pri->ev.gen.tei = tei; + pri->ev.gen.tei = tei;
+ pri->sabme_retrans[teio] = 0; + pri->sabme_retrans[teio] = 0;
+ /* dont try again, they are gone */ +#ifdef RELAX_TRB
+ pri->sabme_timer[teio] = pri_schedule_event2(pri, pri->timers[PRI_TIMER_T200] + 3000, q921_send_sabme_now, pri, tei);
+#endif
+ return; + return;
+ } + }
Q921_INIT(pri, h); Q921_INIT(pri, h);
@@ -2378,7 +2394,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
h.u.m3 = 3; /* M3 = 3 */ h.u.m3 = 3; /* M3 = 3 */
h.u.m2 = 3; /* M2 = 3 */ h.u.m2 = 3; /* M2 = 3 */
h.u.p_f = 1; /* Poll bit set */ h.u.p_f = 1; /* Poll bit set */
@@ -139,25 +504,42 @@ @@ -139,25 +510,42 @@
case PRI_CPE: case PRI_CPE:
h.h.c_r = 0; h.h.c_r = 0;
break; break;
@@ -2427,7 +2443,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
while(f) { while(f) {
if (f->h.n_s == num) { if (f->h.n_s == num) {
/* Cancel each packet as necessary */ /* Cancel each packet as necessary */
@@ -165,26 +547,26 @@ @@ -165,26 +553,26 @@
if (prev) if (prev)
prev->next = f->next; prev->next = f->next;
else else
@@ -2462,7 +2478,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
q921_transmit(pri, (q921_h *)(&f->h), f->len); q921_transmit(pri, (q921_h *)(&f->h), f->len);
break; break;
} }
@@ -198,77 +580,136 @@ @@ -198,77 +586,136 @@
return 0; return 0;
} }
@@ -2631,7 +2647,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
h.s.p_f = pf; h.s.p_f = pf;
switch(pri->localtype) { switch(pri->localtype) {
case PRI_NETWORK: case PRI_NETWORK:
@@ -277,23 +718,38 @@ @@ -277,23 +724,38 @@
case PRI_CPE: case PRI_CPE:
h.h.c_r = 1; h.h.c_r = 1;
break; break;
@@ -2675,7 +2691,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
h.s.p_f = pbit; /* Poll/Final set appropriately */ h.s.p_f = pbit; /* Poll/Final set appropriately */
switch(pri->localtype) { switch(pri->localtype) {
case PRI_NETWORK: case PRI_NETWORK:
@@ -308,81 +764,192 @@ @@ -308,81 +770,192 @@
else else
h.h.c_r = 1; h.h.c_r = 1;
break; break;
@@ -2906,7 +2922,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
f = malloc(sizeof(q921_frame) + len + 2); f = malloc(sizeof(q921_frame) + len + 2);
if (f) { if (f) {
memset(f,0,sizeof(q921_frame) + len + 2); memset(f,0,sizeof(q921_frame) + len + 2);
@@ -400,47 +967,80 @@ @@ -400,47 +973,80 @@
else else
f->h.h.c_r = 1; f->h.h.c_r = 1;
break; break;
@@ -3007,7 +3023,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} else { } else {
pri_error(pri, "!! Out of memory for Q.921 transmit\n"); pri_error(pri, "!! Out of memory for Q.921 transmit\n");
@@ -449,49 +1049,86 @@ @@ -449,49 +1055,86 @@
return 0; return 0;
} }
@@ -3117,7 +3133,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
if (res == -1) { if (res == -1) {
return NULL; return NULL;
} }
@@ -500,10 +1137,10 @@ @@ -500,10 +1143,10 @@
} else { } else {
/* If we haven't already sent a reject, send it now, otherwise /* If we haven't already sent a reject, send it now, otherwise
we are obliged to RR */ we are obliged to RR */
@@ -3131,7 +3147,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} }
return NULL; return NULL;
} }
@@ -641,75 +1278,152 @@ @@ -641,75 +1284,158 @@
}; };
} }
@@ -3184,6 +3200,12 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
+ if (pri->t202_timer[teio]) { + if (pri->t202_timer[teio]) {
+ pri_schedule_del(pri, pri->t202_timer[teio]); + pri_schedule_del(pri, pri->t202_timer[teio]);
+ pri->t202_timer[teio] = 0; + pri->t202_timer[teio] = 0;
+ }
+
+/* neonova test */
+ if (pri->t203_timer[teio]) {
+ pri_schedule_del(pri, pri->t203_timer[teio]);
+ pri->t203_timer[teio] = 0;
+ } + }
/* Reset any rejects */ /* Reset any rejects */
@@ -3322,7 +3344,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
return NULL; return NULL;
} }
/* Informational frame */ /* Informational frame */
@@ -720,8 +1434,10 @@ @@ -720,8 +1446,10 @@
return q921_handle_iframe(pri, &h->i, len); return q921_handle_iframe(pri, &h->i, len);
break; break;
case 1: case 1:
@@ -3334,7 +3356,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
return NULL; return NULL;
} }
if (len < 4) { if (len < 4) {
@@ -731,80 +1447,128 @@ @@ -731,80 +1459,128 @@
switch(h->s.ss) { switch(h->s.ss) {
case 0: case 0:
/* Receiver Ready */ /* Receiver Ready */
@@ -3500,7 +3522,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} }
break; break;
case 3: case 3:
@@ -821,8 +1585,16 @@ @@ -821,8 +1597,16 @@
if (pri->debug & PRI_DEBUG_Q921_STATE) if (pri->debug & PRI_DEBUG_Q921_STATE)
pri_message(pri, "-- Got DM Mode from peer.\n"); pri_message(pri, "-- Got DM Mode from peer.\n");
/* Disconnected mode, try again after T200 */ /* Disconnected mode, try again after T200 */
@@ -3519,7 +3541,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
return ev; return ev;
} else { } else {
@@ -830,21 +1602,148 @@ @@ -830,21 +1614,153 @@
pri_message(pri, "-- Ignoring unsolicited DM with p/f set to 0\n"); pri_message(pri, "-- Ignoring unsolicited DM with p/f set to 0\n");
#if 0 #if 0
/* Requesting that we start */ /* Requesting that we start */
@@ -3563,7 +3585,6 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
+ } + }
+ break; + break;
+ case Q921_TEI_ID_REMOVE: + case Q921_TEI_ID_REMOVE:
+ pri_error(pri, "TEI remove TEI = %d\n",(h->u.data[4] >> 1));
+ if (pri->localtype != BRI_CPE_PTMP) + if (pri->localtype != BRI_CPE_PTMP)
+ break; + break;
+ if (((h->u.data[4] >> 1) == Q921_TEI_GROUP) || (pri->tei == (h->u.data[4] >> 1))){ + if (((h->u.data[4] >> 1) == Q921_TEI_GROUP) || (pri->tei == (h->u.data[4] >> 1))){
@@ -3650,31 +3671,37 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
case 2: case 2:
if (pri->debug & PRI_DEBUG_Q921_STATE) if (pri->debug & PRI_DEBUG_Q921_STATE)
pri_message(pri, "-- Got Disconnect from peer.\n"); pri_message(pri, "-- Got Disconnect from peer.\n");
+#ifndef RELAX_TRB
+ if (pri->q921_state[teio] != Q921_LINK_CONNECTION_ESTABLISHED) { + if (pri->q921_state[teio] != Q921_LINK_CONNECTION_ESTABLISHED) {
+ q921_send_dm(pri, 1, h->h.tei); + q921_send_dm(pri, 1, h->h.tei);
+ return NULL; + return NULL;
+ } + }
+#endif
/* Acknowledge */ /* Acknowledge */
- q921_send_ua(pri, h->u.p_f); - q921_send_ua(pri, h->u.p_f);
- ev = q921_dchannel_down(pri); - ev = q921_dchannel_down(pri);
- q921_start(pri, 0); - q921_start(pri, 0);
+ q921_send_ua(pri, h->u.p_f, h->h.tei); + q921_send_ua(pri, h->u.p_f, h->h.tei);
+ ev = q921_dchannel_down(pri, h->h.tei); + ev = q921_dchannel_down(pri, h->h.tei);
+#ifndef LAYER2ALWAYSUP
+ if ((pri->localtype == BRI_CPE_PTMP) || (pri->localtype == BRI_CPE) || (pri->localtype == BRI_NETWORK)) { + if ((pri->localtype == BRI_CPE_PTMP) || (pri->localtype == BRI_CPE) || (pri->localtype == BRI_NETWORK)) {
+#ifndef LAYER2ALWAYSUP
+ /* release layer 2 */ + /* release layer 2 */
+ return NULL; + return NULL;
+#else
+ /* keep layer 2 up */
+ if (pri->t203_timer[teio])
+ pri_schedule_del(pri, pri->t203_timer[teio]);
+ pri->t203_timer[teio] = 0;
+ q921_send_sabme(pri, 1, pri->tei);
+#endif
+ } + }
+ if ((pri->localtype == PRI_NETWORK) || (pri->localtype == PRI_CPE)){ + if ((pri->localtype == PRI_NETWORK) || (pri->localtype == PRI_CPE)){
+#endif
+ q921_start(pri, 0, 0); + q921_start(pri, 0, 0);
+#ifndef LAYER2ALWAYSUP
+ } + }
+#endif
return ev; return ev;
case 3: case 3:
if (h->u.m2 == 3) { if (h->u.m2 == 3) {
@@ -866,17 +1765,28 @@ @@ -866,17 +1782,28 @@
} }
} }
/* Send Unnumbered Acknowledgement */ /* Send Unnumbered Acknowledgement */
@@ -3709,7 +3736,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} else } else
pri_error(pri, "!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2); pri_error(pri, "!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2);
break; break;
@@ -901,19 +1811,42 @@ @@ -901,19 +1828,42 @@
/* Discard FCS */ /* Discard FCS */
len -= 2; len -= 2;
@@ -3759,7 +3786,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
#ifdef PROCESS_SUBCHANNELS #ifdef PROCESS_SUBCHANNELS
/* If it's not us, try any subchannels we have */ /* If it's not us, try any subchannels we have */
if (pri->subchannel) if (pri->subchannel)
@@ -921,10 +1854,16 @@ @@ -921,10 +1871,16 @@
else else
#endif #endif
return NULL; return NULL;
@@ -3778,7 +3805,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
return ev; return ev;
} }
@@ -938,14 +1877,58 @@ @@ -938,14 +1894,58 @@
return e; return e;
} }
@@ -3847,7 +3874,7 @@ diff -urN libpri-1.2.3.orig/q921.c libpri-1.2.3/q921.c
} }
diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
--- libpri-1.2.3.orig/q931.c 2006-04-27 18:08:39.000000000 +0200 --- libpri-1.2.3.orig/q931.c 2006-04-27 18:08:39.000000000 +0200
+++ libpri-1.2.3/q931.c 2006-06-13 10:53:33.000000000 +0200 +++ libpri-1.2.3/q931.c 2006-08-01 10:55:05.000000000 +0200
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
/* /*
* libpri: An implementation of Primary Rate ISDN * libpri: An implementation of Primary Rate ISDN
@@ -5321,7 +5348,8 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->ourcallstate = Q931_CALL_STATE_CALL_RECEIVED; c->ourcallstate = Q931_CALL_STATE_CALL_RECEIVED;
c->peercallstate = Q931_CALL_STATE_CALL_DELIVERED; c->peercallstate = Q931_CALL_STATE_CALL_DELIVERED;
+ c->alert = 1; + c->alert = 1;
+ c->alive = 1; c->alive = 1;
- return send_message(pri, c, Q931_ALERTING, alerting_ies);
+ if ((pri->localtype == PRI_NETWORK) || (pri->localtype == PRI_CPE)) { + if ((pri->localtype == PRI_NETWORK) || (pri->localtype == PRI_CPE)) {
+ return send_message(pri, c, Q931_ALERTING, alerting_ies); + return send_message(pri, c, Q931_ALERTING, alerting_ies);
+ } else { + } else {
@@ -5367,8 +5395,9 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+int q931_retrieve_reject(struct pri *pri, q931_call *c) +int q931_retrieve_reject(struct pri *pri, q931_call *c)
+{ +{
+ return send_message(pri, c, Q931_RETRIEVE_REJECT, retrieve_reject_ies); + return send_message(pri, c, Q931_RETRIEVE_REJECT, retrieve_reject_ies);
+} }
+
-static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
+static int suspend_acknowledge_ies[] = { Q931_DISPLAY, -1 }; +static int suspend_acknowledge_ies[] = { Q931_DISPLAY, -1 };
+ +
+int q931_suspend_acknowledge(struct pri *pri, q931_call *c, char *display) +int q931_suspend_acknowledge(struct pri *pri, q931_call *c, char *display)
@@ -5427,8 +5456,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+ c->channelno = channel; + c->channelno = channel;
+ c->chanflags &= ~FLAG_PREFERRED; + c->chanflags &= ~FLAG_PREFERRED;
+ c->chanflags |= FLAG_EXCLUSIVE; + c->chanflags |= FLAG_EXCLUSIVE;
c->alive = 1; + c->alive = 1;
- return send_message(pri, c, Q931_ALERTING, alerting_ies);
+ c->ourcallstate = Q931_CALL_STATE_ACTIVE; + c->ourcallstate = Q931_CALL_STATE_ACTIVE;
+ c->peercallstate = Q931_CALL_STATE_ACTIVE; + c->peercallstate = Q931_CALL_STATE_ACTIVE;
+ strncpy(tempcallername,c->callername,sizeof(tempcallername)); + strncpy(tempcallername,c->callername,sizeof(tempcallername));
@@ -5436,9 +5464,8 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+ res = send_message(pri, c, Q931_RESUME_ACKNOWLEDGE, resume_acknowledge_ies); + res = send_message(pri, c, Q931_RESUME_ACKNOWLEDGE, resume_acknowledge_ies);
+ strncpy(c->callername,tempcallername,sizeof(c->callername)); + strncpy(c->callername,tempcallername,sizeof(c->callername));
+ return res; + return res;
} +}
+
-static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 };
+ +
+static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_DISPLAY, -1 }; +static int connect_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_DISPLAY, -1 };
+static int connect_NET_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_IE_TIME_DATE, -1 }; +static int connect_NET_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, Q931_IE_TIME_DATE, -1 };
@@ -5449,11 +5476,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (channel) { if (channel) {
c->ds1no = (channel & 0xff00) >> 8; c->ds1no = (channel & 0xff00) >> 8;
c->ds1explicit = (channel & 0x10000) >> 16; c->ds1explicit = (channel & 0x10000) >> 16;
@@ -2566,12 +3348,40 @@ @@ -2569,9 +3351,39 @@
c->progressmask = PRI_PROG_CALLED_NOT_ISDN;
} else
c->progressmask = 0;
+c->progressmask = PRI_PROG_INBAND_AVAILABLE;
c->ourcallstate = Q931_CALL_STATE_OVERLAP_RECEIVING; c->ourcallstate = Q931_CALL_STATE_OVERLAP_RECEIVING;
c->peercallstate = Q931_CALL_STATE_OVERLAP_SENDING; c->peercallstate = Q931_CALL_STATE_OVERLAP_SENDING;
c->alive = 1; c->alive = 1;
@@ -5481,8 +5504,11 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+ pri->ev.hangup.channel = c->channelno; + pri->ev.hangup.channel = c->channelno;
+ pri->ev.hangup.cref = c->cr; + pri->ev.hangup.cref = c->cr;
+ pri->ev.hangup.aoc_units = -1; + pri->ev.hangup.aoc_units = -1;
+// pri->ev.hangup.cause = c->cause; + if (c->cause == -1) {
+ pri->ev.hangup.cause = PRI_CAUSE_SWITCH_CONGESTION; + pri->ev.hangup.cause = PRI_CAUSE_SWITCH_CONGESTION;
+ } else {
+ pri->ev.hangup.cause = c->cause;
+ }
+ pri->ev.hangup.call = c; + pri->ev.hangup.call = c;
+ q931_hangup(pri, c, c->cause); + q931_hangup(pri, c, c->cause);
+} +}
@@ -5490,7 +5516,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
static void pri_connect_timeout(void *data) static void pri_connect_timeout(void *data)
{ {
struct q931_call *c = data; struct q931_call *c = data;
@@ -2624,6 +3434,7 @@ @@ -2624,6 +3436,7 @@
int q931_connect(struct pri *pri, q931_call *c, int channel, int nonisdn) int q931_connect(struct pri *pri, q931_call *c, int channel, int nonisdn)
{ {
@@ -5498,7 +5524,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (channel) { if (channel) {
c->ds1no = (channel & 0xff00) >> 8; c->ds1no = (channel & 0xff00) >> 8;
c->ds1explicit = (channel & 0x10000) >> 16; c->ds1explicit = (channel & 0x10000) >> 16;
@@ -2638,22 +3449,37 @@ @@ -2638,22 +3451,37 @@
c->progressmask = PRI_PROG_CALLED_NOT_ISDN; c->progressmask = PRI_PROG_CALLED_NOT_ISDN;
} else } else
c->progressmask = 0; c->progressmask = 0;
@@ -5539,7 +5565,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->ourcallstate = Q931_CALL_STATE_RELEASE_REQUEST; c->ourcallstate = Q931_CALL_STATE_RELEASE_REQUEST;
/* c->peercallstate stays the same */ /* c->peercallstate stays the same */
if (c->alive) { if (c->alive) {
@@ -2669,7 +3495,14 @@ @@ -2669,7 +3497,14 @@
} else { } else {
c->retranstimer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T308], pri_release_finaltimeout, c); c->retranstimer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T308], pri_release_finaltimeout, c);
} }
@@ -5555,7 +5581,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
} else } else
return send_message(pri, c, Q931_RELEASE_COMPLETE, release_ies); /* Yes, release_ies, not release_complete_ies */ return send_message(pri, c, Q931_RELEASE_COMPLETE, release_ies); /* Yes, release_ies, not release_complete_ies */
} else } else
@@ -2681,7 +3514,7 @@ @@ -2681,7 +3516,7 @@
int q931_restart(struct pri *pri, int channel) int q931_restart(struct pri *pri, int channel)
{ {
struct q931_call *c; struct q931_call *c;
@@ -5564,7 +5590,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (!c) if (!c)
return -1; return -1;
if (!channel) if (!channel)
@@ -2698,10 +3531,12 @@ @@ -2698,10 +3533,12 @@
return send_message(pri, c, Q931_RESTART, restart_ies); return send_message(pri, c, Q931_RESTART, restart_ies);
} }
@@ -5577,7 +5603,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->ourcallstate = Q931_CALL_STATE_DISCONNECT_REQUEST; c->ourcallstate = Q931_CALL_STATE_DISCONNECT_REQUEST;
c->peercallstate = Q931_CALL_STATE_DISCONNECT_INDICATION; c->peercallstate = Q931_CALL_STATE_DISCONNECT_INDICATION;
if (c->alive) { if (c->alive) {
@@ -2713,14 +3548,27 @@ @@ -2713,14 +3550,27 @@
if (c->retranstimer) if (c->retranstimer)
pri_schedule_del(pri, c->retranstimer); pri_schedule_del(pri, c->retranstimer);
c->retranstimer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T305], pri_disconnect_timeout, c); c->retranstimer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T305], pri_disconnect_timeout, c);
@@ -5606,7 +5632,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
static int gr303_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, -1 }; static int gr303_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, -1 };
static int cis_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_CALLED_PARTY_NUMBER, -1 }; static int cis_setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_CALLED_PARTY_NUMBER, -1 };
@@ -2728,7 +3576,12 @@ @@ -2728,7 +3578,12 @@
int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req) int q931_setup(struct pri *pri, q931_call *c, struct pri_sr *req)
{ {
int res; int res;
@@ -5620,7 +5646,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->transcapability = req->transmode; c->transcapability = req->transmode;
c->transmoderate = TRANS_MODE_64_CIRCUIT; c->transmoderate = TRANS_MODE_64_CIRCUIT;
@@ -2753,6 +3606,7 @@ @@ -2753,6 +3608,7 @@
c->chanflags = FLAG_EXCLUSIVE; c->chanflags = FLAG_EXCLUSIVE;
else if (c->channelno) else if (c->channelno)
c->chanflags = FLAG_PREFERRED; c->chanflags = FLAG_PREFERRED;
@@ -5628,7 +5654,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (req->caller) { if (req->caller) {
libpri_copy_string(c->callernum, req->caller, sizeof(c->callernum)); libpri_copy_string(c->callernum, req->caller, sizeof(c->callernum));
c->callerplan = req->callerplan; c->callerplan = req->callerplan;
@@ -2812,14 +3666,19 @@ @@ -2812,14 +3668,19 @@
res = send_message(pri, c, Q931_SETUP, gr303_setup_ies); res = send_message(pri, c, Q931_SETUP, gr303_setup_ies);
else if (c->justsignalling) else if (c->justsignalling)
res = send_message(pri, c, Q931_SETUP, cis_setup_ies); res = send_message(pri, c, Q931_SETUP, cis_setup_ies);
@@ -5648,7 +5674,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
} }
return res; return res;
@@ -2835,7 +3694,11 @@ @@ -2835,7 +3696,11 @@
if (cause > -1) { if (cause > -1) {
c->cause = cause; c->cause = cause;
c->causecode = CODE_CCITT; c->causecode = CODE_CCITT;
@@ -5661,7 +5687,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
/* release_ies has CAUSE in it */ /* release_ies has CAUSE in it */
res = send_message(pri, c, Q931_RELEASE_COMPLETE, release_ies); res = send_message(pri, c, Q931_RELEASE_COMPLETE, release_ies);
} else } else
@@ -2860,6 +3723,117 @@ @@ -2860,6 +3725,125 @@
return 0; return 0;
} }
@@ -5761,6 +5787,13 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+ } + }
+ +
+ // if all phones have signalled busy AND the timer is not running anymore! + // if all phones have signalled busy AND the timer is not running anymore!
+#ifdef FASTBUSYONBUSY
+ if ((c->cause == PRI_CAUSE_USER_BUSY) && (c->t303timer)) {
+ c->t303running = 0;
+ pri_schedule_del(pri, c->t303timer);
+ }
+#endif
+
+ if ((left==0) && (c->cause == PRI_CAUSE_USER_BUSY) && (c->t303running == 0)) { + if ((left==0) && (c->cause == PRI_CAUSE_USER_BUSY) && (c->t303running == 0)) {
+ // pri_error(pri, "q921_handle_hangup(%d, %d, %d)\n", c->cr, tei, c->tei); + // pri_error(pri, "q921_handle_hangup(%d, %d, %d)\n", c->cr, tei, c->tei);
+ // make sure * frees the channel + // make sure * frees the channel
@@ -5769,6 +5802,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
+ pri->ev.hangup.channel = c->channelno | (c->ds1no << 8); + pri->ev.hangup.channel = c->channelno | (c->ds1no << 8);
+ pri->ev.hangup.cref = c->cr; + pri->ev.hangup.cref = c->cr;
+ pri->ev.hangup.call = c; + pri->ev.hangup.call = c;
+ pri->ev.hangup.aoc_units = 0;
+ pri->ev.e = PRI_EVENT_HANGUP; + pri->ev.e = PRI_EVENT_HANGUP;
+ } + }
+ return res; + return res;
@@ -5779,7 +5813,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
int q931_hangup(struct pri *pri, q931_call *c, int cause) int q931_hangup(struct pri *pri, q931_call *c, int cause)
{ {
int disconnect = 1; int disconnect = 1;
@@ -2871,7 +3845,7 @@ @@ -2871,7 +3855,7 @@
/* If mandatory IE was missing, insist upon that cause code */ /* If mandatory IE was missing, insist upon that cause code */
if (c->cause == PRI_CAUSE_MANDATORY_IE_MISSING) if (c->cause == PRI_CAUSE_MANDATORY_IE_MISSING)
cause = c->cause; cause = c->cause;
@@ -5788,7 +5822,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
/* We'll send RELEASE_COMPLETE with these causes */ /* We'll send RELEASE_COMPLETE with these causes */
disconnect = 0; disconnect = 0;
release_compl = 1; release_compl = 1;
@@ -2885,7 +3859,7 @@ @@ -2885,7 +3869,7 @@
case Q931_CALL_STATE_NULL: case Q931_CALL_STATE_NULL:
if (c->peercallstate == Q931_CALL_STATE_NULL) if (c->peercallstate == Q931_CALL_STATE_NULL)
/* free the resources if we receive or send REL_COMPL */ /* free the resources if we receive or send REL_COMPL */
@@ -5797,7 +5831,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
else if (c->peercallstate == Q931_CALL_STATE_RELEASE_REQUEST) else if (c->peercallstate == Q931_CALL_STATE_RELEASE_REQUEST)
q931_release_complete(pri,c,cause); q931_release_complete(pri,c,cause);
break; break;
@@ -2911,6 +3885,11 @@ @@ -2911,6 +3895,11 @@
/* received SETUP_ACKNOWLEDGE */ /* received SETUP_ACKNOWLEDGE */
/* send DISCONNECT in general */ /* send DISCONNECT in general */
if (c->peercallstate != Q931_CALL_STATE_NULL && c->peercallstate != Q931_CALL_STATE_DISCONNECT_REQUEST && c->peercallstate != Q931_CALL_STATE_DISCONNECT_INDICATION && c->peercallstate != Q931_CALL_STATE_RELEASE_REQUEST && c->peercallstate != Q931_CALL_STATE_RESTART_REQUEST && c->peercallstate != Q931_CALL_STATE_RESTART) { if (c->peercallstate != Q931_CALL_STATE_NULL && c->peercallstate != Q931_CALL_STATE_DISCONNECT_REQUEST && c->peercallstate != Q931_CALL_STATE_DISCONNECT_INDICATION && c->peercallstate != Q931_CALL_STATE_RELEASE_REQUEST && c->peercallstate != Q931_CALL_STATE_RESTART_REQUEST && c->peercallstate != Q931_CALL_STATE_RESTART) {
@@ -5809,7 +5843,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (disconnect) if (disconnect)
q931_disconnect(pri,c,cause); q931_disconnect(pri,c,cause);
else if (release_compl) else if (release_compl)
@@ -2926,8 +3905,14 @@ @@ -2926,8 +3915,14 @@
break; break;
case Q931_CALL_STATE_DISCONNECT_INDICATION: case Q931_CALL_STATE_DISCONNECT_INDICATION:
/* received DISCONNECT */ /* received DISCONNECT */
@@ -5824,7 +5858,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
q931_release(pri,c,cause); q931_release(pri,c,cause);
} }
break; break;
@@ -2941,19 +3926,17 @@ @@ -2941,19 +3936,17 @@
pri_error(pri, "q931_hangup shouldn't be called in this state, ourstate %s, peerstate %s\n",callstate2str(c->ourcallstate),callstate2str(c->peercallstate)); pri_error(pri, "q931_hangup shouldn't be called in this state, ourstate %s, peerstate %s\n",callstate2str(c->ourcallstate),callstate2str(c->peercallstate));
break; break;
default: default:
@@ -5847,7 +5881,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
q931_call *c; q931_call *c;
q931_ie *ie; q931_ie *ie;
unsigned int x; unsigned int x;
@@ -2965,6 +3948,7 @@ @@ -2965,6 +3958,7 @@
int codeset, cur_codeset; int codeset, cur_codeset;
int last_ie[8]; int last_ie[8];
struct apdu_event *cur = NULL; struct apdu_event *cur = NULL;
@@ -5855,7 +5889,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
memset(last_ie, 0, sizeof(last_ie)); memset(last_ie, 0, sizeof(last_ie));
if (pri->debug & PRI_DEBUG_Q931_DUMP) if (pri->debug & PRI_DEBUG_Q931_DUMP)
@@ -2978,13 +3962,13 @@ @@ -2978,13 +3972,13 @@
KLUDGE this by changing byte 4 from a 0xf (SERVICE) KLUDGE this by changing byte 4 from a 0xf (SERVICE)
to a 0x7 (SERVICE ACKNOWLEDGE) */ to a 0x7 (SERVICE ACKNOWLEDGE) */
h->raw[h->crlen + 2] -= 0x8; h->raw[h->crlen + 2] -= 0x8;
@@ -5871,7 +5905,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (!c) { if (!c) {
pri_error(pri, "Unable to locate call %d\n", q931_cr(h)); pri_error(pri, "Unable to locate call %d\n", q931_cr(h));
return -1; return -1;
@@ -3007,6 +3991,7 @@ @@ -3007,6 +4001,7 @@
case Q931_SETUP: case Q931_SETUP:
if (pri->debug & PRI_DEBUG_Q931_STATE) if (pri->debug & PRI_DEBUG_Q931_STATE)
pri_message(pri, "-- Processing Q.931 Call Setup\n"); pri_message(pri, "-- Processing Q.931 Call Setup\n");
@@ -5879,7 +5913,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->channelno = -1; c->channelno = -1;
c->slotmap = -1; c->slotmap = -1;
c->chanflags = 0; c->chanflags = 0;
@@ -3027,28 +4012,44 @@ @@ -3027,28 +4022,44 @@
c->callername[0] = '\0'; c->callername[0] = '\0';
c->callerani[0] = '\0'; c->callerani[0] = '\0';
c->callerplanani = -1; c->callerplanani = -1;
@@ -5934,7 +5968,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->progress = -1; c->progress = -1;
c->progressmask = 0; c->progressmask = 0;
break; break;
@@ -3059,20 +4060,22 @@ @@ -3059,20 +4070,22 @@
break; break;
case Q931_RELEASE: case Q931_RELEASE:
case Q931_DISCONNECT: case Q931_DISCONNECT:
@@ -5964,7 +5998,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
case Q931_STATUS: case Q931_STATUS:
c->cause = -1; c->cause = -1;
c->causecode = -1; c->causecode = -1;
@@ -3089,22 +4092,32 @@ @@ -3089,22 +4102,32 @@
case Q931_STATUS_ENQUIRY: case Q931_STATUS_ENQUIRY:
break; break;
case Q931_SETUP_ACKNOWLEDGE: case Q931_SETUP_ACKNOWLEDGE:
@@ -6001,7 +6035,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
case Q931_SUSPEND_ACKNOWLEDGE: case Q931_SUSPEND_ACKNOWLEDGE:
case Q931_SUSPEND_REJECT: case Q931_SUSPEND_REJECT:
pri_error(pri, "!! Not yet handling pre-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg); pri_error(pri, "!! Not yet handling pre-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
@@ -3113,7 +4126,7 @@ @@ -3113,7 +4136,7 @@
pri_error(pri, "!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg); pri_error(pri, "!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST); q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST);
if (c->newcall) if (c->newcall)
@@ -6010,7 +6044,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
return -1; return -1;
} }
memset(mandies, 0, sizeof(mandies)); memset(mandies, 0, sizeof(mandies));
@@ -3193,12 +4206,19 @@ @@ -3193,12 +4216,19 @@
missingmand = 0; missingmand = 0;
for (x=0;x<MAX_MAND_IES;x++) { for (x=0;x<MAX_MAND_IES;x++) {
if (mandies[x]) { if (mandies[x]) {
@@ -6035,7 +6069,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
} }
} }
@@ -3207,7 +4227,7 @@ @@ -3207,7 +4237,7 @@
case Q931_RESTART: case Q931_RESTART:
if (missingmand) { if (missingmand) {
q931_status(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING); q931_status(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
@@ -6044,7 +6078,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
break; break;
} }
c->ourcallstate = Q931_CALL_STATE_RESTART; c->ourcallstate = Q931_CALL_STATE_RESTART;
@@ -3225,6 +4245,7 @@ @@ -3225,6 +4255,7 @@
} }
/* Must be new call */ /* Must be new call */
if (!c->newcall) { if (!c->newcall) {
@@ -6052,7 +6086,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
break; break;
} }
if (c->progressmask & PRI_PROG_CALLER_NOT_ISDN) if (c->progressmask & PRI_PROG_CALLER_NOT_ISDN)
@@ -3242,16 +4263,20 @@ @@ -3242,16 +4273,20 @@
pri->ev.ring.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.ring.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
pri->ev.ring.callingpres = c->callerpres; pri->ev.ring.callingpres = c->callerpres;
pri->ev.ring.callingplan = c->callerplan; pri->ev.ring.callingplan = c->callerplan;
@@ -6075,7 +6109,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
libpri_copy_string(pri->ev.ring.origcalledname, c->origcalledname, sizeof(pri->ev.ring.origcalledname)); libpri_copy_string(pri->ev.ring.origcalledname, c->origcalledname, sizeof(pri->ev.ring.origcalledname));
libpri_copy_string(pri->ev.ring.origcallednum, c->origcallednum, sizeof(pri->ev.ring.origcallednum)); libpri_copy_string(pri->ev.ring.origcallednum, c->origcallednum, sizeof(pri->ev.ring.origcallednum));
libpri_copy_string(pri->ev.ring.redirectingnum, c->redirectingnum, sizeof(pri->ev.ring.redirectingnum)); libpri_copy_string(pri->ev.ring.redirectingnum, c->redirectingnum, sizeof(pri->ev.ring.redirectingnum));
@@ -3261,11 +4286,13 @@ @@ -3261,11 +4296,13 @@
pri->ev.ring.redirectingreason = c->redirectingreason; pri->ev.ring.redirectingreason = c->redirectingreason;
pri->ev.ring.origredirectingreason = c->origredirectingreason; pri->ev.ring.origredirectingreason = c->origredirectingreason;
pri->ev.ring.flexible = ! (c->chanflags & FLAG_EXCLUSIVE); pri->ev.ring.flexible = ! (c->chanflags & FLAG_EXCLUSIVE);
@@ -6090,7 +6124,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
pri->ev.ring.redirectingreason = c->redirectingreason; pri->ev.ring.redirectingreason = c->redirectingreason;
pri->ev.ring.progress = c->progress; pri->ev.ring.progress = c->progress;
pri->ev.ring.progressmask = c->progressmask; pri->ev.ring.progressmask = c->progressmask;
@@ -3275,6 +4302,9 @@ @@ -3275,6 +4312,9 @@
q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE); q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
break; break;
} }
@@ -6100,7 +6134,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
c->ourcallstate = Q931_CALL_STATE_CALL_DELIVERED; c->ourcallstate = Q931_CALL_STATE_CALL_DELIVERED;
c->peercallstate = Q931_CALL_STATE_CALL_RECEIVED; c->peercallstate = Q931_CALL_STATE_CALL_RECEIVED;
pri->ev.e = PRI_EVENT_RINGING; pri->ev.e = PRI_EVENT_RINGING;
@@ -3295,17 +4325,24 @@ @@ -3295,17 +4335,24 @@
q931_status(pri, c, PRI_CAUSE_WRONG_MESSAGE); q931_status(pri, c, PRI_CAUSE_WRONG_MESSAGE);
break; break;
} }
@@ -6125,7 +6159,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (c->justsignalling) { /* Make sure WE release when we initiatie a signalling only connection */ if (c->justsignalling) { /* Make sure WE release when we initiatie a signalling only connection */
q931_release(pri, c, PRI_CAUSE_NORMAL_CLEARING); q931_release(pri, c, PRI_CAUSE_NORMAL_CLEARING);
break; break;
@@ -3313,23 +4350,43 @@ @@ -3313,23 +4360,43 @@
return Q931_RES_HAVEEVENT; return Q931_RES_HAVEEVENT;
case Q931_FACILITY: case Q931_FACILITY:
if (c->newcall) { if (c->newcall) {
@@ -6182,7 +6216,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
break; break;
} }
pri->ev.e = PRI_EVENT_PROGRESS; pri->ev.e = PRI_EVENT_PROGRESS;
@@ -3347,6 +4404,11 @@ @@ -3347,6 +4414,11 @@
q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE); q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE);
break; break;
} }
@@ -6194,7 +6228,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
pri->ev.proceeding.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.proceeding.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
if (mh->msg == Q931_CALL_PROCEEDING) { if (mh->msg == Q931_CALL_PROCEEDING) {
pri->ev.e = PRI_EVENT_PROCEEDING; pri->ev.e = PRI_EVENT_PROCEEDING;
@@ -3364,16 +4426,21 @@ @@ -3364,16 +4436,21 @@
break; break;
} }
if (c->ourcallstate != Q931_CALL_STATE_CONNECT_REQUEST) { if (c->ourcallstate != Q931_CALL_STATE_CONNECT_REQUEST) {
@@ -6218,14 +6252,15 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
break; break;
} }
if (c->newcall) { if (c->newcall) {
@@ -3410,31 +4477,69 @@ @@ -3410,31 +4487,70 @@
if (res) if (res)
return res; return res;
} }
- break; - break;
+ if (c->peercallstate != c->sugcallstate) { + if (c->peercallstate != c->sugcallstate) {
+ pri_error(pri, "updating callstate, peercallstate %d to %d\n", c->peercallstate, c->sugcallstate); + pri_error(pri, "updating callstate, peercallstate %d to %d\n", c->peercallstate, c->sugcallstate);
+ c->peercallstate = c->sugcallstate; +// c->peercallstate = c->sugcallstate;
+ c->ourcallstate = c->sugcallstate;
+ if (c->sugcallstate != Q931_CALL_STATE_ACTIVE) { + if (c->sugcallstate != Q931_CALL_STATE_ACTIVE) {
+ /* pass hangup to upper layer! */ + /* pass hangup to upper layer! */
+ if (c->alive) { + if (c->alive) {
@@ -6312,7 +6347,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
break; break;
case Q931_RELEASE: case Q931_RELEASE:
if (missingmand) { if (missingmand) {
@@ -3450,6 +4555,7 @@ @@ -3450,6 +4566,7 @@
pri->ev.e = PRI_EVENT_HANGUP; pri->ev.e = PRI_EVENT_HANGUP;
pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
pri->ev.hangup.cref = c->cr; pri->ev.hangup.cref = c->cr;
@@ -6320,7 +6355,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
pri->ev.hangup.cause = c->cause; pri->ev.hangup.cause = c->cause;
pri->ev.hangup.call = c; pri->ev.hangup.call = c;
pri->ev.hangup.aoc_units = c->aoc_units; pri->ev.hangup.aoc_units = c->aoc_units;
@@ -3478,9 +4584,16 @@ @@ -3478,9 +4595,16 @@
pri->ev.e = PRI_EVENT_HANGUP_REQ; pri->ev.e = PRI_EVENT_HANGUP_REQ;
pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.hangup.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
pri->ev.hangup.cref = c->cr; pri->ev.hangup.cref = c->cr;
@@ -6337,7 +6372,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
if (c->alive) if (c->alive)
return Q931_RES_HAVEEVENT; return Q931_RES_HAVEEVENT;
else else
@@ -3511,7 +4624,7 @@ @@ -3511,7 +4635,7 @@
pri->ev.e = PRI_EVENT_INFO_RECEIVED; pri->ev.e = PRI_EVENT_INFO_RECEIVED;
pri->ev.ring.call = c; pri->ev.ring.call = c;
pri->ev.ring.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.ring.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
@@ -6346,7 +6381,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
libpri_copy_string(pri->ev.ring.callingsubaddr, c->callingsubaddr, sizeof(pri->ev.ring.callingsubaddr)); libpri_copy_string(pri->ev.ring.callingsubaddr, c->callingsubaddr, sizeof(pri->ev.ring.callingsubaddr));
pri->ev.ring.complete = c->complete; /* this covers IE 33 (Sending Complete) */ pri->ev.ring.complete = c->complete; /* this covers IE 33 (Sending Complete) */
return Q931_RES_HAVEEVENT; return Q931_RES_HAVEEVENT;
@@ -3531,7 +4644,6 @@ @@ -3531,7 +4655,6 @@
pri->ev.e = PRI_EVENT_SETUP_ACK; pri->ev.e = PRI_EVENT_SETUP_ACK;
pri->ev.setup_ack.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16); pri->ev.setup_ack.channel = c->channelno | (c->ds1no << 8) | (c->ds1explicit << 16);
pri->ev.setup_ack.call = c; pri->ev.setup_ack.call = c;
@@ -6354,7 +6389,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
cur = c->apdus; cur = c->apdus;
while (cur) { while (cur) {
if (!cur->sent && cur->message == Q931_FACILITY) { if (!cur->sent && cur->message == Q931_FACILITY) {
@@ -3547,19 +4659,53 @@ @@ -3547,19 +4670,53 @@
pri->ev.notify.channel = c->channelno; pri->ev.notify.channel = c->channelno;
pri->ev.notify.info = c->notify; pri->ev.notify.info = c->notify;
return Q931_RES_HAVEEVENT; return Q931_RES_HAVEEVENT;
@@ -6412,7 +6447,7 @@ diff -urN libpri-1.2.3.orig/q931.c libpri-1.2.3/q931.c
case Q931_SUSPEND_ACKNOWLEDGE: case Q931_SUSPEND_ACKNOWLEDGE:
case Q931_SUSPEND_REJECT: case Q931_SUSPEND_REJECT:
pri_error(pri, "!! Not yet handling post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg); pri_error(pri, "!! Not yet handling post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
@@ -3569,7 +4715,7 @@ @@ -3569,7 +4726,7 @@
pri_error(pri, "!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg); pri_error(pri, "!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST); q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST);
if (c->newcall) if (c->newcall)

81
src/patches/zaptel.patch
View File

@@ -32,8 +32,47 @@ diff -urN zaptel-1.2.6.orig/Makefile zaptel-1.2.6/Makefile
diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
--- zaptel-1.2.6.orig/zaptel.c 2005-12-17 03:04:05.000000000 +0100 --- zaptel-1.2.6.orig/zaptel.c 2005-12-17 03:04:05.000000000 +0100
+++ zaptel-1.2.6/zaptel.c 2006-06-06 14:54:33.000000000 +0200 +++ zaptel-1.2.6/zaptel.c 2006-07-31 14:12:08.000000000 +0200
@@ -4913,11 +4913,40 @@ @@ -139,6 +139,7 @@
EXPORT_SYMBOL(zt_qevent_lock);
EXPORT_SYMBOL(zt_hooksig);
EXPORT_SYMBOL(zt_alarm_notify);
+EXPORT_SYMBOL(zt_alarm_notify_no_master_change);
EXPORT_SYMBOL(zt_set_dynamic_ioctl);
EXPORT_SYMBOL(zt_ec_chunk);
EXPORT_SYMBOL(zt_ec_span);
@@ -2685,6 +2686,30 @@
}
}
+void zt_alarm_notify_no_master_change(struct zt_span *span)
+{
+ int j;
+ int x;
+
+ span->alarms &= ~ZT_ALARM_LOOPBACK;
+ /* Determine maint status */
+ if (span->maintstat || span->mainttimer)
+ span->alarms |= ZT_ALARM_LOOPBACK;
+ /* DON'T CHANGE THIS AGAIN. THIS WAS DONE FOR A REASON.
+ The expression (a != b) does *NOT* do the same thing
+ as ((!a) != (!b)) */
+ /* if change in general state */
+ if ((!span->alarms) != (!span->lastalarms)) {
+ if (span->alarms)
+ j = ZT_EVENT_ALARM;
+ else
+ j = ZT_EVENT_NOALARM;
+ span->lastalarms = span->alarms;
+ for (x=0;x < span->channels;x++)
+ zt_qevent_lock(&span->chans[x], j);
+ }
+}
+
#define VALID_SPAN(j) do { \
if ((j >= ZT_MAX_SPANS) || (j < 1)) \
return -EINVAL; \
@@ -4913,11 +4938,40 @@
*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc); *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
} }
bytes -= left; bytes -= left;
@@ -74,7 +113,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
} }
/* Check buffer status */ /* Check buffer status */
if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) { if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
@@ -4962,6 +4991,17 @@ @@ -4962,6 +5016,17 @@
/* Transmit a flag if this is an HDLC channel */ /* Transmit a flag if this is an HDLC channel */
if (ms->flags & ZT_FLAG_HDLC) if (ms->flags & ZT_FLAG_HDLC)
fasthdlc_tx_frame_nocheck(&ms->txhdlc); fasthdlc_tx_frame_nocheck(&ms->txhdlc);
@@ -92,7 +131,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
#ifdef CONFIG_ZAPATA_NET #ifdef CONFIG_ZAPATA_NET
if (ms->flags & ZT_FLAG_NETDEV) if (ms->flags & ZT_FLAG_NETDEV)
netif_wake_queue(ztchan_to_dev(ms)); netif_wake_queue(ztchan_to_dev(ms));
@@ -4972,7 +5012,7 @@ @@ -4972,7 +5037,7 @@
tasklet_schedule(&ms->ppp_calls); tasklet_schedule(&ms->ppp_calls);
} }
#endif #endif
@@ -101,7 +140,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) { } else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
left = ms->curtone->tonesamples - ms->tonep; left = ms->curtone->tonesamples - ms->tonep;
if (left > bytes) if (left > bytes)
@@ -5018,6 +5058,10 @@ @@ -5018,6 +5083,10 @@
memset(txb, 0xFF, bytes); memset(txb, 0xFF, bytes);
} }
bytes = 0; bytes = 0;
@@ -112,7 +151,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
} else { } else {
memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */ memset(txb, ZT_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
bytes = 0; bytes = 0;
@@ -5743,6 +5787,13 @@ @@ -5743,6 +5812,13 @@
int left, x; int left, x;
int bytes = ZT_CHUNKSIZE; int bytes = ZT_CHUNKSIZE;
@@ -126,7 +165,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
while(bytes) { while(bytes) {
#if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP) #if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
@@ -5801,6 +5852,19 @@ @@ -5801,6 +5877,19 @@
} }
} }
} }
@@ -148,7 +187,7 @@ diff -urN zaptel-1.2.6.orig/zaptel.c zaptel-1.2.6/zaptel.c
memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left); memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
diff -urN zaptel-1.2.6.orig/zaptel.h zaptel-1.2.6/zaptel.h diff -urN zaptel-1.2.6.orig/zaptel.h zaptel-1.2.6/zaptel.h
--- zaptel-1.2.6.orig/zaptel.h 2005-12-17 03:04:05.000000000 +0100 --- zaptel-1.2.6.orig/zaptel.h 2005-12-17 03:04:05.000000000 +0100
+++ zaptel-1.2.6/zaptel.h 2006-06-06 14:54:33.000000000 +0200 +++ zaptel-1.2.6/zaptel.h 2006-07-31 12:58:04.000000000 +0200
@@ -994,6 +994,13 @@ @@ -994,6 +994,13 @@
int do_ppp_error; int do_ppp_error;
struct sk_buff_head ppp_rq; struct sk_buff_head ppp_rq;
@@ -183,9 +222,33 @@ diff -urN zaptel-1.2.6.orig/zaptel.h zaptel-1.2.6/zaptel.h
struct zt_span { struct zt_span {
spinlock_t lock; spinlock_t lock;
void *pvt; /* Private stuff */ void *pvt; /* Private stuff */
@@ -1404,6 +1415,9 @@
/* Notify a change possible change in alarm status */
extern void zt_alarm_notify(struct zt_span *span);
+/* Notify a change possible change in alarm status, DONT change the zaptel master! */
+extern void zt_alarm_notify_no_master_change(struct zt_span *span);
+
/* Initialize a tone state */
extern void zt_init_tone_state(struct zt_tone_state *ts, struct zt_tone *zt);
diff -urN zaptel-1.2.6.orig/zconfig.h zaptel-1.2.6/zconfig.h diff -urN zaptel-1.2.6.orig/zconfig.h zaptel-1.2.6/zconfig.h
--- zaptel-1.2.6.orig/zconfig.h 2005-11-29 19:42:08.000000000 +0100 --- zaptel-1.2.6.orig/zconfig.h 2005-11-29 19:42:08.000000000 +0100
+++ zaptel-1.2.6/zconfig.h 2006-06-06 14:54:33.000000000 +0200 +++ zaptel-1.2.6/zconfig.h 2006-08-02 20:34:43.000000000 +0200
@@ -49,11 +49,11 @@
/* #define ECHO_CAN_MARK */
/* #define ECHO_CAN_MARK2 */
/* #define ECHO_CAN_MARK3 */
-#define ECHO_CAN_KB1
+/* #define ECHO_CAN_KB1 */
/* MG2 is a version of KB1 that has some changes to it that are
* supposed to improve how it performs. If you have echo problems,
* try it out! */
-/* #define ECHO_CAN_MG2 */
+#define ECHO_CAN_MG2
/*
* Uncomment for aggressive residual echo supression under
@@ -152,4 +152,10 @@ @@ -152,4 +152,10 @@
*/ */
/* #define FXSFLASH */ /* #define FXSFLASH */