diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:32:32 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-28 11:32:32 +0000 |
| commit | 7e31abf5b77a1a21796627295137464fbd487124 (patch) | |
| tree | 2ea021c0d085c8b9cd7a5f9e626d49e7b917d851 /channels/misdn | |
| parent | cdb6825421f4b7b8b46b6cb29dfbb1942d19474b (diff) | |
Merged revisions 43852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r43852 | crichter | 2006-09-28 13:03:05 +0200 (Do, 28 Sep 2006) | 9 lines
Merged revisions 43764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43764 | crichter | 2006-09-27 14:51:03 +0200 (Mi, 27 Sep 2006) | 1 line
fixed a bug which led to chan_list zombies, when the call could not be properly established in misdn_call. also removed the ACK_HDLC stuff which is not really needed.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43855 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/isdn_lib.c | 15 | ||||
| -rw-r--r-- | channels/misdn/isdn_lib.h | 4 |
2 files changed, 1 insertions, 18 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index b0d2fbe9d..19268d0e6 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -1005,12 +1005,6 @@ int setup_bc(struct misdn_bchannel *bc) } else if ( bc->hdlc ) { cb_log(2, stack->port," --> HDLC Mode\n"); -#ifdef ACK_HDLC - bc->ack_hdlc=(sem_t*)malloc(sizeof(sem_t)); - if ( sem_init((sem_t*)bc->ack_hdlc, 1, 0)<0 ) - sem_init((sem_t*)bc->ack_hdlc, 0, 0); -#endif - pid.protocol[1] = ISDN_PID_L1_B_64HDLC ; pid.protocol[2] = ISDN_PID_L2_B_TRANS ; pid.protocol[3] = ISDN_PID_L3_B_USER; @@ -2481,7 +2475,6 @@ static int handle_bchan(msg_t *msg) #endif free_msg(msg); - return 1; case DL_DATA|RESPONSE: #if MISDN_DEBUG @@ -3255,7 +3248,6 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event ) /*holded_bc->upset=0; holded_bc->active=0;*/ bc_state_change(holded_bc,BCHAN_CLEANED); - cb_event( EVENT_NEW_BC, bc, holded_bc); } break; @@ -3953,13 +3945,6 @@ int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len) cb_log(9, stack->port, "Writing %d bytes 2 mISDN\n",len); r=mISDN_write(stack->midev, buf, frm->len + mISDN_HEADER_LEN, TIMEOUT_INFINIT); -#ifdef ACK_HDLC - if (bc->hdlc && bc->ack_hdlc) { - cb_log(4,stack->port,"Awaiting Acknowledge [%d]\n",len); - sem_wait((sem_t*)bc->ack_hdlc); - cb_log(4,stack->port,"Acknowledged\n"); - } -#endif return 0; } diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h index d849a7ce8..4289b42ba 100644 --- a/channels/misdn/isdn_lib.h +++ b/channels/misdn/isdn_lib.h @@ -59,7 +59,7 @@ enum tone_e { -#define MAX_BCHANS 30 +#define MAX_BCHANS 31 enum bchannel_state { BCHAN_CLEANED=0, @@ -197,8 +197,6 @@ struct misdn_bchannel { /* int b_addr; */ int layer_id; - void *ack_hdlc; - int layer; /*state stuff*/ |