retronetworking
/
mISDNuser
13
0
Fork 0
Code Pull Requests Releases Activity

In state 2 we may receive disconnect|release.. then we should start t308. In state 19 we may receive disconnect, then we should stay in 19.

This commit is contained in:
crich 2006-06-16 10:02:50 +00:00
parent 4b76b09b00
commit 2964149b25
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
i4lnet/net_l3.c
View File

@ -1,4 +1,4 @@
/* $Id: net_l3.c,v 1.7 2006/06/15 16:08:43 crich Exp $
/* $Id: net_l3.c,v 1.8 2006/06/16 10:02:50 crich Exp $
*
* Author Karsten Keil (keil@isdn4linux.de)
*
@ -16,7 +16,7 @@
#include "helper.h"
// #include "debug.h"
const char *l3_revision = "$Revision: 1.7 $";
const char *l3_revision = "$Revision: 1.8 $";
#define PROTO_DIS_EURO 8
@ -773,13 +773,22 @@ l3dss1_disconnect(layer3_proc_t *pc, int pr, void *arg)
msg_t *umsg,*msg = arg;
DISCONNECT_t *disc;
if (pc->state == 19) {
// printf("We're in State 19, receive disconnect, so we stay here\n");
return ;
}
umsg = prep_l3data_msg(CC_DISCONNECT | INDICATION, pc->ces |
(pc->callref << 16), sizeof(DISCONNECT_t), msg->len, NULL);
if (!umsg)
return;
disc = (DISCONNECT_t *)(umsg->data + mISDNUSER_HEAD_SIZE);
StopAllL3Timer(pc);
newl3state(pc, 11);
if (!(disc->CAUSE = l3dss1_get_cause(pc, msg, umsg))) {
if (pc->l3->debug & L3_DEB_WARN)
l3_debug(pc->l3, "DISC get_cause ret(%d)", pc->err);
@ -1266,7 +1275,7 @@ static struct stateentry datastatelist[] =
MT_ALERTING, l3dss1_alerting_i},
{SBIT(6) | SBIT(7) | SBIT(9) | SBIT(25),
MT_CONNECT, l3dss1_connect_i},
{SBIT(1) | SBIT(2) | SBIT(3) | SBIT(4) | SBIT(10),
{SBIT(1) | SBIT(2) | SBIT(3) | SBIT(4) | SBIT(10) | SBIT(19),
MT_DISCONNECT, l3dss1_disconnect},
{SBIT(7) | SBIT(8) | SBIT(9),
MT_DISCONNECT, l3dss1_disconnect_i},
@ -2252,9 +2261,9 @@ static struct stateentry downstatelist[] =
CC_CONNECT | RESPONSE, l3dss1_connect_res},
{SBIT(1) | SBIT(2) | SBIT(3) | SBIT(4) | SBIT(10),
CC_DISCONNECT | REQUEST, l3dss1_disconnect_req},
{SBIT(6) | SBIT(7) | SBIT(8) | SBIT(9) | SBIT(25),
{ SBIT(2) | SBIT(6) | SBIT(7) | SBIT(8) | SBIT(9) | SBIT(25),
CC_DISCONNECT | REQUEST, l3dss1_disconnect_req_out},
{SBIT(11)
{ SBIT(2) | SBIT(11)
#warning bitte beachte folgendes:
/*
es ist nur erlaubt, im state 11 einen release zu schicken!