From 2ce08e259cd4b5e5525427e65ac07148356e068d Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Fri, 18 May 2007 10:00:21 +0000 Subject: Merged revisions 63534 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r63534 | crichter | 2007-05-09 15:17:10 +0200 (Mi, 09 Mai 2007) | 17 lines Merged revisions 62945,63402,63519 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r62945 | crichter | 2007-05-03 17:39:21 +0200 (Do, 03 Mai 2007) | 1 line when we're in state WAITING4DIGS, we use the asterisk tone-generator which prods us, so we can't just return -1 in misdn_write in this case. Added a MISDN_KEYPAD channel variable, and fixed the sending of keypad. this enables us to modify the call forward parameters in the switch. ........ r63402 | crichter | 2007-05-08 17:07:37 +0200 (Di, 08 Mai 2007) | 1 line added application misdn_check_l2l1 which tries to pull up the L1/L2 on all ports that have the layers down in a group. It waits then for a timeout. This helps for scenarios where multiple PMP BRIs are grouped together, or where a provider has a faulty PTP Implementation, that looses the L2 after a while. ........ r63519 | crichter | 2007-05-09 13:26:16 +0200 (Mi, 09 Mai 2007) | 1 line release_chan frees ch, so we should never touch ch after release_chan, this may cause segfaults. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64957 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/misdn/isdn_lib.c | 6 +++--- channels/misdn/isdn_msg_parser.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'channels/misdn') diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 9b8171d17..2757c2727 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -1344,7 +1344,7 @@ struct misdn_stack* stack_init( int midev, int port, int ptp ) misdn_lib_get_short_status(stack); misdn_lib_get_l1_up(stack); - misdn_lib_get_l2_up(stack); + misdn_lib_get_l2_up(stack); } @@ -1718,7 +1718,7 @@ int misdn_lib_port_up(int port, int check) if (stack->l1link && stack->l2link) { return 1; } else { - cb_log(0,port, "Port Down L2:%d L1:%d\n", + cb_log(1,port, "Port Down L2:%d L1:%d\n", stack->l2link, stack->l1link); return 0; } @@ -1726,7 +1726,7 @@ int misdn_lib_port_up(int port, int check) if ( !check || stack->l1link ) return 1; else { - cb_log(0,port, "Port down PMP\n"); + cb_log(1,port, "Port down PMP\n"); return 0; } } diff --git a/channels/misdn/isdn_msg_parser.c b/channels/misdn/isdn_msg_parser.c index 4f5666586..fa29c2f55 100644 --- a/channels/misdn/isdn_msg_parser.c +++ b/channels/misdn/isdn_msg_parser.c @@ -298,7 +298,7 @@ static msg_t *build_setup (struct isdn_msg msgs[], struct misdn_bchannel *bc, in { if (bc->keypad[0]) - enc_ie_keypad(&setup->CALLED_PN, msg, bc->keypad, nt,bc); + enc_ie_keypad(&setup->KEYPAD, msg, bc->keypad, nt,bc); } -- cgit v1.2.3