SPV, callback , remove some debugging code Karsten Keil
This commit is contained in:
isdn4dev
parent
85a76b57da
commit
100ce9a6ef
|
|
@ -1,33 +1,17 @@
|
|||
/* $Id$
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.2 1996/04/20 16:47:23 fritz
|
||||
* Changed statemachine to allow reject of an incoming call.
|
||||
* Report all incoming calls, not just those with Service = 7.
|
||||
* Misc. typos
|
||||
*
|
||||
* Revision 1.1 1996/04/13 10:25:16 fritz
|
||||
* Initial revision
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
char *
|
||||
mt_trans(int pd, int mt)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (pd == PROTO_DIS_N0) {
|
||||
for (i = 0; i < (sizeof(mtdesc_n0) / sizeof(struct MTypeDesc)); i++) {
|
||||
if (mt == mtdesc_n0[i].mt)
|
||||
return (mtdesc_n0[i].descr);
|
||||
}
|
||||
return ("unknown Message Type PD=N0");
|
||||
} else if (pd == PROTO_DIS_N1) {
|
||||
for (i = 0; i < (sizeof(mtdesc_n1) / sizeof(struct MTypeDesc)); i++) {
|
||||
if (mt == mtdesc_n1[i].mt)
|
||||
return (mtdesc_n1[i].descr);
|
||||
}
|
||||
return ("unknown Message Type PD=N1");
|
||||
}
|
||||
return ("unknown Protokolldiscriminator");
|
||||
}
|
||||
|
||||
static void
|
||||
l3_1TR6_message(struct PStack *st, int mt, int pd)
|
||||
{
|
||||
|
|
@ -54,10 +38,6 @@ l3_1tr6_setup(struct PStack *st, byte pr, void *arg)
|
|||
byte *p;
|
||||
char *teln;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: sent SETUP\n");
|
||||
#endif
|
||||
|
||||
st->l3.callref = st->pa->callref;
|
||||
BufPoolGet(&dibh, st->l1.sbufpool, GFP_ATOMIC, (void *) st, 19);
|
||||
p = DATAPTR(dibh);
|
||||
|
|
@ -68,7 +48,21 @@ l3_1tr6_setup(struct PStack *st, byte pr, void *arg)
|
|||
*p++ = st->l3.callref;
|
||||
*p++ = MT_N1_SETUP;
|
||||
|
||||
|
||||
if ('S' == (st->pa->called[0] & 0x5f)) { /* SPV ??? */
|
||||
/* NSF SPV */
|
||||
*p++ = WE0_netSpecFac;
|
||||
*p++ = 4; /* Laenge */
|
||||
*p++ = 0;
|
||||
*p++ = FAC_SPV; /* SPV */
|
||||
*p++ = st->pa->info; /* 0 for all Services */
|
||||
*p++ = st->pa->info2; /* 0 for all Services */
|
||||
*p++ = WE0_netSpecFac;
|
||||
*p++ = 4; /* Laenge */
|
||||
*p++ = 0;
|
||||
*p++ = FAC_Activate; /* aktiviere SPV (default) */
|
||||
*p++ = st->pa->info; /* 0 for all Services */
|
||||
*p++ = st->pa->info2; /* 0 for all Services */
|
||||
}
|
||||
if (st->pa->calling[0] != '\0') {
|
||||
*p++ = WE0_origAddr;
|
||||
*p++ = strlen(st->pa->calling) + 1;
|
||||
|
|
@ -79,11 +73,17 @@ l3_1tr6_setup(struct PStack *st, byte pr, void *arg)
|
|||
*p++ = *teln++ & 0x7f;
|
||||
}
|
||||
*p++ = WE0_destAddr;
|
||||
*p++ = strlen(st->pa->called) + 1;
|
||||
teln = st->pa->called;
|
||||
if ('S' != (st->pa->called[0] & 0x5f)) { /* Keine SPV ??? */
|
||||
*p++ = strlen(st->pa->called) + 1;
|
||||
st->pa->spv = 0;
|
||||
} else { /* SPV */
|
||||
*p++ = strlen(st->pa->called);
|
||||
teln++; /* skip S */
|
||||
st->pa->spv = 1;
|
||||
}
|
||||
/* Classify as AnyPref. */
|
||||
*p++ = 0x81; /* Ext = '1'B, Type = '000'B, Plan = '0001'B. */
|
||||
|
||||
teln = st->pa->called;
|
||||
while (*teln)
|
||||
*p++ = *teln++ & 0x7f;
|
||||
|
||||
|
|
@ -101,7 +101,6 @@ l3_1tr6_setup(struct PStack *st, byte pr, void *arg)
|
|||
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
l3_1tr6_tu_setup(struct PStack *st, byte pr, void *arg)
|
||||
{
|
||||
|
|
@ -113,13 +112,7 @@ l3_1tr6_tu_setup(struct PStack *st, byte pr, void *arg)
|
|||
st->pa->callref = getcallref(p);
|
||||
st->l3.callref = 0x80 + st->pa->callref;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: TU_SETUP cr=%d\n",st->l3.callref);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Channel Identification
|
||||
*/
|
||||
/* Channel Identification */
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.uihsize, ibh->datasize - st->l2.uihsize,
|
||||
WE0_chanID, 0))) {
|
||||
|
|
@ -149,6 +142,13 @@ l3_1tr6_tu_setup(struct PStack *st, byte pr, void *arg)
|
|||
} else
|
||||
strcpy(st->pa->calling, "");
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
st->pa->spv = 0;
|
||||
if ((p = findie(p + st->l2.uihsize, ibh->datasize - st->l2.uihsize,
|
||||
WE0_netSpecFac, 0))) {
|
||||
if ((FAC_SPV == p[3]) || (FAC_Activate == p[3]))
|
||||
st->pa->spv = 1;
|
||||
}
|
||||
BufPoolRelease(ibh);
|
||||
|
||||
/* Signal all services, linklevel takes care of Service-Indicator */
|
||||
|
|
@ -167,10 +167,6 @@ l3_1tr6_tu_setup_ack(struct PStack *st, byte pr, void *arg)
|
|||
byte *p;
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: SETUP_ACK\n");
|
||||
#endif
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.ihsize, ibh->datasize - st->l2.ihsize,
|
||||
WE0_chanID, 0))) {
|
||||
|
|
@ -178,6 +174,7 @@ l3_1tr6_tu_setup_ack(struct PStack *st, byte pr, void *arg)
|
|||
} else
|
||||
printk(KERN_INFO "octect 3 not found\n");
|
||||
|
||||
|
||||
BufPoolRelease(ibh);
|
||||
newl3state(st, 2);
|
||||
}
|
||||
|
|
@ -188,10 +185,6 @@ l3_1tr6_tu_call_sent(struct PStack *st, byte pr, void *arg)
|
|||
byte *p;
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: CALL_SENT\n");
|
||||
#endif
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.ihsize, ibh->datasize - st->l2.ihsize,
|
||||
WE0_chanID, 0))) {
|
||||
|
|
@ -210,9 +203,6 @@ l3_1tr6_tu_alert(struct PStack *st, byte pr, void *arg)
|
|||
byte *p;
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: TU_ALERT\n");
|
||||
#endif
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.ihsize, ibh->datasize - st->l2.ihsize,
|
||||
|
|
@ -231,24 +221,22 @@ static void
|
|||
l3_1tr6_tu_info(struct PStack *st, byte pr, void *arg)
|
||||
{
|
||||
byte *p;
|
||||
int i;
|
||||
int i,tmpcharge=0;
|
||||
char a_charge[8];
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: TU_INFO\n");
|
||||
#endif
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.ihsize, ibh->datasize - st->l2.ihsize,
|
||||
WE6_chargingInfo, 6))) {
|
||||
iecpy(a_charge, p, 1);
|
||||
st->pa->chargeinfo = 0;
|
||||
for (i = 0; i < strlen(a_charge); i++) {
|
||||
st->pa->chargeinfo *= 10;
|
||||
st->pa->chargeinfo += a_charge[i] & 0xf;
|
||||
st->l3.l3l4(st, CC_INFO_CHARGE, NULL);
|
||||
}
|
||||
for (i = 0; i < strlen (a_charge); i++) {
|
||||
tmpcharge *= 10;
|
||||
tmpcharge += a_charge[i] & 0xf;
|
||||
}
|
||||
if (tmpcharge > st->pa->chargeinfo) {
|
||||
st->pa->chargeinfo = tmpcharge;
|
||||
st->l3.l3l4 (st, CC_INFO_CHARGE, NULL);
|
||||
}
|
||||
if (DEBUG_1TR6 > 2)
|
||||
printk(KERN_INFO "chargingInfo %d\n", st->pa->chargeinfo);
|
||||
} else if (DEBUG_1TR6 > 2)
|
||||
|
|
@ -264,10 +252,6 @@ l3_1tr6_tu_info_s2(struct PStack *st, byte pr, void *arg)
|
|||
int i;
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: TU_INFO 2\n");
|
||||
#endif
|
||||
|
||||
if (DEBUG_1TR6 > 4) {
|
||||
p = DATAPTR(ibh);
|
||||
for (i = 0; i < ibh->datasize; i++) {
|
||||
|
|
@ -282,10 +266,7 @@ l3_1tr6_tu_connect(struct PStack *st, byte pr, void *arg)
|
|||
{
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: CONNECT\n");
|
||||
#endif
|
||||
|
||||
st->pa->chargeinfo=0;
|
||||
BufPoolRelease(ibh);
|
||||
st->l3.l3l4(st, CC_SETUP_CNF, NULL);
|
||||
newl3state(st, 10);
|
||||
|
|
@ -296,11 +277,6 @@ l3_1tr6_tu_rel(struct PStack *st, byte pr, void *arg)
|
|||
{
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: REL\n");
|
||||
#endif
|
||||
|
||||
|
||||
BufPoolRelease(ibh);
|
||||
l3_1TR6_message(st, MT_N1_REL_ACK, PROTO_DIS_N1);
|
||||
st->l3.l3l4(st, CC_RELEASE_IND, NULL);
|
||||
|
|
@ -312,11 +288,6 @@ l3_1tr6_tu_rel_ack(struct PStack *st, byte pr, void *arg)
|
|||
{
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: REL_ACK\n");
|
||||
#endif
|
||||
|
||||
|
||||
BufPoolRelease(ibh);
|
||||
newl3state(st, 0);
|
||||
st->l3.l3l4(st, CC_RELEASE_CNF, NULL);
|
||||
|
|
@ -327,25 +298,21 @@ l3_1tr6_tu_disc(struct PStack *st, byte pr, void *arg)
|
|||
{
|
||||
struct BufHeader *ibh = arg;
|
||||
byte *p;
|
||||
int i;
|
||||
int i,tmpcharge=0;
|
||||
char a_charge[8];
|
||||
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: TU_DISC\n");
|
||||
#endif
|
||||
|
||||
|
||||
p = DATAPTR(ibh);
|
||||
if ((p = findie(p + st->l2.ihsize, ibh->datasize - st->l2.ihsize,
|
||||
WE6_chargingInfo, 6))) {
|
||||
iecpy(a_charge, p, 1);
|
||||
st->pa->chargeinfo = 0;
|
||||
for (i = 0; i < strlen(a_charge); i++) {
|
||||
st->pa->chargeinfo *= 10;
|
||||
st->pa->chargeinfo += a_charge[i] & 0xf;
|
||||
st->l3.l3l4(st, CC_INFO_CHARGE, NULL);
|
||||
}
|
||||
for (i = 0; i < strlen (a_charge); i++) {
|
||||
tmpcharge *= 10;
|
||||
tmpcharge += a_charge[i] & 0xf;
|
||||
}
|
||||
if (tmpcharge > st->pa->chargeinfo) {
|
||||
st->pa->chargeinfo = tmpcharge;
|
||||
st->l3.l3l4 (st, CC_INFO_CHARGE, NULL);
|
||||
}
|
||||
if (DEBUG_1TR6 > 2)
|
||||
printk(KERN_INFO "chargingInfo %d\n", st->pa->chargeinfo);
|
||||
} else if (DEBUG_1TR6 > 2)
|
||||
|
|
@ -375,12 +342,8 @@ l3_1tr6_tu_connect_ack(struct PStack *st, byte pr, void *arg)
|
|||
{
|
||||
struct BufHeader *ibh = arg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: CONN_ACK\n");
|
||||
#endif
|
||||
|
||||
|
||||
BufPoolRelease(ibh);
|
||||
st->pa->chargeinfo = 0;
|
||||
st->l3.l3l4(st, CC_SETUP_COMPLETE_IND, NULL);
|
||||
newl3state(st, 10);
|
||||
}
|
||||
|
|
@ -389,10 +352,6 @@ static void
|
|||
l3_1tr6_alert(struct PStack *st, byte pr,
|
||||
void *arg)
|
||||
{
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: send ALERT\n");
|
||||
#endif
|
||||
|
||||
l3_1TR6_message(st, MT_N1_ALERT, PROTO_DIS_N1);
|
||||
newl3state(st, 7);
|
||||
}
|
||||
|
|
@ -401,22 +360,45 @@ static void
|
|||
l3_1tr6_conn(struct PStack *st, byte pr,
|
||||
void *arg)
|
||||
{
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: send CONNECT\n");
|
||||
#endif
|
||||
struct BufHeader *dibh;
|
||||
byte *p;
|
||||
|
||||
st->l3.callref = 0x80 + st->pa->callref;
|
||||
l3_1TR6_message(st, MT_N1_CONN, PROTO_DIS_N1);
|
||||
|
||||
BufPoolGet(&dibh, st->l1.sbufpool, GFP_ATOMIC, (void *) st, 20);
|
||||
p = DATAPTR(dibh);
|
||||
p += st->l2.ihsize;
|
||||
|
||||
*p++ = PROTO_DIS_N1;
|
||||
*p++ = 0x1;
|
||||
*p++ = st->l3.callref;
|
||||
*p++ = MT_N1_CONN;
|
||||
|
||||
if (st->pa->spv) { /* SPV ??? */
|
||||
/* NSF SPV */
|
||||
*p++ = WE0_netSpecFac;
|
||||
*p++ = 4; /* Laenge */
|
||||
*p++ = 0;
|
||||
*p++ = FAC_SPV; /* SPV */
|
||||
*p++ = st->pa->info;
|
||||
*p++ = st->pa->info2;
|
||||
*p++ = WE0_netSpecFac;
|
||||
*p++ = 4; /* Laenge */
|
||||
*p++ = 0;
|
||||
*p++ = FAC_Activate; /* aktiviere SPV */
|
||||
*p++ = st->pa->info;
|
||||
*p++ = st->pa->info2;
|
||||
}
|
||||
dibh->datasize = p - DATAPTR(dibh);
|
||||
|
||||
i_down(st, dibh);
|
||||
|
||||
newl3state(st, 8);
|
||||
}
|
||||
|
||||
static void
|
||||
l3_1tr6_ignore(struct PStack *st, byte pr, void *arg)
|
||||
{
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: IGNORE\n");
|
||||
#endif
|
||||
|
||||
newl3state(st, 0);
|
||||
}
|
||||
|
||||
|
|
@ -427,10 +409,6 @@ l3_1tr6_disconn_req(struct PStack *st, byte pr, void *arg)
|
|||
byte *p;
|
||||
byte rejflg;
|
||||
|
||||
#if DEBUG_1TR6
|
||||
printk(KERN_INFO "1tr6: send DISCON\n");
|
||||
#endif
|
||||
|
||||
BufPoolGet(&dibh, st->l1.sbufpool, GFP_ATOMIC, (void *) st, 21);
|
||||
p = DATAPTR(dibh);
|
||||
p += st->l2.ihsize;
|
||||
|
|
@ -455,10 +433,7 @@ l3_1tr6_disconn_req(struct PStack *st, byte pr, void *arg)
|
|||
|
||||
i_down(st, dibh);
|
||||
|
||||
if (rejflg)
|
||||
newl3state(st, 0);
|
||||
else
|
||||
newl3state(st, 11);
|
||||
newl3state(st, 11);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -468,8 +443,6 @@ l3_1tr6_rel_req(struct PStack *st, byte pr, void *arg)
|
|||
newl3state(st, 19);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct stateentry downstatelist_1tr6t[] =
|
||||
{
|
||||
{0, CC_SETUP_REQ, l3_1tr6_setup},
|
||||
|
|
|
|||
Loading…
Reference in New Issue