From 06f3ac640269495c18d4a61aa03362168d7b7de6 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Thu, 24 May 2007 00:53:06 +0000
Subject: [PATCH] this is much more correct, we respond to the NT sending RR
commands instead of us sending RR commands on the timer.
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@123 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
libs/freetdm/src/isdn/Q921.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libs/freetdm/src/isdn/Q921.c b/libs/freetdm/src/isdn/Q921.c
index c69f074812..6a35596762 100644
--- a/libs/freetdm/src/isdn/Q921.c
+++ b/libs/freetdm/src/isdn/Q921.c
@@ -501,14 +501,12 @@ int Q921Rx12(L2TRUNK trunk)
/* check for I frame */
if((mes[2] & 0x01) == 0)
{
- L2INT vs = trunk->vs;
+
/* we increment before we "really" know its good so that if we send in the callback, we use the right nr */
trunk->vr++;
if(Q921Tx23Proc(trunk, smes, size-2) >= 0) /* -2 to clip away CRC */
{
- if (vs == trunk->vs) {
- Q921SendRR(trunk, (mes[0]&0xfc)>>2, (mes[0]>>1)&0x01, mes[1]>>1, mes[3]&0x01);
- }
+ Q921SendRR(trunk, (mes[0]&0xfc)>>2, (mes[0]>>1)&0x01, mes[1]>>1, mes[3]&0x01);
}
else
{
@@ -519,11 +517,11 @@ int Q921Rx12(L2TRUNK trunk)
/* check for RR */
else if(mes[2] ==0x01)
- {
-
- /* todo: we probably should schedule to send RR at timeout here */
- /* todo: check if RR is responce to I */
- Q921T203TimerStart(trunk);
+ {
+ if (((mes[0]>>1)&0x01) == (trunk->NetUser == Q921_TE ? 1 : 0)) { /* if this is a command */
+ Q921SendRR(trunk, (mes[0]&0xfc)>>2, (mes[0]>>1)&0x01, mes[1]>>1, mes[2]&0x01);
+ }
+
}
/* check for RNR */