diff options
author | Christian Richter <christian.richter@beronet.com> | 2007-05-18 09:50:33 +0000 |
---|---|---|
committer | Christian Richter <christian.richter@beronet.com> | 2007-05-18 09:50:33 +0000 |
commit | 0f39ea1a985a019d2e20c8b01d91163d5f6fd767 (patch) | |
tree | 810cbdd6443dc36f13da497e53d7ce8ce657236c /channels/misdn/ie.c | |
parent | 2cdaf67ae0b68dca72b7d8ab3bde855620f5ad8d (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@64955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/misdn/ie.c')
-rw-r--r-- | channels/misdn/ie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c index 3fbccab3e..9b86fe4ef 100644 --- a/channels/misdn/ie.c +++ b/channels/misdn/ie.c @@ -938,7 +938,7 @@ static void dec_ie_display(unsigned char *p, Q931_info_t *qi, char *display, int #endif /* IE_KEYPAD */ -#if 0 +#if 1 static void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, char *keypad, int nt, struct misdn_bchannel *bc) { unsigned char *p; |