retronetworking
/
mISDN
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Second bugfix for bug 7, encoded component length was wrong 

add some useful debug
This commit is contained in:
Karsten Keil 2005-06-26 11:24:02 +00:00
parent 2fb2b854ef
commit 542f8588c4
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isdn/hardware/mISDN/contr.c
View File

@ -571,6 +571,8 @@ Controller_function(mISDNinstance_t *inst, struct sk_buff *skb)
if(!ret) if(!ret)
dev_kfree_skb(skb); dev_kfree_skb(skb);
} else if (hh->dinfo == MISDN_ID_DUMMY) { } else if (hh->dinfo == MISDN_ID_DUMMY) {
contrDebug(contr, CAPI_DBG_CONTR_INFO, "%s: call Supplementary_l3l4 len %d",
__FUNCTION__, skb->len);
ret = Supplementary_l3l4(contr, hh->prim, skb); ret = Supplementary_l3l4(contr, hh->prim, skb);
} else { } else {
if (!(plci = getPlci4L3id(contr, hh->dinfo))) { if (!(plci = getPlci4L3id(contr, hh->dinfo))) {

4
drivers/isdn/hardware/mISDN/layer1.c
View File

@ -209,8 +209,6 @@ l1_power_up_s(struct FsmInst *fi, int event, void *arg)
if (test_bit(FLG_L1_ACTIVATING, &l1->Flags)) { if (test_bit(FLG_L1_ACTIVATING, &l1->Flags)) {
mISDN_FsmChangeState(fi, ST_L1_F4); mISDN_FsmChangeState(fi, ST_L1_F4);
l1down(l1, PH_SIGNAL | REQUEST, INFO3_P8, 0, NULL); l1down(l1, PH_SIGNAL | REQUEST, INFO3_P8, 0, NULL);
mISDN_FsmRestartTimer(&l1->timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
test_and_set_bit(FLG_L1_T3RUN, &l1->Flags);
} else } else
mISDN_FsmChangeState(fi, ST_L1_F3); mISDN_FsmChangeState(fi, ST_L1_F3);
} }
@ -316,6 +314,8 @@ l1_activate_s(struct FsmInst *fi, int event, void *arg)
{ {
layer1_t *l1 = fi->userdata; layer1_t *l1 = fi->userdata;
mISDN_FsmRestartTimer(&l1->timer, TIMER3_VALUE, EV_TIMER3, NULL, 2);
test_and_set_bit(FLG_L1_T3RUN, &l1->Flags);
l1down(l1, PH_CONTROL | REQUEST, HW_RESET, 0, NULL); l1down(l1, PH_CONTROL | REQUEST, HW_RESET, 0, NULL);
} }

13
drivers/isdn/hardware/mISDN/supp_serv.c
View File

@ -7,6 +7,7 @@
#include "asn1_enc.h" #include "asn1_enc.h"
#include "dss1.h" #include "dss1.h"
#include "helper.h" #include "helper.h"
#include "debug.h"
#define T_ACTIVATE 4000 #define T_ACTIVATE 4000
#define T_DEACTIVATE 4000 #define T_DEACTIVATE 4000
@ -27,7 +28,7 @@ encodeInvokeComponentHead(__u8 *p)
static void static void
encodeInvokeComponentLength(__u8 *msg, __u8 *p) encodeInvokeComponentLength(__u8 *msg, __u8 *p)
{ {
msg[3] = p - &msg[5]; msg[3] = p - &msg[4];
msg[0] = p - &msg[1]; msg[0] = p - &msg[1];
} }
@ -651,8 +652,14 @@ SSProcessFacility(Controller_t *contr, Q931_info_t *qi)
SendSSFacilityInd(appl, sspc->addr, tmp); SendSSFacilityInd(appl, sspc->addr, tmp);
SSProcessDestr(sspc); SSProcessDestr(sspc);
break; break;
default: default: {
int_error(); static char logbuf[512];
int_errtxt("component %x not handled", parm.comp);
mISDN_QuickHex(logbuf, p, ie_len);
printk(KERN_DEBUG "facIE: %s\n", logbuf);
}
break;
} }
} }