Summary: | ASTERISK-10963: [patch] Close timing interface on error | ||
Reporter: | Eliel Sardanons (eliel) | Labels: | |
Date Opened: | 2007-12-03 22:44:13.000-0600 | Date Closed: | 2007-12-04 14:37:28.000-0600 |
Priority: | Trivial | Regression? | No |
Status: | Closed/Complete | Components: | Core/Channels |
Versions: | Frequency of Occurrence | ||
Related Issues: | |||
Environment: | Attachments: | ( 0) channel.c.patch | |
Description: | If an error occurs while allocating the channel and we already open the timing interface, we should close it. | ||
Comments: | By: Digium Subversion (svnbot) 2007-12-04 11:36:07.000-0600 Repository: asterisk Revision: 90879 _U trunk/ U trunk/main/channel.c ------------------------------------------------------------------------ r90879 | qwell | 2007-12-04 11:36:06 -0600 (Tue, 04 Dec 2007) | 13 lines Merged revisions 90876 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue ASTERISK-10963) ........ r90876 | qwell | 2007-12-04 11:28:08 -0600 (Tue, 04 Dec 2007) | 4 lines If we fail to create a channel after allocating a timing fd, we need to make sure to close it. Issue 11454, patch by eliel. ........ ------------------------------------------------------------------------ By: Digium Subversion (svnbot) 2007-12-04 14:37:28.000-0600 Repository: asterisk Revision: 90968 _U team/file/bridging/ U team/file/bridging/CHANGES U team/file/bridging/Makefile U team/file/bridging/apps/app_dial.c U team/file/bridging/apps/app_queue.c U team/file/bridging/apps/app_voicemail.c U team/file/bridging/channels/chan_local.c U team/file/bridging/channels/chan_zap.c U team/file/bridging/configs/zapata.conf.sample U team/file/bridging/include/asterisk/callerid.h U team/file/bridging/include/asterisk/channel.h A team/file/bridging/include/asterisk/global_datastores.h U team/file/bridging/main/Makefile U team/file/bridging/main/callerid.c U team/file/bridging/main/channel.c A team/file/bridging/main/global_datastores.c ------------------------------------------------------------------------ r90968 | file | 2007-12-04 14:37:26 -0600 (Tue, 04 Dec 2007) | 118 lines Merged revisions 90873,90877-90880,90899,90927-90930,90949 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r90873 | mmichelson | 2007-12-04 13:08:36 -0400 (Tue, 04 Dec 2007) | 30 lines Merged revisions 90735 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r90735 | mmichelson | 2007-12-03 17:12:17 -0600 (Mon, 03 Dec 2007) | 22 lines A big one... This is the merge of the forward-loop branch. The main change here is that call-forwards can no longer loop. This is accomplished by creating a datastore on the calling channel which has a linked list of all devices dialed. If a forward happens, then the local channel which is created inherits the datastore. If, through this progression of forwards and datastore inheritance, a device is attempted to be dialed a second time, it will simply be skipped and a warning message will be printed to the CLI. After the dialing has been completed, the datastore is detached from the channel and destroyed. This change also introduces some side effects to the code which I shall enumerate here: 1. Datastore inheritance has been backported from trunk into 1.4 2. A large chunk of code has been removed from app_dial. This chunk is the section of code which handles the call forward case after the channel has been requested but before it has been called. This was removed because call-forwarding still works fine without it, it makes the code less error-prone should it need changing, and it made this set of changes much less painful to just have the forwarding handled in one place in each module. 3. Two new files, global_datastores.h and .c have been added. These are necessary since the datastore which is attached to the channel may be created and attached in either app_dial or app_queue, so they need a common place to find the datastore info. This approach was taken in case similar datastores are needed in the future, there will be a common place to add them. ........ ................ r90877 | qwell | 2007-12-04 13:35:40 -0400 (Tue, 04 Dec 2007) | 1 line Fix build in trunk. This was fixed in 1.4, but blocked in trunk since this hadn't been merged yet. ................ r90878 | russell | 2007-12-04 13:36:59 -0400 (Tue, 04 Dec 2007) | 2 lines Fix a silly little typo :) ................ r90879 | qwell | 2007-12-04 13:38:51 -0400 (Tue, 04 Dec 2007) | 13 lines Merged revisions 90876 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue ASTERISK-10963) ........ r90876 | qwell | 2007-12-04 11:28:08 -0600 (Tue, 04 Dec 2007) | 4 lines If we fail to create a channel after allocating a timing fd, we need to make sure to close it. Issue 11454, patch by eliel. ........ ................ r90880 | kpfleming | 2007-12-04 13:40:29 -0400 (Tue, 04 Dec 2007) | 2 lines fix build of this module when libpri and/or libss7 are or are not present ................ r90899 | mmichelson | 2007-12-04 13:51:59 -0400 (Tue, 04 Dec 2007) | 3 lines Wrong locking style got merged from 1.4 to trunk. My mistake. ................ r90927 | qwell | 2007-12-04 14:09:28 -0400 (Tue, 04 Dec 2007) | 1 line Fix build, that some people aren't seeing for some reason. ................ r90928 | mmichelson | 2007-12-04 14:14:08 -0400 (Tue, 04 Dec 2007) | 3 lines Suppress a compiler warning due to discarding a "const" qualifier ................ r90929 | qwell | 2007-12-04 14:15:17 -0400 (Tue, 04 Dec 2007) | 4 lines Add Makefile alias target 'pdf' which does the same thing as asterisk.pdf. Issue 11452, reported by blitzrage. ................ r90930 | mmichelson | 2007-12-04 14:29:35 -0400 (Tue, 04 Dec 2007) | 6 lines Kevin suggested doing the reverse of my last commit, since imap_retrieve_file does not modify the contents of the "mailbox" string. In other words, I'm changing the imap_retrieve_file function to take a const char* as the third argument so that I don't need to cast const char*'s as char*'s to suppress compiler warnings. ................ r90949 | russell | 2007-12-04 15:08:30 -0400 (Tue, 04 Dec 2007) | 15 lines Add support for monitoring MWI on FXO lines. This introduces two new options for zapata.conf: mwimonitor and mwimonitornotify. The mwimonitor option enables MWI monitoring. When the MWI state on a line changes, then the script specified by mwimonitornotify will be executed for custom handling of the state change, similar to the externnotify option of voicemail.conf. Also, when the MWI state on an FXO line changes, an internal Asterisk event is generated to indicate the new state of the associated mailbox. That may, any module that cares about MWI information will get notified and can handle it just as if app_voicemail had sent this notification. (BE-253, original patch from markster, with some minor modifications by me to add comments, documentation, and internal event support) ................ ------------------------------------------------------------------------ |