patch-2.2.11 linux/drivers/isdn/hisax/isdnl2.c
Next file: linux/drivers/isdn/hisax/isdnl3.c
Previous file: linux/drivers/isdn/hisax/isdnl1.h
Back to the patch index
Back to the overall index
- Lines: 2263
- Date:
Mon Aug 9 12:04:39 1999
- Orig file:
v2.2.10/linux/drivers/isdn/hisax/isdnl2.c
- Orig date:
Thu May 14 18:43:55 1998
diff -u --recursive --new-file v2.2.10/linux/drivers/isdn/hisax/isdnl2.c linux/drivers/isdn/hisax/isdnl2.c
@@ -1,12 +1,45 @@
-/* $Id: isdnl2.c,v 2.7 1998/02/12 23:07:47 keil Exp $
+/* $Id: isdnl2.c,v 2.17 1999/07/01 08:11:50 keil Exp $
- * Author Karsten Keil (keil@temic-ech.spacenet.de)
+ * Author Karsten Keil (keil@isdn4linux.de)
* based on the teles driver from Jan den Ouden
*
+ * This file is (c) under GNU PUBLIC LICENSE
+ * For changes and modifications please read
+ * ../../../Documentation/isdn/HiSax.cert
+ *
* Thanks to Jan den Ouden
* Fritz Elfert
*
* $Log: isdnl2.c,v $
+ * Revision 2.17 1999/07/01 08:11:50 keil
+ * Common HiSax version for 2.0, 2.1, 2.2 and 2.3 kernel
+ *
+ * Revision 2.16 1998/11/15 23:55:01 keil
+ * changes from 2.0
+ *
+ * Revision 2.15 1998/08/13 23:36:42 keil
+ * HiSax 3.1 - don't work stable with current LinkLevel
+ *
+ * Revision 2.14 1998/06/19 15:19:18 keil
+ * fix LAPB tx_cnt for none I-frames
+ *
+ * Revision 2.13 1998/06/18 23:17:20 keil
+ * LAPB bugfix
+ *
+ * Revision 2.12 1998/05/25 14:10:12 keil
+ * HiSax 3.0
+ * X.75 and leased are working again.
+ *
+ * Revision 2.11 1998/05/25 12:58:08 keil
+ * HiSax golden code from certification, Don't use !!!
+ * No leased lines, no X75, but many changes.
+ *
+ * Revision 2.9 1998/04/10 10:35:30 paul
+ * fixed (silly?) warnings from egcs on Alpha.
+ *
+ * Revision 2.8 1998/03/07 22:57:04 tsbogend
+ * made HiSax working on Linux/Alpha
+ *
* Revision 2.7 1998/02/12 23:07:47 keil
* change for 2.1.86 (removing FREE_READ/FREE_WRITE from [dev]_kfree_skb()
*
@@ -25,7 +58,7 @@
* Old stuff is still in the separate branch.
*
* Revision 2.2 1997/07/31 11:49:05 keil
- * Eroor handling for no TEI assign
+ * Error handling for no TEI assign
*
* Revision 2.1 1997/07/27 21:34:38 keil
* cosmetics
@@ -41,9 +74,9 @@
#include "hisax.h"
#include "isdnl2.h"
-const char *l2_revision = "$Revision: 2.7 $";
+const char *l2_revision = "$Revision: 2.17 $";
-static void l2m_debug(struct FsmInst *fi, char *s);
+static void l2m_debug(struct FsmInst *fi, char *fmt, ...);
static
struct Fsm l2fsm =
@@ -76,7 +109,7 @@
enum {
EV_L2_UI,
- EV_L2_SABMX,
+ EV_L2_SABME,
EV_L2_DISC,
EV_L2_DM,
EV_L2_UA,
@@ -86,23 +119,25 @@
EV_L2_DL_DATA,
EV_L2_ACK_PULL,
EV_L2_DL_UNIT_DATA,
- EV_L2_DL_ESTABLISH,
- EV_L2_DL_RELEASE,
+ EV_L2_DL_ESTABLISH_REQ,
+ EV_L2_DL_RELEASE_REQ,
EV_L2_MDL_ASSIGN,
EV_L2_MDL_REMOVE,
EV_L2_MDL_ERROR,
- EV_L2_MDL_NOTEIPROC,
EV_L1_DEACTIVATE,
EV_L2_T200,
EV_L2_T203,
+ EV_L2_SET_OWN_BUSY,
+ EV_L2_CLEAR_OWN_BUSY,
+ EV_L2_FRAME_ERROR,
};
-#define L2_EVENT_COUNT (EV_L2_T203+1)
+#define L2_EVENT_COUNT (EV_L2_FRAME_ERROR+1)
static char *strL2Event[] =
{
"EV_L2_UI",
- "EV_L2_SABMX",
+ "EV_L2_SABME",
"EV_L2_DISC",
"EV_L2_DM",
"EV_L2_UA",
@@ -112,15 +147,17 @@
"EV_L2_DL_DATA",
"EV_L2_ACK_PULL",
"EV_L2_DL_UNIT_DATA",
- "EV_L2_DL_ESTABLISH",
- "EV_L2_DL_RELEASE",
+ "EV_L2_DL_ESTABLISH_REQ",
+ "EV_L2_DL_RELEASE_REQ",
"EV_L2_MDL_ASSIGN",
"EV_L2_MDL_REMOVE",
"EV_L2_MDL_ERROR",
- "EV_L2_MDL_NOTEIPROC",
"EV_L1_DEACTIVATE",
"EV_L2_T200",
"EV_L2_T203",
+ "EV_L2_SET_OWN_BUSY",
+ "EV_L2_CLEAR_OWN_BUSY",
+ "EV_L2_FRAME_ERROR",
};
static int l2addrsize(struct Layer2 *l2);
@@ -134,51 +171,46 @@
l2->windowar[i] = NULL;
}
-static void
-ReleaseWin(struct Layer2 *l2)
+static int
+freewin1(struct Layer2 *l2)
{
int i, cnt = 0;
for (i = 0; i < MAX_WINDOW; i++) {
if (l2->windowar[i]) {
cnt++;
- dev_kfree_skb(l2->windowar[i]);
+ idev_kfree_skb(l2->windowar[i], FREE_WRITE);
l2->windowar[i] = NULL;
}
}
- if (cnt)
- printk(KERN_WARNING "isdl2 freed %d skbuffs in release\n", cnt);
+ return cnt;
}
-inline int
-cansend(struct PStack *st)
+inline void
+freewin(struct PStack *st)
{
- int p1;
-
- p1 = st->l2.vs - st->l2.va;
- if (p1 < 0)
- p1 += (test_bit(FLG_MOD128, &st->l2.flag) ? 128 : 8);
- return ((p1 < st->l2.window) && !test_bit(FLG_PEER_BUSY, &st->l2.flag));
+ freewin1(&st->l2);
}
static void
-discard_i_queue(struct PStack *st)
+ReleaseWin(struct Layer2 *l2)
{
- struct sk_buff *skb;
+ int cnt;
- while ((skb = skb_dequeue(&st->l2.i_queue))) {
- dev_kfree_skb(skb);
- }
+ if((cnt = freewin1(l2)))
+ printk(KERN_WARNING "isdl2 freed %d skbuffs in release\n", cnt);
}
-static void
-discard_ui_queue(struct PStack *st)
+inline unsigned int
+cansend(struct PStack *st)
{
- struct sk_buff *skb;
+ unsigned int p1;
- while ((skb = skb_dequeue(&st->l2.ui_queue))) {
- dev_kfree_skb(skb);
- }
+ if(test_bit(FLG_MOD128, &st->l2.flag))
+ p1 = (st->l2.vs - st->l2.va) % 128;
+ else
+ p1 = (st->l2.vs - st->l2.va) % 8;
+ return ((p1 < st->l2.window) && !test_bit(FLG_PEER_BUSY, &st->l2.flag));
}
inline void
@@ -224,103 +256,209 @@
}
}
-static void
-enqueue_ui(struct PStack *st,
- struct sk_buff *skb)
-{
- st->l2.l2l1(st, PH_DATA_REQ, skb);
-}
-
-static void
+inline static void
enqueue_super(struct PStack *st,
struct sk_buff *skb)
{
- st->l2.l2l1(st, PH_DATA_REQ, skb);
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l1.bcs->tx_cnt += skb->len;
+ st->l2.l2l1(st, PH_DATA | REQUEST, skb);
}
+#define enqueue_ui(a, b) enqueue_super(a, b)
+
inline int
-IsUI(u_char * data, int ext)
+IsUI(u_char * data)
{
return ((data[0] & 0xef) == UI);
}
inline int
-IsUA(u_char * data, int ext)
+IsUA(u_char * data)
{
return ((data[0] & 0xef) == UA);
}
inline int
-IsDM(u_char * data, int ext)
+IsDM(u_char * data)
{
return ((data[0] & 0xef) == DM);
}
inline int
-IsDISC(u_char * data, int ext)
+IsDISC(u_char * data)
{
return ((data[0] & 0xef) == DISC);
}
inline int
-IsRR(u_char * data, int ext)
+IsRR(u_char * data, struct PStack *st)
{
- if (ext)
+ if (test_bit(FLG_MOD128, &st->l2.flag))
return (data[0] == RR);
else
return ((data[0] & 0xf) == 1);
}
inline int
-IsSABMX(u_char * data, int ext)
+IsSFrame(u_char * data, struct PStack *st)
+{
+ register u_char d = *data;
+
+ if (!test_bit(FLG_MOD128, &st->l2.flag))
+ d &= 0xf;
+ return(((d & 0xf3) == 1) && ((d & 0x0c) != 0x0c));
+}
+
+inline int
+IsSABME(u_char * data, struct PStack *st)
{
u_char d = data[0] & ~0x10;
- return (ext ? d == SABME : d == SABM);
+ return (test_bit(FLG_MOD128, &st->l2.flag) ? d == SABME : d == SABM);
}
inline int
-IsREJ(u_char * data, int ext)
+IsREJ(u_char * data, struct PStack *st)
{
- return (ext ? data[0] == REJ : (data[0] & 0xf) == REJ);
+ return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == REJ : (data[0] & 0xf) == REJ);
}
inline int
-IsFRMR(u_char * data, int ext)
+IsFRMR(u_char * data)
{
return ((data[0] & 0xef) == FRMR);
}
inline int
-IsRNR(u_char * data, int ext)
+IsRNR(u_char * data, struct PStack *st)
{
- return (ext ? data[0] == RNR : (data[0] & 0xf) == RNR);
+ return (test_bit(FLG_MOD128, &st->l2.flag) ? data[0] == RNR : (data[0] & 0xf) == RNR);
}
-static int
-legalnr(struct PStack *st, int nr)
+int
+iframe_error(struct PStack *st, struct sk_buff *skb)
{
- struct Layer2 *l2 = &st->l2;
- int lnr, lvs;
+ int i = l2addrsize(&st->l2) + (test_bit(FLG_MOD128, &st->l2.flag) ? 1 : 0);
+ int rsp = *skb->data & 0x2;
+
+ if (test_bit(FLG_ORIG, &st->l2.flag))
+ rsp = !rsp;
+
+ if (rsp)
+ return 'L';
+
+
+ if (skb->len <= i)
+ return 'N';
+
+ if ((skb->len - i) > st->l2.maxlen)
+ return 'O';
+
+
+ return 0;
+}
+
+int
+super_error(struct PStack *st, struct sk_buff *skb)
+{
+ if (skb->len != l2addrsize(&st->l2) +
+ (test_bit(FLG_MOD128, &st->l2.flag) ? 2 : 1))
+ return 'N';
+
+ return 0;
+}
+
+int
+unnum_error(struct PStack *st, struct sk_buff *skb, int wantrsp)
+{
+ int rsp = (*skb->data & 0x2) >> 1;
+ if (test_bit(FLG_ORIG, &st->l2.flag))
+ rsp = !rsp;
+
+ if (rsp != wantrsp)
+ return 'L';
+
+ if (skb->len != l2addrsize(&st->l2) + 1)
+ return 'N';
+
+ return 0;
+}
+
+int
+UI_error(struct PStack *st, struct sk_buff *skb)
+{
+ int rsp = *skb->data & 0x2;
+ if (test_bit(FLG_ORIG, &st->l2.flag))
+ rsp = !rsp;
+
+ if (rsp)
+ return 'L';
+
+ if (skb->len > st->l2.maxlen + l2addrsize(&st->l2) + 1)
+ return 'O';
- lvs = (l2->vs >= l2->va) ? l2->vs :
- (l2->vs + (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8));
- lnr = (nr >= l2->va) ? nr : (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8);
- return (lnr <= lvs);
+ return 0;
+}
+
+int
+FRMR_error(struct PStack *st, struct sk_buff *skb)
+{
+ int headers = l2addrsize(&st->l2) + 1;
+ u_char *datap = skb->data + headers;
+ int rsp = *skb->data & 0x2;
+
+ if (test_bit(FLG_ORIG, &st->l2.flag))
+ rsp = !rsp;
+
+ if (!rsp)
+ return 'L';
+
+ if (test_bit(FLG_MOD128, &st->l2.flag)) {
+ if (skb->len < headers + 5)
+ return 'N';
+ else
+ l2m_debug(&st->l2.l2m, "FRMR information %2x %2x %2x %2x %2x",
+ datap[0], datap[1], datap[2],
+ datap[3], datap[4]);
+ } else {
+ if (skb->len < headers + 3)
+ return 'N';
+ else
+ l2m_debug(&st->l2.l2m, "FRMR information %2x %2x %2x",
+ datap[0], datap[1], datap[2]);
+ }
+
+ return 0;
+}
+
+static unsigned int
+legalnr(struct PStack *st, unsigned int nr)
+{
+ struct Layer2 *l2 = &st->l2;
+
+ if(test_bit(FLG_MOD128, &l2->flag))
+ return ((nr - l2->va) % 128) <= ((l2->vs - l2->va) % 128);
+ else
+ return ((nr - l2->va) % 8) <= ((l2->vs - l2->va) % 8);
}
static void
-setva(struct PStack *st, int nr)
+setva(struct PStack *st, unsigned int nr)
{
struct Layer2 *l2 = &st->l2;
int len;
while (l2->va != nr) {
- l2->va = (l2->va + 1) % (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8);
+ (l2->va)++;
+ if(test_bit(FLG_MOD128, &l2->flag))
+ l2->va %= 128;
+ else
+ l2->va %= 8;
len = l2->windowar[l2->sow]->len;
if (PACKET_NOACK == l2->windowar[l2->sow]->pkt_type)
len = -1;
- dev_kfree_skb(l2->windowar[l2->sow]);
+ idev_kfree_skb(l2->windowar[l2->sow], FREE_WRITE);
l2->windowar[l2->sow] = NULL;
l2->sow = (l2->sow + 1) % l2->window;
if (st->lli.l2writewakeup && (len >=0))
@@ -341,6 +479,7 @@
printk(KERN_WARNING "isdl2 can't alloc sbbuff for send_uframe\n");
return;
}
+ SET_SKB_FREE(skb);
memcpy(skb_put(skb, i), tmp, i);
enqueue_super(st, skb);
}
@@ -354,7 +493,7 @@
inline void
FreeSkb(struct sk_buff *skb)
{
- dev_kfree_skb(skb);
+ idev_kfree_skb(skb, FREE_READ);
}
@@ -368,6 +507,48 @@
return (PF);
}
+inline void
+start_t200(struct PStack *st, int i)
+{
+ FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, i);
+ test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+}
+
+inline void
+restart_t200(struct PStack *st, int i)
+{
+ FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, i);
+ test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+}
+
+inline void
+stop_t200(struct PStack *st, int i)
+{
+ if(test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
+ FsmDelTimer(&st->l2.t200, i);
+}
+
+inline void
+st5_dl_release_l2l3(struct PStack *st)
+{
+ int pr;
+
+ if(test_and_clear_bit(FLG_PEND_REL, &st->l2.flag))
+ pr = DL_RELEASE | CONFIRM;
+ else
+ pr = DL_RELEASE | INDICATION;
+
+ st->l2.l2l3(st, pr, NULL);
+}
+
+inline void
+lapb_dl_release_l2l3(struct PStack *st, int f)
+{
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+ st->l2.l2l3(st, DL_RELEASE | f, NULL);
+}
+
static void
establishlink(struct FsmInst *fi)
{
@@ -379,49 +560,91 @@
cmd = (test_bit(FLG_MOD128, &st->l2.flag) ? SABME : SABM) | 0x10;
send_uframe(st, cmd, CMD);
FsmDelTimer(&st->l2.t203, 1);
- FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 1);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+ restart_t200(st, 1);
+ test_and_clear_bit(FLG_PEND_REL, &st->l2.flag);
+ freewin(st);
FsmChangeState(fi, ST_L2_5);
}
static void
-l2_mdl_error(struct FsmInst *fi, int event, void *arg)
+l2_mdl_error_ua(struct FsmInst *fi, int event, void *arg)
{
struct sk_buff *skb = arg;
struct PStack *st = fi->userdata;
- switch (event) {
- case EV_L2_UA:
- if (get_PollFlagFree(st, skb))
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'C');
- else
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'D');
- break;
- case EV_L2_DM:
- if (get_PollFlagFree(st, skb))
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'B');
- else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'E');
- establishlink(fi);
- test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
- }
- break;
+ if (get_PollFlagFree(st, skb))
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'C');
+ else
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'D');
+}
+
+static void
+l2_mdl_error_dm(struct FsmInst *fi, int event, void *arg)
+{
+ struct sk_buff *skb = arg;
+ struct PStack *st = fi->userdata;
+
+ if (get_PollFlagFree(st, skb))
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'B');
+ else {
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'E');
+ establishlink(fi);
+ test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
}
}
static void
-l2_dl_establish(struct FsmInst *fi, int event, void *arg)
+l2_st8_mdl_error_dm(struct FsmInst *fi, int event, void *arg)
{
+ struct sk_buff *skb = arg;
struct PStack *st = fi->userdata;
- int state = fi->state;
+ if (get_PollFlagFree(st, skb))
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'B');
+ else {
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'E');
+ }
+ establishlink(fi);
+ test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
+}
+
+static void
+l2_go_st3(struct FsmInst *fi, int event, void *arg)
+{
FsmChangeState(fi, ST_L2_3);
- if (state == ST_L2_1)
- st->l2.l2tei(st, MDL_ASSIGN_IND, NULL);
}
static void
-l2_send_ui(struct PStack *st)
+l2_mdl_assign(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ FsmChangeState(fi, ST_L2_3);
+ st->l2.l2tei(st, MDL_ASSIGN | INDICATION, NULL);
+}
+
+static void
+l2_queue_ui_assign(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ skb_queue_tail(&st->l2.ui_queue, skb);
+ FsmChangeState(fi, ST_L2_2);
+ st->l2.l2tei(st, MDL_ASSIGN | INDICATION, NULL);
+}
+
+static void
+l2_queue_ui(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ skb_queue_tail(&st->l2.ui_queue, skb);
+}
+
+static void
+tx_ui(struct PStack *st)
{
struct sk_buff *skb;
u_char header[MAX_HEADER_LEN];
@@ -436,18 +659,13 @@
}
static void
-l2_put_ui(struct FsmInst *fi, int event, void *arg)
+l2_send_ui(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
skb_queue_tail(&st->l2.ui_queue, skb);
- if (fi->state == ST_L2_1) {
- FsmChangeState(fi, ST_L2_2);
- st->l2.l2tei(st, MDL_ASSIGN_IND, NULL);
- }
- if (fi->state > ST_L2_3)
- l2_send_ui(st);
+ tx_ui(st);
}
static void
@@ -457,11 +675,12 @@
struct sk_buff *skb = arg;
skb_pull(skb, l2headersize(&st->l2, 1));
- if (skb->len > st->l2.maxlen) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'O');
- FreeSkb(skb);
- } else
- st->l2.l2l3(st, DL_UNIT_DATA, skb);
+ st->l2.l2l3(st, DL_UNIT_DATA | INDICATION, skb);
+/* ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * in states 1-3 for broadcast
+ */
+
+
}
static void
@@ -469,245 +688,243 @@
{
struct PStack *st = fi->userdata;
- if (fi->state != ST_L2_4)
- discard_i_queue(st);
- if (fi->state != ST_L2_5)
- establishlink(fi);
+ establishlink(fi);
test_and_set_bit(FLG_L3_INIT, &st->l2.flag);
}
static void
-l2_dl_release(struct FsmInst *fi, int event, void *arg)
+l2_discard_i_setl3(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
- if (fi->state == ST_L2_4) {
- st->l2.l2man(st, DL_RELEASE, NULL);
- return;
- } else if (fi->state == ST_L2_5) {
- test_and_set_bit(FLG_PEND_REL, &st->l2.flag);
- return;
- }
- discard_i_queue(st);
+ discard_queue(&st->l2.i_queue);
+ test_and_set_bit(FLG_L3_INIT, &st->l2.flag);
+ test_and_clear_bit(FLG_PEND_REL, &st->l2.flag);
+}
+
+static void
+l2_l3_reestablish(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.i_queue);
+ establishlink(fi);
+ test_and_set_bit(FLG_L3_INIT, &st->l2.flag);
+}
+
+static void
+l2_release(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL);
+}
+
+static void
+l2_pend_rel(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ test_and_set_bit(FLG_PEND_REL, &st->l2.flag);
+}
+
+static void
+l2_disconnect(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.i_queue);
+ freewin(st);
FsmChangeState(fi, ST_L2_6);
st->l2.rc = 0;
send_uframe(st, DISC | 0x10, CMD);
FsmDelTimer(&st->l2.t203, 1);
- FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 2);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+ restart_t200(st, 2);
}
static void
-l2_got_SABMX(struct FsmInst *fi, int event, void *arg)
+l2_start_multi(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- int est = 1, state, rsp;
- u_char PollFlag;
+
+ send_uframe(st, UA | get_PollFlagFree(st, skb), RSP);
+
+ clear_exception(&st->l2);
+ st->l2.vs = 0;
+ st->l2.va = 0;
+ st->l2.vr = 0;
+ st->l2.sow = 0;
+ FsmChangeState(fi, ST_L2_7);
+ FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 3);
+
+ st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL);
+}
+
+static void
+l2_send_UA(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ send_uframe(st, UA | get_PollFlagFree(st, skb), RSP);
+}
+
+static void
+l2_send_DM(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ send_uframe(st, DM | get_PollFlagFree(st, skb), RSP);
+}
+
+static void
+l2_restart_multi(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+ int est = 0, state;
state = fi->state;
- rsp = *skb->data & 0x2;
- if (test_bit(FLG_ORIG, &st->l2.flag))
- rsp = !rsp;
- if (rsp) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
- return;
- }
- if (skb->len != (l2addrsize(&st->l2) + 1)) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
- return;
- }
- PollFlag = get_PollFlagFree(st, skb);
- if (ST_L2_6 == state) {
- send_uframe(st, DM | PollFlag, RSP);
- return;
- } else
- send_uframe(st, UA | PollFlag, RSP);
- if (ST_L2_5 == state)
- return;
- if (ST_L2_4 != state) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'F');
- if (st->l2.vs != st->l2.va) {
- discard_i_queue(st);
- est = 1;
- } else
- est = 0;
+
+ send_uframe(st, UA | get_PollFlagFree(st, skb), RSP);
+
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'F');
+
+ if (st->l2.vs != st->l2.va) {
+ discard_queue(&st->l2.i_queue);
+ est = 1;
}
+
clear_exception(&st->l2);
st->l2.vs = 0;
st->l2.va = 0;
st->l2.vr = 0;
st->l2.sow = 0;
FsmChangeState(fi, ST_L2_7);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 2);
- FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 3);
+ stop_t200(st, 3);
+ FsmRestartTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 3);
if (est)
- st->l2.l2man(st, DL_ESTABLISH, NULL);
+ st->l2.l2l3(st, DL_ESTABLISH | INDICATION, NULL);
- if (ST_L2_8 == state)
+ if ((ST_L2_7==state) || (ST_L2_8 == state))
if (skb_queue_len(&st->l2.i_queue) && cansend(st))
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
}
static void
-l2_got_disconn(struct FsmInst *fi, int event, void *arg)
+l2_stop_multi(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- u_char PollFlag, cmd = UA;
- int state, rel = 1, cst = 1, rsp;
- state = fi->state;
- rsp = *skb->data & 0x2;
- if (test_bit(FLG_ORIG, &st->l2.flag))
- rsp = !rsp;
+ FsmChangeState(fi, ST_L2_4);
+ FsmDelTimer(&st->l2.t203, 3);
+ stop_t200(st, 4);
- if (rsp) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
+ send_uframe(st, UA | get_PollFlagFree(st, skb), RSP);
+
+ discard_queue(&st->l2.i_queue);
+ freewin(st);
+ lapb_dl_release_l2l3(st, INDICATION);
+}
+
+static void
+l2_connected(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+ int pr=-1;
+
+ if (!get_PollFlag(st, skb)) {
+ l2_mdl_error_ua(fi, event, arg);
return;
- }
- if (skb->len != (l2addrsize(&st->l2) + 1)) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
+ }
+ FreeSkb(skb);
+
+ if (test_and_clear_bit(FLG_PEND_REL, &st->l2.flag))
+ l2_disconnect(fi, event, arg);
+
+ if (test_and_clear_bit(FLG_L3_INIT, &st->l2.flag)) {
+ pr = DL_ESTABLISH | CONFIRM;
+ } else if (st->l2.vs != st->l2.va) {
+ discard_queue(&st->l2.i_queue);
+ pr = DL_ESTABLISH | INDICATION;
+ }
+
+ stop_t200(st, 5);
+
+ st->l2.vr = 0;
+ st->l2.vs = 0;
+ st->l2.va = 0;
+ st->l2.sow = 0;
+ FsmChangeState(fi, ST_L2_7);
+ FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 4);
+
+ if (pr != -1)
+ st->l2.l2l3(st, pr, NULL);
+
+ if (skb_queue_len(&st->l2.i_queue) && cansend(st))
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
+}
+
+static void
+l2_released(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ if (!get_PollFlag(st, skb)) {
+ l2_mdl_error_ua(fi, event, arg);
return;
}
- PollFlag = get_PollFlagFree(st, skb);
- if ((state == ST_L2_4) || (state == ST_L2_5)) {
- rel = 0;
- cst = 0;
- cmd = DM;
- } else if (state == ST_L2_6) {
- rel = 0;
- cst = 0;
- }
- if (cst) {
- FsmChangeState(fi, ST_L2_4);
- FsmDelTimer(&st->l2.t203, 3);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 2);
- }
- send_uframe(st, cmd | PollFlag, RSP);
- if (rel)
- st->l2.l2man(st, DL_RELEASE, NULL);
-}
+ FreeSkb(skb);
+ stop_t200(st, 6);
+ lapb_dl_release_l2l3(st, CONFIRM);
+ FsmChangeState(fi, ST_L2_4);
+}
static void
-l2_got_ua(struct FsmInst *fi, int event, void *arg)
+l2_reestablish(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- u_char PollFlag, est = 1;
- int state,rsp;
- state = fi->state;
- rsp = *skb->data & 0x2;
- if (test_bit(FLG_ORIG, &st->l2.flag))
- rsp = !rsp;
-
- if (!rsp) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
- return;
- }
- if (skb->len != (l2addrsize(&st->l2) + 1)) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- if ((fi->state == ST_L2_7) || (fi->state == ST_L2_8))
- establishlink(fi);
- return;
- }
- PollFlag = get_PollFlag(st, skb);
- if (!PollFlag) {
- l2_mdl_error(fi, event, arg);
- return;
+ if (!get_PollFlagFree(st, skb)) {
+ establishlink(fi);
+ test_and_set_bit(FLG_L3_INIT, &st->l2.flag);
}
- FreeSkb(skb);
+}
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 2);
- if (fi->state == ST_L2_5) {
- if (test_and_clear_bit(FLG_PEND_REL, &st->l2.flag)) {
- discard_i_queue(st);
- st->l2.rc = 0;
- send_uframe(st, DISC | 0x10, CMD);
- FsmChangeState(fi, ST_L2_6);
- FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 4);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
- } else {
- if (!test_and_clear_bit(FLG_L3_INIT, &st->l2.flag)) {
- if (st->l2.vs != st->l2.va)
- discard_i_queue(st);
- else
- est = 0;
- }
- st->l2.vs = 0;
- st->l2.va = 0;
- st->l2.vr = 0;
- st->l2.sow = 0;
- FsmChangeState(fi, ST_L2_7);
- FsmAddTimer(&st->l2.t203, st->l2.T203, EV_L2_T203, NULL, 4);
- if (est)
- st->l2.l2man(st, DL_ESTABLISH, NULL);
- }
- } else { /* ST_L2_6 */
- st->l2.l2man(st, DL_RELEASE, NULL);
+static void
+l2_st5_dm_release(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ if (get_PollFlagFree(st, skb)) {
+ stop_t200(st, 7);
+ if (!test_bit(FLG_L3_INIT, &st->l2.flag))
+ discard_queue(&st->l2.i_queue);
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+ st5_dl_release_l2l3(st);
FsmChangeState(fi, ST_L2_4);
}
}
static void
-l2_got_dm(struct FsmInst *fi, int event, void *arg)
+l2_st6_dm_release(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- u_char PollFlag;
- int state,rsp;
- state = fi->state;
- rsp = *skb->data & 0x2;
- if (test_bit(FLG_ORIG, &st->l2.flag))
- rsp = !rsp;
-
- if (!rsp) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
- FreeSkb(skb);
- if ((state == ST_L2_7) || (state == ST_L2_8))
- establishlink(fi);
- return;
- }
- if (skb->len != (l2addrsize(&st->l2) + 1)) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- if ((fi->state == ST_L2_7) || (fi->state == ST_L2_8))
- establishlink(fi);
- return;
- }
- PollFlag = get_PollFlagFree(st, skb);
- if (!PollFlag) {
- establishlink(fi);
- test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
- } else {
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 2);
- if (fi->state == ST_L2_5 && !test_bit(FLG_L3_INIT, &st->l2.flag))
- discard_i_queue(st);
- st->l2.l2man(st, DL_RELEASE, NULL);
+ if (get_PollFlagFree(st, skb)) {
+ stop_t200(st, 8);
+ lapb_dl_release_l2l3(st, CONFIRM);
FsmChangeState(fi, ST_L2_4);
}
}
@@ -731,6 +948,7 @@
printk(KERN_WARNING "isdl2 can't alloc sbbuff for enquiry_cr\n");
return;
}
+ SET_SKB_FREE(skb);
memcpy(skb_put(skb, i), tmp, i);
enqueue_super(st, skb);
}
@@ -753,8 +971,7 @@
else
enquiry_cr(st, RR, CMD, 1);
test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
- FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 12);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+ start_t200(st, 9);
}
@@ -763,42 +980,44 @@
{
struct PStack *st = fi->userdata;
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'J');
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'J');
establishlink(fi);
+ test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
}
static void
-invoke_retransmission(struct PStack *st, int nr)
+invoke_retransmission(struct PStack *st, unsigned int nr)
{
struct Layer2 *l2 = &st->l2;
- int p1;
- long flags;
+ unsigned int p1;
if (l2->vs != nr) {
- save_flags(flags);
- cli();
while (l2->vs != nr) {
- l2->vs = l2->vs - 1;
- if (l2->vs < 0)
- l2->vs += (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8);
- p1 = l2->vs - l2->va;
- if (p1 < 0)
- p1 += (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8);
+ (l2->vs)--;
+ if(test_bit(FLG_MOD128, &l2->flag)) {
+ l2->vs %= 128;
+ p1 = (l2->vs - l2->va) % 128;
+ } else {
+ l2->vs %= 8;
+ p1 = (l2->vs - l2->va) % 8;
+ }
p1 = (p1 + l2->sow) % l2->window;
+ if (test_bit(FLG_LAPB, &l2->flag))
+ st->l1.bcs->tx_cnt += l2->windowar[p1]->len + l2headersize(l2, 0);
skb_queue_head(&l2->i_queue, l2->windowar[p1]);
l2->windowar[p1] = NULL;
}
- restore_flags(flags);
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
}
}
static void
-l2_got_st7_super(struct FsmInst *fi, int event, void *arg)
+l2_st7_got_super(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- int PollFlag, nr, rsp, typ = RR;
+ int PollFlag, rsp, typ = RR;
+ unsigned int nr;
struct Layer2 *l2 = &st->l2;
rsp = *skb->data & 0x2;
@@ -806,70 +1025,77 @@
rsp = !rsp;
skb_pull(skb, l2addrsize(l2));
- if (IsRNR(skb->data, test_bit(FLG_MOD128, &l2->flag))) {
+ if (IsRNR(skb->data, st)) {
test_and_set_bit(FLG_PEER_BUSY, &l2->flag);
typ = RNR;
} else
test_and_clear_bit(FLG_PEER_BUSY, &l2->flag);
- if (IsREJ(skb->data, test_bit(FLG_MOD128, &l2->flag)))
+ if (IsREJ(skb->data, st))
typ = REJ;
+
if (test_bit(FLG_MOD128, &l2->flag)) {
- if (skb->len == 2) {
- PollFlag = (skb->data[1] & 0x1) == 0x1;
- nr = skb->data[1] >> 1;
- } else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
+ PollFlag = (skb->data[1] & 0x1) == 0x1;
+ nr = skb->data[1] >> 1;
} else {
- if (skb->len == 1) {
- PollFlag = (skb->data[0] & 0x10);
- nr = (skb->data[0] >> 5) & 0x7;
- } else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
+ PollFlag = (skb->data[0] & 0x10);
+ nr = (skb->data[0] >> 5) & 0x7;
}
FreeSkb(skb);
- if ((!rsp) && PollFlag)
- enquiry_response(st);
- if (rsp && PollFlag)
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'A');
+ if (PollFlag) {
+ if (rsp)
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'A');
+ else
+ enquiry_response(st);
+ }
if (legalnr(st, nr)) {
if (typ == REJ) {
setva(st, nr);
invoke_retransmission(st, nr);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 9);
+ stop_t200(st, 10);
if (FsmAddTimer(&st->l2.t203, st->l2.T203,
EV_L2_T203, NULL, 6))
l2m_debug(&st->l2.l2m, "Restart T203 ST7 REJ");
} else if ((nr == l2->vs) && (typ == RR)) {
setva(st, nr);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 9);
+ stop_t200(st, 11);
FsmRestartTimer(&st->l2.t203, st->l2.T203,
EV_L2_T203, NULL, 7);
} else if ((l2->va != nr) || (typ == RNR)) {
setva(st, nr);
- FsmDelTimer(&st->l2.t203, 9);
- FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 6);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
+ if(typ != RR) FsmDelTimer(&st->l2.t203, 9);
+ restart_t200(st, 12);
}
if (skb_queue_len(&st->l2.i_queue) && (typ == RR))
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
} else
nrerrorrecovery(fi);
+}
- if ((fi->userint & LC_FLUSH_WAIT) && rsp && !(skb_queue_len(&st->l2.i_queue))) {
- fi->userint &= ~LC_FLUSH_WAIT;
- st->l2.l2man(st, DL_FLUSH, NULL);
- }
+static void
+l2_feed_i_if_reest(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l1.bcs->tx_cnt += skb->len + l2headersize(&st->l2, 0);
+ if (!test_bit(FLG_L3_INIT, &st->l2.flag))
+ skb_queue_tail(&st->l2.i_queue, skb);
+ else
+ FreeSkb(skb);
+}
+
+static void
+l2_feed_i_pull(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+ struct sk_buff *skb = arg;
+
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l1.bcs->tx_cnt += skb->len + l2headersize(&st->l2, 0);
+ skb_queue_tail(&st->l2.i_queue, skb);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
}
static void
@@ -880,10 +1106,7 @@
if (test_bit(FLG_LAPB, &st->l2.flag))
st->l1.bcs->tx_cnt += skb->len + l2headersize(&st->l2, 0);
- if (!((fi->state == ST_L2_5) && test_bit(FLG_L3_INIT, &st->l2.flag)))
- skb_queue_tail(&st->l2.i_queue, skb);
- if (fi->state == ST_L2_7)
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ skb_queue_tail(&st->l2.i_queue, skb);
}
static void
@@ -891,73 +1114,37 @@
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- struct IsdnCardState *sp = st->l1.hardware;
struct Layer2 *l2 = &(st->l2);
- int PollFlag, ns, nr, i, hs, rsp;
- char str[64];
-
- rsp = *skb->data & 0x2;
- if (test_bit(FLG_ORIG, &l2->flag))
- rsp = !rsp;
+ int PollFlag, ns, i;
+ unsigned int nr;
- if (rsp) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
i = l2addrsize(l2);
if (test_bit(FLG_MOD128, &l2->flag)) {
- if (skb->len <= (i + 1)) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- } else if ((skb->len - i - 1) > l2->maxlen) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'O');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
PollFlag = ((skb->data[i + 1] & 0x1) == 0x1);
ns = skb->data[i] >> 1;
nr = (skb->data[i + 1] >> 1) & 0x7f;
} else {
- if (skb->len <= i) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- } else if ((skb->len - i) > l2->maxlen) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'O');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
PollFlag = (skb->data[i] & 0x10);
ns = (skb->data[i] >> 1) & 0x7;
nr = (skb->data[i] >> 5) & 0x7;
}
if (test_bit(FLG_OWN_BUSY, &l2->flag)) {
FreeSkb(skb);
- enquiry_response(st);
+ if(PollFlag) enquiry_response(st);
} else if (l2->vr == ns) {
- l2->vr = (l2->vr + 1) % (test_bit(FLG_MOD128, &l2->flag) ? 128 : 8);
+ (l2->vr)++;
+ if(test_bit(FLG_MOD128, &l2->flag))
+ l2->vr %= 128;
+ else
+ l2->vr %= 8;
test_and_clear_bit(FLG_REJEXC, &l2->flag);
- if (test_bit(FLG_LAPD, &l2->flag))
- if (sp->dlogflag) {
- hs = l2headersize(l2, 0);
- LogFrame(st->l1.hardware, skb->data, skb->len);
- sprintf(str, "Q.931 frame network->user tei %d", st->l2.tei);
- dlogframe(st->l1.hardware, skb->data + hs,
- skb->len - hs, str);
- }
+
if (PollFlag)
enquiry_response(st);
else
test_and_set_bit(FLG_ACK_PEND, &l2->flag);
skb_pull(skb, l2headersize(l2, 0));
- st->l2.l2l3(st, DL_DATA, skb);
+ st->l2.l2l3(st, DL_DATA | INDICATION, skb);
} else {
/* n(s)!=v(r) */
FreeSkb(skb);
@@ -971,26 +1158,22 @@
}
if (legalnr(st, nr)) {
- setva(st, nr);
if (!test_bit(FLG_PEER_BUSY, &st->l2.flag) && (fi->state == ST_L2_7)) {
if (nr == st->l2.vs) {
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 10);
+ stop_t200(st, 13);
FsmRestartTimer(&st->l2.t203, st->l2.T203,
EV_L2_T203, NULL, 7);
- } else if (nr != st->l2.va) {
- FsmRestartTimer(&st->l2.t200, st->l2.T200, EV_L2_T200,
- NULL, 8);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
- }
+ } else if (nr != st->l2.va)
+ restart_t200(st, 14);
}
+ setva(st, nr);
} else {
nrerrorrecovery(fi);
return;
}
if (skb_queue_len(&st->l2.i_queue) && (fi->state == ST_L2_7))
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
if (test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag))
enquiry_cr(st, RR, RSP, 0);
}
@@ -1000,7 +1183,7 @@
{
struct PStack *st = fi->userdata;
- st->l2.tei = (int) arg;
+ st->l2.tei = (long) arg;
if (fi->state == ST_L2_3) {
establishlink(fi);
@@ -1008,13 +1191,7 @@
} else
FsmChangeState(fi, ST_L2_4);
if (skb_queue_len(&st->l2.ui_queue))
- l2_send_ui(st);
-}
-
-static void
-l2_no_tei(struct FsmInst *fi, int event, void *arg)
-{
- FsmChangeState(fi, ST_L2_4);
+ tx_ui(st);
}
static void
@@ -1028,9 +1205,11 @@
} else if (st->l2.rc == st->l2.N200) {
FsmChangeState(fi, ST_L2_4);
test_and_clear_bit(FLG_T200_RUN, &st->l2.flag);
- discard_i_queue(st);
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'G');
- st->l2.l2man(st, DL_RELEASE, NULL);
+ discard_queue(&st->l2.i_queue);
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'G');
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+ st5_dl_release_l2l3(st);
} else {
st->l2.rc++;
FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
@@ -1049,8 +1228,9 @@
FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
} else if (st->l2.rc == st->l2.N200) {
FsmChangeState(fi, ST_L2_4);
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'H');
- st->l2.l2man(st, DL_RELEASE, NULL);
+ test_and_clear_bit(FLG_T200_RUN, &st->l2.flag);
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'H');
+ lapb_dl_release_l2l3(st, CONFIRM);
} else {
st->l2.rc++;
FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200,
@@ -1060,7 +1240,7 @@
}
static void
-l2_st78_tout_200(struct FsmInst *fi, int event, void *arg)
+l2_st7_tout_200(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
@@ -1070,12 +1250,28 @@
return;
}
test_and_clear_bit(FLG_T200_RUN, &st->l2.flag);
- if (fi->state == ST_L2_7) {
- st->l2.rc = 0;
- FsmChangeState(fi, ST_L2_8);
+ st->l2.rc = 0;
+ FsmChangeState(fi, ST_L2_8);
+
+ transmit_enquiry(st);
+ st->l2.rc++;
+}
+
+static void
+l2_st8_tout_200(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ if (test_bit(FLG_LAPD, &st->l2.flag) &&
+ test_bit(FLG_DCHAN_BUSY, &st->l2.flag)) {
+ FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 9);
+ return;
}
+ test_and_clear_bit(FLG_T200_RUN, &st->l2.flag);
if (st->l2.rc == st->l2.N200) {
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'I');
establishlink(fi);
+ test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
} else {
transmit_enquiry(st);
st->l2.rc++;
@@ -1104,7 +1300,9 @@
struct sk_buff *skb, *oskb;
struct Layer2 *l2 = &st->l2;
u_char header[MAX_HEADER_LEN];
- int p1, i;
+ int i;
+ int unsigned p1;
+ long flags;
if (!cansend(st))
return;
@@ -1113,14 +1311,17 @@
if (!skb)
return;
- p1 = l2->vs - l2->va;
- if (p1 < 0)
- p1 += test_bit(FLG_MOD128, &l2->flag) ? 128 : 8;
+ save_flags(flags);
+ cli();
+ if(test_bit(FLG_MOD128, &l2->flag))
+ p1 = (l2->vs - l2->va) % 128;
+ else
+ p1 = (l2->vs - l2->va) % 8;
p1 = (p1 + l2->sow) % l2->window;
if (l2->windowar[p1]) {
printk(KERN_WARNING "isdnl2 try overwrite ack queue entry %d\n",
p1);
- dev_kfree_skb(l2->windowar[p1]);
+ idev_kfree_skb(l2->windowar[p1], FREE_WRITE);
}
l2->windowar[p1] = skb_clone(skb, GFP_ATOMIC);
@@ -1134,6 +1335,8 @@
header[i++] = (l2->vr << 5) | (l2->vs << 1);
l2->vs = (l2->vs + 1) % 8;
}
+ restore_flags(flags);
+
p1 = skb->data - skb->head;
if (p1 >= i)
memcpy(skb_push(skb, i), header, i);
@@ -1142,89 +1345,74 @@
"isdl2 pull_iqueue skb header(%d/%d) too short\n", i, p1);
oskb = skb;
skb = alloc_skb(oskb->len + i, GFP_ATOMIC);
+ SET_SKB_FREE(skb);
memcpy(skb_put(skb, i), header, i);
memcpy(skb_put(skb, oskb->len), oskb->data, oskb->len);
FreeSkb(oskb);
}
- st->l2.l2l1(st, PH_PULL_IND, skb);
+ st->l2.l2l1(st, PH_PULL | INDICATION, skb);
test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
if (!test_and_set_bit(FLG_T200_RUN, &st->l2.flag)) {
FsmDelTimer(&st->l2.t203, 13);
FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 11);
}
if (skb_queue_len(&l2->i_queue) && cansend(st))
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
}
static void
-l2_got_st8_super(struct FsmInst *fi, int event, void *arg)
+l2_st8_got_super(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- int PollFlag, nr, rsp, rnr = 0;
+ int PollFlag, rsp, rnr = 0;
+ unsigned int nr;
struct Layer2 *l2 = &st->l2;
rsp = *skb->data & 0x2;
if (test_bit(FLG_ORIG, &l2->flag))
rsp = !rsp;
+
skb_pull(skb, l2addrsize(l2));
- if (IsRNR(skb->data, test_bit(FLG_MOD128, &l2->flag))) {
+ if (IsRNR(skb->data, st)) {
test_and_set_bit(FLG_PEER_BUSY, &l2->flag);
rnr = 1;
} else
test_and_clear_bit(FLG_PEER_BUSY, &l2->flag);
+
if (test_bit(FLG_MOD128, &l2->flag)) {
- if (skb->len == 2) {
- PollFlag = (skb->data[1] & 0x1) == 0x1;
- nr = skb->data[1] >> 1;
- } else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
+ PollFlag = (skb->data[1] & 0x1) == 0x1;
+ nr = skb->data[1] >> 1;
} else {
- if (skb->len == 1) {
- PollFlag = (skb->data[0] & 0x10);
- nr = (skb->data[0] >> 5) & 0x7;
- } else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- FreeSkb(skb);
- establishlink(fi);
- return;
- }
+ PollFlag = (skb->data[0] & 0x10);
+ nr = (skb->data[0] >> 5) & 0x7;
}
FreeSkb(skb);
if (rsp && PollFlag) {
if (legalnr(st, nr)) {
- setva(st, nr);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 7);
- FsmDelTimer(&l2->t203, 8);
if (rnr) {
- FsmRestartTimer(&l2->t200, l2->T200,
- EV_L2_T200, NULL, 14);
- test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
- } else
+ restart_t200(st, 15);
+ } else {
+ stop_t200(st, 16);
FsmAddTimer(&l2->t203, l2->T203,
EV_L2_T203, NULL, 5);
+ setva(st, nr);
+ }
invoke_retransmission(st, nr);
FsmChangeState(fi, ST_L2_7);
if (skb_queue_len(&l2->i_queue) && cansend(st))
- st->l2.l2l1(st, PH_PULL_REQ, NULL);
- else if (fi->userint & LC_FLUSH_WAIT) {
- fi->userint &= ~LC_FLUSH_WAIT;
- st->l2.l2man(st, DL_FLUSH, NULL);
- }
- }
+ st->l2.l2l1(st, PH_PULL | REQUEST, NULL);
+ } else
+ nrerrorrecovery(fi);
} else {
if (!rsp && PollFlag)
enquiry_response(st);
if (legalnr(st, nr)) {
setva(st, nr);
- }
+ } else
+ nrerrorrecovery(fi);
}
}
@@ -1233,30 +1421,12 @@
{
struct PStack *st = fi->userdata;
struct sk_buff *skb = arg;
- char tmp[64];
skb_pull(skb, l2addrsize(&st->l2) + 1);
- if (test_bit(FLG_MOD128, &st->l2.flag)) {
- if (skb->len < 5)
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- else {
- sprintf(tmp, "FRMR information %2x %2x %2x %2x %2x",
- skb->data[0], skb->data[1], skb->data[2],
- skb->data[3], skb->data[4]);
- l2m_debug(&st->l2.l2m, tmp);
- }
- } else {
- if (skb->len < 3)
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
- else {
- sprintf(tmp, "FRMR information %2x %2x %2x",
- skb->data[0], skb->data[1], skb->data[2]);
- l2m_debug(&st->l2.l2m, tmp);
- }
- }
+
if (!(skb->data[0] & 1) || ((skb->data[0] & 3) == 1) || /* I or S */
- (IsUA(skb->data, 0) && (fi->state == ST_L2_7))) {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'K');
+ (IsUA(skb->data) && (fi->state == ST_L2_7))) {
+ st->ma.layer(st, MDL_ERROR | INDICATION, (void *) 'K');
establishlink(fi);
test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
}
@@ -1264,103 +1434,206 @@
}
static void
+l2_st24_tei_remove(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.ui_queue);
+ st->l2.tei = -1;
+ FsmChangeState(fi, ST_L2_1);
+}
+
+static void
+l2_st3_tei_remove(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.ui_queue);
+ st->l2.tei = -1;
+ st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL);
+ FsmChangeState(fi, ST_L2_1);
+}
+
+static void
+l2_st5_tei_remove(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.i_queue);
+ discard_queue(&st->l2.ui_queue);
+ freewin(st);
+ st->l2.tei = -1;
+ stop_t200(st, 17);
+ st5_dl_release_l2l3(st);
+ FsmChangeState(fi, ST_L2_1);
+}
+
+static void
+l2_st6_tei_remove(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.ui_queue);
+ st->l2.tei = -1;
+ stop_t200(st, 18);
+ st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL);
+ FsmChangeState(fi, ST_L2_1);
+}
+
+static void
l2_tei_remove(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
- discard_i_queue(st);
- discard_ui_queue(st);
+ discard_queue(&st->l2.i_queue);
+ discard_queue(&st->l2.ui_queue);
+ freewin(st);
st->l2.tei = -1;
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 18);
+ stop_t200(st, 17);
FsmDelTimer(&st->l2.t203, 19);
- if (fi->state != ST_L2_4)
- st->l2.l2man(st, DL_RELEASE, NULL);
+ st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL);
FsmChangeState(fi, ST_L2_1);
}
static void
-l2_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_discard_i(struct FsmInst *fi, int event, void *arg)
{
struct PStack *st = fi->userdata;
- discard_i_queue(st);
- discard_ui_queue(st);
- if (test_and_clear_bit(FLG_T200_RUN, &st->l2.flag))
- FsmDelTimer(&st->l2.t200, 18);
+ discard_queue(&st->l2.i_queue);
+}
+
+static void
+l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.i_queue);
+ discard_queue(&st->l2.ui_queue);
+ freewin(st);
+ stop_t200(st, 19);
+ st5_dl_release_l2l3(st);
+ FsmChangeState(fi, ST_L2_4);
+}
+
+static void
+l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.ui_queue);
+ stop_t200(st, 20);
+ st->l2.l2l3(st, DL_RELEASE | CONFIRM, NULL);
+ FsmChangeState(fi, ST_L2_4);
+}
+
+static void
+l2_persistant_da(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ discard_queue(&st->l2.i_queue);
+ discard_queue(&st->l2.ui_queue);
+ freewin(st);
+ stop_t200(st, 19);
FsmDelTimer(&st->l2.t203, 19);
- test_and_clear_bit(FLG_PEND_REL, &st->l2.flag);
- clear_exception(&st->l2);
- switch (fi->state) {
- case ST_L2_3:
- st->l2.l2man(st, DL_RELEASE, NULL);
- case ST_L2_2:
- FsmChangeState(fi, ST_L2_1);
- break;
- case ST_L2_5:
- case ST_L2_6:
- case ST_L2_7:
- case ST_L2_8:
- st->l2.l2man(st, DL_RELEASE, NULL);
- FsmChangeState(fi, ST_L2_4);
- break;
+ st->l2.l2l3(st, DL_RELEASE | INDICATION, NULL);
+ FsmChangeState(fi, ST_L2_4);
+}
+
+static void
+l2_set_own_busy(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ if(!test_and_set_bit(FLG_OWN_BUSY, &st->l2.flag)) {
+ enquiry_cr(st, RNR, RSP, 0);
+ test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
+ }
+}
+
+static void
+l2_clear_own_busy(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ if(!test_and_clear_bit(FLG_OWN_BUSY, &st->l2.flag)) {
+ enquiry_cr(st, RR, RSP, 0);
+ test_and_clear_bit(FLG_ACK_PEND, &st->l2.flag);
}
}
+static void
+l2_frame_error(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ st->ma.layer(st, MDL_ERROR | INDICATION, arg);
+}
+
+static void
+l2_frame_error_reest(struct FsmInst *fi, int event, void *arg)
+{
+ struct PStack *st = fi->userdata;
+
+ st->ma.layer(st, MDL_ERROR | INDICATION, arg);
+ establishlink(fi);
+ test_and_clear_bit(FLG_L3_INIT, &st->l2.flag);
+}
+
static struct FsmNode L2FnList[] HISAX_INITDATA =
{
- {ST_L2_1, EV_L2_MDL_NOTEIPROC, l2_no_tei},
- {ST_L2_1, EV_L2_DL_ESTABLISH, l2_dl_establish},
- {ST_L2_2, EV_L2_DL_ESTABLISH, l2_dl_establish},
- {ST_L2_4, EV_L2_DL_ESTABLISH, l2_establish},
- {ST_L2_5, EV_L2_DL_ESTABLISH, l2_establish},
- {ST_L2_7, EV_L2_DL_ESTABLISH, l2_establish},
- {ST_L2_8, EV_L2_DL_ESTABLISH, l2_establish},
- {ST_L2_4, EV_L2_DL_RELEASE, l2_dl_release},
- {ST_L2_5, EV_L2_DL_RELEASE, l2_dl_release},
- {ST_L2_7, EV_L2_DL_RELEASE, l2_dl_release},
- {ST_L2_8, EV_L2_DL_RELEASE, l2_dl_release},
- {ST_L2_5, EV_L2_DL_DATA, l2_feed_iqueue},
- {ST_L2_7, EV_L2_DL_DATA, l2_feed_iqueue},
+ {ST_L2_1, EV_L2_DL_ESTABLISH_REQ, l2_mdl_assign},
+ {ST_L2_2, EV_L2_DL_ESTABLISH_REQ, l2_go_st3},
+ {ST_L2_4, EV_L2_DL_ESTABLISH_REQ, l2_establish},
+ {ST_L2_5, EV_L2_DL_ESTABLISH_REQ, l2_discard_i_setl3},
+ {ST_L2_7, EV_L2_DL_ESTABLISH_REQ, l2_l3_reestablish},
+ {ST_L2_8, EV_L2_DL_ESTABLISH_REQ, l2_l3_reestablish},
+ {ST_L2_4, EV_L2_DL_RELEASE_REQ, l2_release},
+ {ST_L2_5, EV_L2_DL_RELEASE_REQ, l2_pend_rel},
+ {ST_L2_7, EV_L2_DL_RELEASE_REQ, l2_disconnect},
+ {ST_L2_8, EV_L2_DL_RELEASE_REQ, l2_disconnect},
+ {ST_L2_5, EV_L2_DL_DATA, l2_feed_i_if_reest},
+ {ST_L2_7, EV_L2_DL_DATA, l2_feed_i_pull},
{ST_L2_8, EV_L2_DL_DATA, l2_feed_iqueue},
- {ST_L2_1, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_2, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_3, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_4, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_5, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_6, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_7, EV_L2_DL_UNIT_DATA, l2_put_ui},
- {ST_L2_8, EV_L2_DL_UNIT_DATA, l2_put_ui},
+ {ST_L2_1, EV_L2_DL_UNIT_DATA, l2_queue_ui_assign},
+ {ST_L2_2, EV_L2_DL_UNIT_DATA, l2_queue_ui},
+ {ST_L2_3, EV_L2_DL_UNIT_DATA, l2_queue_ui},
+ {ST_L2_4, EV_L2_DL_UNIT_DATA, l2_send_ui},
+ {ST_L2_5, EV_L2_DL_UNIT_DATA, l2_send_ui},
+ {ST_L2_6, EV_L2_DL_UNIT_DATA, l2_send_ui},
+ {ST_L2_7, EV_L2_DL_UNIT_DATA, l2_send_ui},
+ {ST_L2_8, EV_L2_DL_UNIT_DATA, l2_send_ui},
{ST_L2_1, EV_L2_MDL_ASSIGN, l2_got_tei},
{ST_L2_2, EV_L2_MDL_ASSIGN, l2_got_tei},
{ST_L2_3, EV_L2_MDL_ASSIGN, l2_got_tei},
- {ST_L2_2, EV_L2_MDL_ERROR, l2_tei_remove},
- {ST_L2_3, EV_L2_MDL_ERROR, l2_tei_remove},
- {ST_L2_4, EV_L2_MDL_REMOVE, l2_tei_remove},
- {ST_L2_5, EV_L2_MDL_REMOVE, l2_tei_remove},
- {ST_L2_6, EV_L2_MDL_REMOVE, l2_tei_remove},
+ {ST_L2_2, EV_L2_MDL_ERROR, l2_st24_tei_remove},
+ {ST_L2_3, EV_L2_MDL_ERROR, l2_st3_tei_remove},
+ {ST_L2_4, EV_L2_MDL_REMOVE, l2_st24_tei_remove},
+ {ST_L2_5, EV_L2_MDL_REMOVE, l2_st5_tei_remove},
+ {ST_L2_6, EV_L2_MDL_REMOVE, l2_st6_tei_remove},
{ST_L2_7, EV_L2_MDL_REMOVE, l2_tei_remove},
{ST_L2_8, EV_L2_MDL_REMOVE, l2_tei_remove},
- {ST_L2_4, EV_L2_SABMX, l2_got_SABMX},
- {ST_L2_5, EV_L2_SABMX, l2_got_SABMX},
- {ST_L2_6, EV_L2_SABMX, l2_got_SABMX},
- {ST_L2_7, EV_L2_SABMX, l2_got_SABMX},
- {ST_L2_8, EV_L2_SABMX, l2_got_SABMX},
- {ST_L2_4, EV_L2_DISC, l2_got_disconn},
- {ST_L2_5, EV_L2_DISC, l2_got_disconn},
- {ST_L2_6, EV_L2_DISC, l2_got_disconn},
- {ST_L2_7, EV_L2_DISC, l2_got_disconn},
- {ST_L2_8, EV_L2_DISC, l2_got_disconn},
- {ST_L2_4, EV_L2_UA, l2_mdl_error},
- {ST_L2_5, EV_L2_UA, l2_got_ua},
- {ST_L2_6, EV_L2_UA, l2_got_ua},
- {ST_L2_7, EV_L2_UA, l2_mdl_error},
- {ST_L2_8, EV_L2_UA, l2_mdl_error},
- {ST_L2_4, EV_L2_DM, l2_got_dm},
- {ST_L2_5, EV_L2_DM, l2_got_dm},
- {ST_L2_6, EV_L2_DM, l2_got_dm},
- {ST_L2_7, EV_L2_DM, l2_mdl_error},
- {ST_L2_8, EV_L2_DM, l2_mdl_error},
+ {ST_L2_4, EV_L2_SABME, l2_start_multi},
+ {ST_L2_5, EV_L2_SABME, l2_send_UA},
+ {ST_L2_6, EV_L2_SABME, l2_send_DM},
+ {ST_L2_7, EV_L2_SABME, l2_restart_multi},
+ {ST_L2_8, EV_L2_SABME, l2_restart_multi},
+ {ST_L2_4, EV_L2_DISC, l2_send_DM},
+ {ST_L2_5, EV_L2_DISC, l2_send_DM},
+ {ST_L2_6, EV_L2_DISC, l2_send_UA},
+ {ST_L2_7, EV_L2_DISC, l2_stop_multi},
+ {ST_L2_8, EV_L2_DISC, l2_stop_multi},
+ {ST_L2_4, EV_L2_UA, l2_mdl_error_ua},
+ {ST_L2_5, EV_L2_UA, l2_connected},
+ {ST_L2_6, EV_L2_UA, l2_released},
+ {ST_L2_7, EV_L2_UA, l2_mdl_error_ua},
+ {ST_L2_8, EV_L2_UA, l2_mdl_error_ua},
+ {ST_L2_4, EV_L2_DM, l2_reestablish},
+ {ST_L2_5, EV_L2_DM, l2_st5_dm_release},
+ {ST_L2_6, EV_L2_DM, l2_st6_dm_release},
+ {ST_L2_7, EV_L2_DM, l2_mdl_error_dm},
+ {ST_L2_8, EV_L2_DM, l2_st8_mdl_error_dm},
{ST_L2_1, EV_L2_UI, l2_got_ui},
{ST_L2_2, EV_L2_UI, l2_got_ui},
{ST_L2_3, EV_L2_UI, l2_got_ui},
@@ -1371,21 +1644,30 @@
{ST_L2_8, EV_L2_UI, l2_got_ui},
{ST_L2_7, EV_L2_FRMR, l2_got_FRMR},
{ST_L2_8, EV_L2_FRMR, l2_got_FRMR},
- {ST_L2_7, EV_L2_SUPER, l2_got_st7_super},
- {ST_L2_8, EV_L2_SUPER, l2_got_st8_super},
+ {ST_L2_7, EV_L2_SUPER, l2_st7_got_super},
+ {ST_L2_8, EV_L2_SUPER, l2_st8_got_super},
{ST_L2_7, EV_L2_I, l2_got_iframe},
{ST_L2_8, EV_L2_I, l2_got_iframe},
{ST_L2_5, EV_L2_T200, l2_st5_tout_200},
{ST_L2_6, EV_L2_T200, l2_st6_tout_200},
- {ST_L2_7, EV_L2_T200, l2_st78_tout_200},
- {ST_L2_8, EV_L2_T200, l2_st78_tout_200},
+ {ST_L2_7, EV_L2_T200, l2_st7_tout_200},
+ {ST_L2_8, EV_L2_T200, l2_st8_tout_200},
{ST_L2_7, EV_L2_T203, l2_st7_tout_203},
{ST_L2_7, EV_L2_ACK_PULL, l2_pull_iqueue},
- {ST_L2_2, EV_L1_DEACTIVATE, l2_persistant_da},
- {ST_L2_3, EV_L1_DEACTIVATE, l2_persistant_da},
- {ST_L2_4, EV_L1_DEACTIVATE, l2_persistant_da},
- {ST_L2_5, EV_L1_DEACTIVATE, l2_persistant_da},
- {ST_L2_6, EV_L1_DEACTIVATE, l2_persistant_da},
+ {ST_L2_7, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
+ {ST_L2_8, EV_L2_SET_OWN_BUSY, l2_set_own_busy},
+ {ST_L2_7, EV_L2_CLEAR_OWN_BUSY, l2_clear_own_busy},
+ {ST_L2_8, EV_L2_CLEAR_OWN_BUSY, l2_clear_own_busy},
+ {ST_L2_4, EV_L2_FRAME_ERROR, l2_frame_error},
+ {ST_L2_5, EV_L2_FRAME_ERROR, l2_frame_error},
+ {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error},
+ {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest},
+ {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest},
+ {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove},
+ {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove},
+ {ST_L2_4, EV_L1_DEACTIVATE, l2_discard_i},
+ {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da},
+ {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da},
{ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da},
{ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da},
};
@@ -1398,52 +1680,79 @@
struct sk_buff *skb = arg;
u_char *datap;
int ret = 1, len;
+ int c = 0;
switch (pr) {
- case (PH_DATA_IND):
+ case (PH_DATA | INDICATION):
datap = skb->data;
len = l2addrsize(&st->l2);
if (skb->len > len)
datap += len;
else {
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'N');
+ FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'N');
FreeSkb(skb);
return;
}
- if (!(*datap & 1)) /* I-Frame */
- ret = FsmEvent(&st->l2.l2m, EV_L2_I, skb);
- else if ((*datap & 3) == 1) /* S-Frame */
- ret = FsmEvent(&st->l2.l2m, EV_L2_SUPER, skb);
- else if (IsUI(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_UI, skb);
- else if (IsSABMX(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_SABMX, skb);
- else if (IsUA(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_UA, skb);
- else if (IsDISC(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_DISC, skb);
- else if (IsDM(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_DM, skb);
- else if (IsFRMR(datap, test_bit(FLG_MOD128, &st->l2.flag)))
- ret = FsmEvent(&st->l2.l2m, EV_L2_FRMR, skb);
- else {
- ret = 0;
- st->ma.layer(st, MDL_ERROR_IND, (void *) 'L');
+ if (!(*datap & 1)) { /* I-Frame */
+ if(!(c = iframe_error(st, skb)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_I, skb);
+ } else if (IsSFrame(datap, st)) { /* S-Frame */
+ if(!(c = super_error(st, skb)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_SUPER, skb);
+ } else if (IsUI(datap)) {
+ if(!(c = UI_error(st, skb)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_UI, skb);
+ } else if (IsSABME(datap, st)) {
+ if(!(c = unnum_error(st, skb, CMD)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_SABME, skb);
+ } else if (IsUA(datap)) {
+ if(!(c = unnum_error(st, skb, RSP)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_UA, skb);
+ } else if (IsDISC(datap)) {
+ if(!(c = unnum_error(st, skb, CMD)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_DISC, skb);
+ } else if (IsDM(datap)) {
+ if(!(c = unnum_error(st, skb, RSP)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_DM, skb);
+ } else if (IsFRMR(datap)) {
+ if(!(c = FRMR_error(st,skb)))
+ ret = FsmEvent(&st->l2.l2m, EV_L2_FRMR, skb);
+ } else {
+ FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) 'L');
FreeSkb(skb);
+ ret = 0;
}
- if (ret) {
+ if(c) {
FreeSkb(skb);
+ FsmEvent(&st->l2.l2m, EV_L2_FRAME_ERROR, (void *) c);
+ ret = 0;
}
+ if (ret)
+ FreeSkb(skb);
break;
- case (PH_PULL_CNF):
+ case (PH_PULL | CONFIRM):
FsmEvent(&st->l2.l2m, EV_L2_ACK_PULL, arg);
break;
- case (PH_PAUSE_IND):
+ case (PH_PAUSE | INDICATION):
test_and_set_bit(FLG_DCHAN_BUSY, &st->l2.flag);
break;
- case (PH_PAUSE_CNF):
+ case (PH_PAUSE | CONFIRM):
test_and_clear_bit(FLG_DCHAN_BUSY, &st->l2.flag);
break;
+ case (PH_ACTIVATE | CONFIRM):
+ case (PH_ACTIVATE | INDICATION):
+ test_and_set_bit(FLG_L1_ACTIV, &st->l2.flag);
+ if (test_and_clear_bit(FLG_ESTAB_PEND, &st->l2.flag))
+ FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
+ break;
+ case (PH_DEACTIVATE | INDICATION):
+ case (PH_DEACTIVATE | CONFIRM):
+ test_and_clear_bit(FLG_L1_ACTIV, &st->l2.flag);
+ FsmEvent(&st->l2.l2m, EV_L1_DEACTIVATE, arg);
+ break;
+ default:
+ l2m_debug(&st->l2.l2m, "l2 unknown pr %04x", pr);
+ break;
}
}
@@ -1451,45 +1760,43 @@
isdnl2_l3l2(struct PStack *st, int pr, void *arg)
{
switch (pr) {
- case (DL_DATA):
+ case (DL_DATA | REQUEST):
if (FsmEvent(&st->l2.l2m, EV_L2_DL_DATA, arg)) {
- dev_kfree_skb((struct sk_buff *) arg);
+ idev_kfree_skb((struct sk_buff *) arg, FREE_READ);
}
break;
- case (DL_UNIT_DATA):
+ case (DL_UNIT_DATA | REQUEST):
if (FsmEvent(&st->l2.l2m, EV_L2_DL_UNIT_DATA, arg)) {
- dev_kfree_skb((struct sk_buff *) arg);
+ idev_kfree_skb((struct sk_buff *) arg, FREE_READ);
}
break;
- }
-}
-
-static void
-isdnl2_manl2(struct PStack *st, int pr, void *arg)
-{
- switch (pr) {
- case (DL_ESTABLISH):
- FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH, arg);
- break;
- case (DL_RELEASE):
- FsmEvent(&st->l2.l2m, EV_L2_DL_RELEASE, arg);
- break;
- case (MDL_NOTEIPROC):
- FsmEvent(&st->l2.l2m, EV_L2_MDL_NOTEIPROC, NULL);
- break;
- case (DL_FLUSH):
- (&st->l2.l2m)->userint |= LC_FLUSH_WAIT;
+ case (DL_ESTABLISH | REQUEST):
+ if (test_bit(FLG_L1_ACTIV, &st->l2.flag)) {
+ if (test_bit(FLG_LAPD, &st->l2.flag) ||
+ test_bit(FLG_ORIG, &st->l2.flag)) {
+ FsmEvent(&st->l2.l2m, EV_L2_DL_ESTABLISH_REQ, arg);
+ }
+ } else {
+ if (test_bit(FLG_LAPD, &st->l2.flag) ||
+ test_bit(FLG_ORIG, &st->l2.flag)) {
+ test_and_set_bit(FLG_ESTAB_PEND, &st->l2.flag);
+ }
+ st->l2.l2l1(st, PH_ACTIVATE, NULL);
+ }
break;
- case (PH_DEACTIVATE_IND):
- FsmEvent(&st->l2.l2m, EV_L1_DEACTIVATE, arg);
+ case (DL_RELEASE | REQUEST):
+ if (test_bit(FLG_LAPB, &st->l2.flag)) {
+ st->l2.l2l1(st, PH_DEACTIVATE, NULL);
+ }
+ FsmEvent(&st->l2.l2m, EV_L2_DL_RELEASE_REQ, arg);
break;
- case (MDL_ASSIGN_REQ):
+ case (MDL_ASSIGN | REQUEST):
FsmEvent(&st->l2.l2m, EV_L2_MDL_ASSIGN, arg);
break;
- case (MDL_REMOVE_REQ):
+ case (MDL_REMOVE | REQUEST):
FsmEvent(&st->l2.l2m, EV_L2_MDL_REMOVE, arg);
break;
- case (MDL_ERROR_REQ):
+ case (MDL_ERROR | RESPONSE):
FsmEvent(&st->l2.l2m, EV_L2_MDL_ERROR, arg);
break;
}
@@ -1498,22 +1805,22 @@
void
releasestack_isdnl2(struct PStack *st)
{
- FsmDelTimer(&st->l2.t200, 15);
+ FsmDelTimer(&st->l2.t200, 21);
FsmDelTimer(&st->l2.t203, 16);
- discard_i_queue(st);
- discard_ui_queue(st);
+ discard_queue(&st->l2.i_queue);
+ discard_queue(&st->l2.ui_queue);
ReleaseWin(&st->l2);
}
static void
-l2m_debug(struct FsmInst *fi, char *s)
+l2m_debug(struct FsmInst *fi, char *fmt, ...)
{
+ va_list args;
struct PStack *st = fi->userdata;
- char tm[32], str[256];
- jiftime(tm, jiffies);
- sprintf(str, "%s %s %s\n", tm, st->l2.debug_id, s);
- HiSax_putstatus(st->l1.hardware, str);
+ va_start(args, fmt);
+ VHiSax_putstatus(st->l1.hardware, st->l2.debug_id, fmt, args);
+ va_end(args);
}
void
@@ -1521,7 +1828,6 @@
{
st->l1.l1l2 = isdnl2_l1l2;
st->l3.l3l2 = isdnl2_l3l2;
- st->ma.manl2 = isdnl2_manl2;
skb_queue_head_init(&st->l2.i_queue);
skb_queue_head_init(&st->l2.ui_queue);
@@ -1529,6 +1835,9 @@
st->l2.debug = 0;
st->l2.l2m.fsm = &l2fsm;
+ if (test_bit(FLG_LAPB, &st->l2.flag))
+ st->l2.l2m.state = ST_L2_4;
+ else
st->l2.l2m.state = ST_L2_1;
st->l2.l2m.debug = 0;
st->l2.l2m.userdata = st;
@@ -1540,9 +1849,27 @@
FsmInitTimer(&st->l2.l2m, &st->l2.t203);
}
+static void
+transl2_l3l2(struct PStack *st, int pr, void *arg)
+{
+ switch (pr) {
+ case (DL_DATA | REQUEST):
+ case (DL_UNIT_DATA | REQUEST):
+ st->l2.l2l1(st, PH_DATA | REQUEST, arg);
+ break;
+ case (DL_ESTABLISH | REQUEST):
+ st->l2.l2l1(st, PH_ACTIVATE | REQUEST, NULL);
+ break;
+ case (DL_RELEASE | REQUEST):
+ st->l2.l2l1(st, PH_DEACTIVATE | REQUEST, NULL);
+ break;
+ }
+}
+
void
setstack_transl2(struct PStack *st)
{
+ st->l3.l3l2 = transl2_l3l2;
}
void
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)