asterisk

Commit Graph

Author	SHA1	Message	Date
Mark Michelson	a0a1fab4a1	Add threadpool support to Asterisk. This commit consists of two parts. Part one changes the taskprocessor API to be less self-contained. Instead, the taskprocessor is now more of a task queue that informs a listener of changes to the queue. The listener then has the responsibility of executing the tasks as it pleases. There is a default listener implementation that functions the same way as "classic" taskprocessors, in that it creates a single thread for tasks to execute in. Old users of taskprocessors have not been altered and still function the same way. Part two introduces the threadpool API. A threadpool is a special type of taskprocessor listener that has multiple threads associated with it. The threadpool also has an optional listener that can adjust the threadpool as conditions change. In addition the threadpool has a set of options that can allow for the threadpool to grow and shrink on its own as tasks are added and executed. Both set of changes contain accompanying unit tests. (closes issue ASTERISK-20691) Reported By: Matt Jordan Review: https://reviewboard.asterisk.org/r/2242 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379432 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	be727bf0d2	Fix Record-Route parsing for large headers. Record-Route parsing copied the header into a char[256] array, which can be a problem if the header is longer than that. This patch parses the header in place, without the copy, avoiding the issue. In addition to the original patch, I added a unit test for the new get_in_brackets_const function. (closes issue ASTERISK-20837) Reported by: Corey Farrell Patches: chan_sip-build_route-optimized-rev1.patch uploaded by Corey Farrell (license 5909) (with minor changes by dlee) ........ Merged revisions 379392 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379393 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379394 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	84c50fde1f	Address David's latest feedback on reviewboard: * Add a max_size option for threadpools. Also added a test for this option. * Fixed comments to be more accurate and have fewer typos. * Updated copyright dates on new files. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379375 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	299f913928	Merged revisions 379344 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379344 \| mjordan \| 2013-01-16 20:32:34 -0600 (Wed, 16 Jan 2013) \| 23 lines Fix issue where chan_mobile fails to bind to first available port Per the bluez API, in order to bind to the first available port, the rc_channel field of the socket addressing structure used to bind the socket should be set to 0. Previously, Asterisk had set the rc_channel field set to 1, causing it to connect to whatever happens to be on port 1. We could probably not explicitly set rc_channel to 0 since we memset the struct earlier, but explicitly setting it will hopefully prevent someone from coming in and setting it to some explicit port in the future. (closes issue ASTERISK-16357) Reported by: challado Tested by: Alexander Heinz, Nikolay Ilduganov, benjamin, eliafino, David van Geyn patches: ASTERISK-16357.diff uploaded by Nikolay Ilduganov (license 6253) ........ Merged revisions 379342 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379343 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379353 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	ea78b7cbc8	Fix issue where chan_mobile fails to bind to first available port Per the bluez API, in order to bind to the first available port, the rc_channel field of the socket addressing structure used to bind the socket should be set to 0. Previously, Asterisk had set the rc_channel field set to 1, causing it to connect to whatever happens to be on port 1. We could probably not explicitly set rc_channel to 0 since we memset the struct earlier, but explicitly setting it will hopefully prevent someone from coming in and setting it to some explicit port in the future. (closes issue ASTERISK-16357) Reported by: challado Tested by: Alexander Heinz, Nikolay Ilduganov, benjamin, eliafino, David van Geyn patches: ASTERISK-16357.diff uploaded by Nikolay Ilduganov (license 6253) ........ Merged revisions 379342 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379343 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379344 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	29620f5a6e	Merged revisions 379312 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379312 \| mmichelson \| 2013-01-16 16:51:32 -0600 (Wed, 16 Jan 2013) \| 11 lines Further fix misinformation in the description of manager MailboxStatus command. The description still claimed that it returned the number of messages rather than whether there were messages waiting. ........ Merged revisions 379310 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379311 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379321 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	ad73536647	Further fix misinformation in the description of manager MailboxStatus command. The description still claimed that it returned the number of messages rather than whether there were messages waiting. ........ Merged revisions 379310 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379311 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379312 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	6f8b07b713	Merged revisions 379278 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379278 \| qwell \| 2013-01-16 15:13:53 -0600 (Wed, 16 Jan 2013) \| 11 lines Reduce number of packages install_prereq installs on Debian systems. 'search' will look for any package containing the name provided, so we need to force a more exact search. ........ Merged revisions 379276 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379277 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379288 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Jason Parker	73b33dbacf	Reduce number of packages install_prereq installs on Debian systems. 'search' will look for any package containing the name provided, so we need to force a more exact search. ........ Merged revisions 379276 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379277 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379278 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	108f5cc599	Merged revisions 379229,379231,379233 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379229 \| mjordan \| 2013-01-16 11:46:15 -0600 (Wed, 16 Jan 2013) \| 10 lines Let documentation reference links specify which module they're linking to Again, since res_jabber/res_xmpp have duplicate APIs, their documentation ref links have to specify which reference they're referring to. The various documentation parsers can interpret the module attribute however they want in order to construct the appropriate links. ........ Merged revisions 379228 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r379231 \| rmudgett \| 2013-01-16 11:49:52 -0600 (Wed, 16 Jan 2013) \| 10 lines chan_misdn: Fix compile error. (issue ASTERISK-15456) ........ Merged revisions 379226 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379230 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r379233 \| rmudgett \| 2013-01-16 12:09:28 -0600 (Wed, 16 Jan 2013) \| 8 lines Reduce call-id logging resource usage. Since there is no need for the call-id logging ao2 object to have a lock, don't create it with one. ........ Merged revisions 379232 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379243 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	9b6d9bcf99	Reduce call-id logging resource usage. Since there is no need for the call-id logging ao2 object to have a lock, don't create it with one. ........ Merged revisions 379232 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379233 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	5e46455806	chan_misdn: Fix compile error. (issue ASTERISK-15456) ........ Merged revisions 379226 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379230 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379231 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	472e29df62	Let documentation reference links specify which module they're linking to Again, since res_jabber/res_xmpp have duplicate APIs, their documentation ref links have to specify which reference they're referring to. The various documentation parsers can interpret the module attribute however they want in order to construct the appropriate links. ........ Merged revisions 379228 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379229 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	70d22f2ab7	Merged revisions 379211 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379211 \| mjordan \| 2013-01-16 09:33:05 -0600 (Wed, 16 Jan 2013) \| 21 lines Multiple revisions 379209-379210 ........ r379209 \| mjordan \| 2013-01-16 09:27:44 -0600 (Wed, 16 Jan 2013) \| 8 lines Add module tags to documentation for res_jabber/res_xmpp Since res_jabber/res_xmpp provide the same APIs (app/func/manager/etc.), the XML documentation for each needs to call out which module is providing the documentation. The module attribute has been added to the various XML fragments for this purpose. ........ r379210 \| mjordan \| 2013-01-16 09:30:20 -0600 (Wed, 16 Jan 2013) \| 4 lines Update the dtd to actually support the module attribute in all elements Mea culpa. ........ Merged revisions 379209-379210 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379218 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	b84d37a711	Multiple revisions 379209-379210 ........ r379209 \| mjordan \| 2013-01-16 09:27:44 -0600 (Wed, 16 Jan 2013) \| 8 lines Add module tags to documentation for res_jabber/res_xmpp Since res_jabber/res_xmpp provide the same APIs (app/func/manager/etc.), the XML documentation for each needs to call out which module is providing the documentation. The module attribute has been added to the various XML fragments for this purpose. ........ r379210 \| mjordan \| 2013-01-16 09:30:20 -0600 (Wed, 16 Jan 2013) \| 4 lines Update the dtd to actually support the module attribute in all elements Mea culpa. ........ Merged revisions 379209-379210 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379211 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	4986651fb0	Merged revisions 379180 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379180 \| mjordan \| 2013-01-15 22:14:38 -0600 (Tue, 15 Jan 2013) \| 27 lines Fix parsing SMSSRC for SMS messages The parser for SMS messages would incorrectly parse out the from number. The parsing would incorrectly start scanning for the from number at the same index as the first double quote ("); this would inadvertently cause it to treat the first double quote as the terminating double quote for the from number as well. The SMSSRC should now populate correctly. (closes issue ASTERISK-16822) Reported by: menschentier Tested by: Jonas Falck patches: fixSMSSRC.patch uploaded by jonax (license 6320) (closes issue ASTERISK-19153) Reported by: Panos Gkikakis patches: sms-sender-fix.diff uploaded by roeften (license 5884) ........ Merged revisions 379178 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379179 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379189 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	02e70d78b6	Fix parsing SMSSRC for SMS messages The parser for SMS messages would incorrectly parse out the from number. The parsing would incorrectly start scanning for the from number at the same index as the first double quote ("); this would inadvertently cause it to treat the first double quote as the terminating double quote for the from number as well. The SMSSRC should now populate correctly. (closes issue ASTERISK-16822) Reported by: menschentier Tested by: Jonas Falck patches: fixSMSSRC.patch uploaded by jonax (license 6320) (closes issue ASTERISK-19153) Reported by: Panos Gkikakis patches: sms-sender-fix.diff uploaded by roeften (license 5884) ........ Merged revisions 379178 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379179 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379180 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	346e774006	Merged revisions 379144,379147 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379144 \| mjordan \| 2013-01-15 17:54:34 -0600 (Tue, 15 Jan 2013) \| 17 lines Add busy detection to chan_mobile From the patch author: "First this patch adds general support for busy detection. It also adds support for the ECAM command at Sony Ericsson phones and also signals busy when only early media was received but the call got not answered." Review: https://reviewboard.asterisk.org/r/323 (closes issue ASTERISK-14527) Reported by: Artem Makhutov Tested by: Artem Makhutov patches: busy-full5.patch uploaded by artem (license 5757) ................ r379147 \| mjordan \| 2013-01-15 18:16:22 -0600 (Tue, 15 Jan 2013) \| 25 lines Set the INVALID_EXTEN channel variable when chan_misdn forces the 'i' extension The chan_misdn channel driver will send a channel with an invalid destination to the 'i' extension itself if said extension can be reached. It forgot, however, to set the INVALID_EXTEN channel variable when it bounces the channel to this extension. Dialplan writers everywhere moaned at yet another inconsistency. This is yet another example of why duplicating logic in multiple places results in bugs that stick around in Jira for just under three years. Yes: ASTERISK-15456 was created on January 18th, 2010. Patch committed on January 15th, 2013. Ouch. (closes issue ASTERISK-15456) Reported by: Thomas Omerzu patches: chan_misdn_invalid.patch2 uploaded by Thomas Omerzu (license 5927) ........ Merged revisions 379145 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379146 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379156 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	9693f8f10f	Set the INVALID_EXTEN channel variable when chan_misdn forces the 'i' extension The chan_misdn channel driver will send a channel with an invalid destination to the 'i' extension itself if said extension can be reached. It forgot, however, to set the INVALID_EXTEN channel variable when it bounces the channel to this extension. Dialplan writers everywhere moaned at yet another inconsistency. This is yet another example of why duplicating logic in multiple places results in bugs that stick around in Jira for just under three years. Yes: ASTERISK-15456 was created on January 18th, 2010. Patch committed on January 15th, 2013. Ouch. (closes issue ASTERISK-15456) Reported by: Thomas Omerzu patches: chan_misdn_invalid.patch2 uploaded by Thomas Omerzu (license 5927) ........ Merged revisions 379145 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379146 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379147 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	a4d0878955	Add busy detection to chan_mobile From the patch author: "First this patch adds general support for busy detection. It also adds support for the ECAM command at Sony Ericsson phones and also signals busy when only early media was received but the call got not answered." Review: https://reviewboard.asterisk.org/r/323 (closes issue ASTERISK-14527) Reported by: Artem Makhutov Tested by: Artem Makhutov patches: busy-full5.patch uploaded by artem (license 5757) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379144 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	0dc9cc48a0	Merged revisions 379128 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r379128 \| rmudgett \| 2013-01-15 16:23:49 -0600 (Tue, 15 Jan 2013) \| 1 line Fix ast_bridge_features_register() not registering builtin features. I broke. Ooops. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379138 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	491e0064b8	Fix ast_bridge_features_register() not registering builtin features. I broke. Ooops. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379128 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	a73d6e5b86	Add doxygen to accessors and increase refcount of taskprocessor before returning. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379127 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	967e380ba8	Make the threadpool listener opaque. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379126 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	663479a558	Make ast_taskprocessor_listener opaque. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379125 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	03e89247de	Address further review feedback from David Lee. * Clarify some documentation * Change copyright date of taskprocessor files * Address potential issue of creating taskprocessor with listener if taskprocessor with that name exists already git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379124 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	c6bc51ef28	Make the initial size of the threadpool part of the options passed in. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379123 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	edc2e4dac0	Remove threadpool listener alloc and destroy callbacks. This replaces the destroy callback with a shutdown callback instead. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379122 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Mark Michelson	65c7d6e2c3	Remove alloc and destroy callbacks from the taskprocessor. Now user data is allocated by the creator of the taskprocessor listener and that user data is passed into ast_taskprocessor_listener_alloc(). Similarly, freeing of the user data is left up to the user himself. He can free the data when the taskprocessor shuts down, or he can choose to hold onto it if it makes sense to do so. This, unsurprisingly, makes threadpool allocation a LOT cleaner now. git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379120 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	c80f86f007	Merged revisions 379070 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r379070 \| dlee \| 2013-01-14 15:47:31 -0600 (Mon, 14 Jan 2013) \| 1 line Fixed doc comment for ast_test_validate ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379081 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	bb73c2272e	Fixed doc comment for ast_test_validate git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379070 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	0d3dfad94f	Merged revisions 379021,379023 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r379021 \| dlee \| 2013-01-14 09:29:22 -0600 (Mon, 14 Jan 2013) \| 15 lines Fix XML encoding of 'identity display' in NOTIFY messages, continued. When r378933 was merged into 1.8, it should have also escaped remote_display, since it will have the same XML encoding problem when the caller/callee roles are reversed. (closes issue ABE-2902) Reported by: Guenther Kelleter ........ Merged revisions 379001 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379020 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ r379023 \| dlee \| 2013-01-14 09:58:01 -0600 (Mon, 14 Jan 2013) \| 20 lines Masquerades are an insane implementation detail within Asterisk. It generates a number of useless and confusing events, and manipulates channels in a way that semantically doesn't make sense. I've given a fairly thorough review of masquerade code and its usage on the wiki at https://wiki.asterisk.org/wiki/x/IwBRAQ. While ultimately it makes the most sense to abandon masquerades altogether, it will take some time to completely irradicate. Even then, there may always be code that's not worth rewriting to get rid of the masquerade. This patch does two things to make masquerades slightly less insane: * When swapping the names of the original and clone channel, only emit a single rename event of original -> original<ZOMBIE>. The original code issued three rename events to accomplish the same end. * In addition to swapping the names of the channels, also swap their uniqueid's. This allows the 'Uniqueid' field to be used as a stable identifier for a channel from and external interface, such as AMI. Review: https://reviewboard.asterisk.org/r/2266/ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379032 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	d3bb2506a1	Gently reduce masquerade insanity Masquerades are an insane implementation detail within Asterisk. It generates a number of useless and confusing events, and manipulates channels in a way that semantically doesn't make sense. I've given a fairly thorough review of masquerade code and its usage on the wiki at https://wiki.asterisk.org/wiki/x/IwBRAQ. While ultimately it makes the most sense to abandon masquerades altogether, it will take some time to completely irradicate. Even then, there may always be code that's not worth rewriting to get rid of the masquerade. This patch does two things to make masquerades slightly less insane: * When swapping the names of the original and clone channel, only emit a single rename event of original -> original<ZOMBIE>. The original code issued three rename events to accomplish the same end. * In addition to swapping the names of the channels, also swap their uniqueid's. This allows the 'Uniqueid' field to be used as a stable identifier for a channel from and external interface, such as AMI. Review: https://reviewboard.asterisk.org/r/2266/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379023 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	a91a289154	Fix XML encoding of 'identity display' in NOTIFY messages, continued. When r378933 was merged into 1.8, it should have also escaped remote_display, since it will have the same XML encoding problem when the caller/callee roles are reversed. (closes issue ABE-2902) Reported by: Guenther Kelleter ........ Merged revisions 379001 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 379020 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@379021 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	9e3bf9ba54	Merged revisions 378985 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r378985 \| mjordan \| 2013-01-13 16:07:00 -0600 (Sun, 13 Jan 2013) \| 20 lines Reset RTP timestamp; sequence number on SSRC change In r370252 for ASTERISK-18404, Asterisk's handling of RTP was modified to better account for out of order RTP packets. This was accomplished by using the RTP timestamp and sequence number to check for out of order packets. However, when a SSRC change occurs, the timestamp and sequence number will no longer have any relation to the previously received packets. The variables tracking the timestamp and sequence number therefore have to be reset. (closes issue ASTERISK-20906) Reported by: Eelco Brolman patches: dtmf_on_hold.patch uploaded by Eelco Brolman (license #6442) ........ Merged revisions 378967 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378984 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378993 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	9b475cd3ef	Reset RTP timestamp; sequence number on SSRC change In r370252 for ASTERISK-18404, Asterisk's handling of RTP was modified to better account for out of order RTP packets. This was accomplished by using the RTP timestamp and sequence number to check for out of order packets. However, when a SSRC change occurs, the timestamp and sequence number will no longer have any relation to the previously received packets. The variables tracking the timestamp and sequence number therefore have to be reset. (closes issue ASTERISK-20906) Reported by: Eelco Brolman patches: dtmf_on_hold.patch uploaded by Eelco Brolman (license #6442) ........ Merged revisions 378967 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378984 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378985 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	f7f7850f7a	Merged revisions 378935 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r378935 \| dlee \| 2013-01-12 00:43:37 -0600 (Sat, 12 Jan 2013) \| 41 lines Fix XML encoding of 'identity display' in NOTIFY messages. XML encoding in chan_sip is accomplished by naively building the XML directly from strings. While this usually works, it fails to take into account escaping the reserved characters in XML. This patch adds an 'ast_xml_escape' function, which works similarly to 'ast_uri_encode'. This is used to properly escape the local_display attribute in XML formatted NOTIFY messages. Several things to note: * The Right Thing(TM) to do would probably be to replace the ast_build_string stuff with building an ast_xml_doc. That's a much bigger change, and out of scope for the original ticket, so I refrained myself. * It is with great sadness that I wrote my own ast_xml_escape function. There's one in libxml2, but it's knee-deep in libxml2-ness, and not easily used to one-off escape a string. * I only escaped the string we know is causing problems (local_display). At least some of the other strings are URI-encoded, which should be XML safe. Rather than figuring out what's safe and escaping what's not, it would be much cleaner to simply build an ast_xml_doc for the messages and let the XML library do the XML escaping. Like I said, that's out of scope. (closes issue ABE-2902) Reported by: Guenther Kelleter Tested by: Guenther Kelleter Review: http://reviewboard.digium.internal/r/365/ ........ Merged revision 378919 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier ........ Merged revisions 378933 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378934 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378946 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	aecd2429bd	Fix XML encoding of 'identity display' in NOTIFY messages. XML encoding in chan_sip is accomplished by naively building the XML directly from strings. While this usually works, it fails to take into account escaping the reserved characters in XML. This patch adds an 'ast_xml_escape' function, which works similarly to 'ast_uri_encode'. This is used to properly escape the local_display attribute in XML formatted NOTIFY messages. Several things to note: * The Right Thing(TM) to do would probably be to replace the ast_build_string stuff with building an ast_xml_doc. That's a much bigger change, and out of scope for the original ticket, so I refrained myself. * It is with great sadness that I wrote my own ast_xml_escape function. There's one in libxml2, but it's knee-deep in libxml2-ness, and not easily used to one-off escape a string. * I only escaped the string we know is causing problems (local_display). At least some of the other strings are URI-encoded, which should be XML safe. Rather than figuring out what's safe and escaping what's not, it would be much cleaner to simply build an ast_xml_doc for the messages and let the XML library do the XML escaping. Like I said, that's out of scope. (closes issue ABE-2902) Reported by: Guenther Kelleter Tested by: Guenther Kelleter Review: http://reviewboard.digium.internal/r/365/ ........ Merged revision 378919 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier ........ Merged revisions 378933 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 378934 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378935 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	2c1720b4f7	Merged revisions 378915,378918 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ................ r378915 \| dlee \| 2013-01-11 16:31:42 -0600 (Fri, 11 Jan 2013) \| 21 lines Add JSON API for Asterisk. This provides a JSON API by pulling in and wrapping the Jansson JSON library[1]. The Asterisk API basically mirrors the Jansson functionality, with a few minor tweaks. * Some names have been asteriskified to protect the innocent. * Jansson provides both reference-stealing and reference-borrowing versions of several API's. The Asterisk API is exclusively reference-stealing for operations that put elements into arrays and objects. * No support for doubles, since we usually don't need that. * Coming along for the ride is the ast_test_validate macro, which made the unit tests much easier to write. [1]: http://www.digip.org/jansson/ (issue ASTERISK-20887) (closes issue ASTERISK-20888) Review: https://reviewboard.asterisk.org/r/2264/ ................ r378918 \| file \| 2013-01-11 17:05:38 -0600 (Fri, 11 Jan 2013) \| 11 lines Retain XMPP filters across reconnections so external modules continue to function as expected. Previously if an XMPP client reconnected any filters added by an external module were lost. This issue exhibited itself with chan_motif not receiving and reacting to Jingle signaling. (closes issue ASTERISK-20916) Reported by: kuj ........ Merged revisions 378917 from http://svn.asterisk.org/svn/asterisk/branches/11 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378927 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Joshua Colp	c5ec471766	Retain XMPP filters across reconnections so external modules continue to function as expected. Previously if an XMPP client reconnected any filters added by an external module were lost. This issue exhibited itself with chan_motif not receiving and reacting to Jingle signaling. (closes issue ASTERISK-20916) Reported by: kuj ........ Merged revisions 378917 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378918 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
David M. Lee	7695ea2643	Add JSON API for Asterisk. This provides a JSON API by pulling in and wrapping the Jansson JSON library[1]. The Asterisk API basically mirrors the Jansson functionality, with a few minor tweaks. * Some names have been asteriskified to protect the innocent. * Jansson provides both reference-stealing and reference-borrowing versions of several API's. The Asterisk API is exclusively reference-stealing for operations that put elements into arrays and objects. * No support for doubles, since we usually don't need that. * Coming along for the ride is the ast_test_validate macro, which made the unit tests much easier to write. [1]: http://www.digip.org/jansson/ (issue ASTERISK-20887) (closes issue ASTERISK-20888) Review: https://reviewboard.asterisk.org/r/2264/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378915 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	919f772f78	Merged revisions 378889 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r378889 \| rmudgett \| 2013-01-09 20:40:50 -0600 (Wed, 09 Jan 2013) \| 8 lines * Simplify native bridge code in ast_channel_bridge(). * Fix an unbalanced manager_bridge_event(unlink) call if AST_SOFTHANGUP_UNBRIDGE is set in ast_channel_bridge(). * Make ast_channel_bridge() use common cleanup code when leaving the bridge. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378898 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	2db3cc2e26	* Simplify native bridge code in ast_channel_bridge(). * Fix an unbalanced manager_bridge_event(unlink) call if AST_SOFTHANGUP_UNBRIDGE is set in ast_channel_bridge(). * Make ast_channel_bridge() use common cleanup code when leaving the bridge. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378889 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	f7e1073af5	Merged revisions 378874 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r378874 \| rmudgett \| 2013-01-09 19:43:27 -0600 (Wed, 09 Jan 2013) \| 4 lines * Removed some noop code and restructured an else-if ladder in ast_generic_bridge(). * Trivial changes in ast_channel_bridge(). ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378883 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	e31002b9b2	* Removed some noop code and restructured an else-if ladder in ast_generic_bridge(). * Trivial changes in ast_channel_bridge(). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378874 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	41eba63840	Merged revisions 378854,378858-378859 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r378854 \| rmudgett \| 2013-01-09 17:22:00 -0600 (Wed, 09 Jan 2013) \| 1 line Fix logger.c function definition. ........ r378858 \| rmudgett \| 2013-01-09 17:23:41 -0600 (Wed, 09 Jan 2013) \| 6 lines Trivial misc bridge code changes. * softmix_bridge_thread() was redundantly initializing an 8K buffer. * Promoted a debug message to a warning in multiplexed_add_or_remove(). ........ r378859 \| rmudgett \| 2013-01-09 17:51:45 -0600 (Wed, 09 Jan 2013) \| 6 lines * Simple optimization of bridge_playfile(). * Squeezed some redundancy out of update_bridge_vars(). * Wrapped long line in __ast_change_name_nolink(). ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378868 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	8760b2644e	* Simple optimization of bridge_playfile(). * Squeezed some redundancy out of update_bridge_vars(). * Wrapped long line in __ast_change_name_nolink(). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378859 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	240fab21f9	Trivial misc bridge code changes. * softmix_bridge_thread() was redundantly initializing an 8K buffer. * Promoted a debug message to a warning in multiplexed_add_or_remove(). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378858 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	63bd8de579	Fix logger.c function definition. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378854 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Automerge script	e844969fba	Merged revisions 378840 via svnmerge from file:///srv/subversion/repos/asterisk/trunk ........ r378840 \| rmudgett \| 2013-01-09 16:56:08 -0600 (Wed, 09 Jan 2013) \| 2 lines Trivial misc bridge code changes. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378851 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago

... 3 4 5 6 7 ...

23675 Commits (05ec2860df560477546564e07058f8f9f1e17cfc) All Branches Search

23675 Commits (05ec2860df560477546564e07058f8f9f1e17cfc)

All Branches