From 61a69abf96d7dd29836fe40c8c605fdbc8bd8cfc Mon Sep 17 00:00:00 2001 From: crichter Date: Fri, 18 May 2007 09:50:33 +0000 Subject: Merged revisions 62912 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r62912 | crichter | 2007-05-03 16:36:32 +0200 (Do, 03 Mai 2007) | 17 lines Merged revisions 61357,61770,62885 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61357 | crichter | 2007-04-11 14:05:57 +0200 (Mi, 11 Apr 2007) | 1 line some fixes for PMP Hold/Retrieve, it should work now, when briding=no ........ r61770 | crichter | 2007-04-24 15:50:05 +0200 (Di, 24 Apr 2007) | 1 line added lock for sending messages to avoid double sending. shuffled some empty_chans after the cb_event calls, this avoids that a release_complete from a quite different call releases a fresh created setup by accident. ........ r62885 | crichter | 2007-05-03 15:59:00 +0200 (Do, 03 Mai 2007) | 1 line fixed the problem that misdn_write did not return -1 when called with 0 samples in a frame this resultet in a deadlock in some circumstances, when the call ended because of a busy extension. added encoding of keypad. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@64955 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/misdn/isdn_lib.h | 1 + 1 file changed, 1 insertion(+) (limited to 'channels/misdn/isdn_lib.h') diff --git a/channels/misdn/isdn_lib.h b/channels/misdn/isdn_lib.h index 8e47b1643..af4f20fee 100644 --- a/channels/misdn/isdn_lib.h +++ b/channels/misdn/isdn_lib.h @@ -199,6 +199,7 @@ enum layer_e { struct misdn_bchannel { + struct send_lock *send_lock; int nt; int port; -- cgit v1.2.3