From 5e2c6363b0c966e7b0f00e05c1805419fabb4c78 Mon Sep 17 00:00:00 2001 From: Super User Date: Sun, 15 Jun 2008 14:38:35 +0200 Subject: [PATCH] layer 2 establish and release improvements modified: mISDN.cpp --- mISDN.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mISDN.cpp b/mISDN.cpp index e120c80..6abe4e5 100644 --- a/mISDN.cpp +++ b/mISDN.cpp @@ -2002,15 +2002,19 @@ int mISDN_handler(void) case MT_L2RELEASE: l1l2l3_trace_header(mISDNport, NULL, L2_RELEASE_IND, DIRECTION_IN); - add_trace("tei", NULL, "%d", l3m->pid); - end_trace(); + if (!mISDNport->l2establish) + { + add_trace("tei", NULL, "%d", l3m->pid); + end_trace(); + } if ((!mISDNport->ntmode || mISDNport->ptp) && l3m->pid < 127) { mISDNport->l2link = 0; - if (mISDNport->l2hold) + if (!mISDNport->l2establish && mISDNport->l2hold) { + PDEBUG(DEBUG_ISDN, "set timer and establish.\n"); time(&mISDNport->l2establish); - PDEBUG(DEBUG_ISDN, "because we are ptp, we set a l2establish timer.\n"); + mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); } } break; @@ -2041,12 +2045,6 @@ int mISDN_handler(void) PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum); mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL); -#if 0 -no L2 establish trace on every timeout - l1l2l3_trace_header(mISDNport, NULL, L2_ESTABLISH_REQ, DIRECTION_OUT); - add_trace("tei", NULL, "%d", 0); - end_trace(); -#endif time(&mISDNport->l2establish); return(1); } -- 2.13.6