aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-07-02Fix typos reported by Lintiantzafrir5-8/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273642 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273566 via svnmerge from russell1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r273566 | russell | 2010-07-01 17:16:23 -0500 (Thu, 01 Jul 2010) | 14 lines Merged revisions 273565 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273565 | russell | 2010-07-01 17:09:19 -0500 (Thu, 01 Jul 2010) | 7 lines Don't return a partially initialized datastore. If memory allocation fails in ast_strdup(), don't return a partially initialized datastore. Bad things may happen. (related to ABE-2415) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273571 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273522 via svnmerge from jpeeler1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r273522 | jpeeler | 2010-07-01 15:28:15 -0500 (Thu, 01 Jul 2010) | 21 lines Merged revisions 273474 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273474 | jpeeler | 2010-07-01 15:19:16 -0500 (Thu, 01 Jul 2010) | 14 lines Allow admin user to join conference without using admin mode and no user pin. Configuring the conference in meetme.conf like the following: conf => 2345,,6666 did not prompt for pin when used without admin mode. This meant that the conference could not be joined as an admin even if the user knew the correct pin. The original bug report was submitted claiming that the blank user pin should deny entry into the conference. I think a better way to handle this would be with a feature enhancement that used the following syntax: conf => 2345,X,6666 - where X denotes no acceptable pin allowed (closes issue #15704) Reported by: modelnine ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273529 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273355 via svnmerge from jpeeler1-0/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r273355 | jpeeler | 2010-07-01 10:12:31 -0500 (Thu, 01 Jul 2010) | 19 lines Merged revisions 273354 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273354 | jpeeler | 2010-07-01 10:05:43 -0500 (Thu, 01 Jul 2010) | 12 lines Ensure channel placed in meetme in ringing state is properly hung up. An outgoing channel placed in meetme while still ringing which was then hung up would not exit meetme and the channel was not properly destroyed. Specifically checking for this scenario by looking at the appropriate control frames resolves the issue. (closes issue #15871) Reported by: Ivan Patches: meetme_congestion_trunk_v2.patch uploaded by Ivan (license 229) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273356 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273352 via svnmerge from mnicholson1-10/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r273352 | mnicholson | 2010-07-01 09:37:37 -0500 (Thu, 01 Jul 2010) | 2 lines Fixed whitespace problems ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273353 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-01Merged revisions 273350 via svnmerge from mnicholson1-4/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r273350 | mnicholson | 2010-07-01 09:34:31 -0500 (Thu, 01 Jul 2010) | 2 lines Altered my comment about TCP_NODELAY ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273351 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273270 via svnmerge from mnicholson1-0/+15
https://origsvn.digium.com/svn/asterisk/trunk ........ r273270 | mnicholson | 2010-06-30 13:48:21 -0500 (Wed, 30 Jun 2010) | 2 lines Set TCP_NODELAY on manager TCP sockets to prevent delays on outgoing packets. This regression was introduced in r48338. AST-359 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273271 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273233 via svnmerge from pabelanger1-6/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r273233 | pabelanger | 2010-06-30 13:28:04 -0400 (Wed, 30 Jun 2010) | 11 lines Fix rt(c)p set debug ip taking wrong argument Also clean up some coding errors. (closes issue #17469) Reported by: wdoekes Patches: astsvn-rtp-set-debug-ip.patch uploaded by wdoekes (license 717) Tested by: wdoekes, pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273234 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Revert previous commit; res_rtp_asterisk.c does not exist.pabelanger0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273194 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Unblock revisions 218107pabelanger0-0/+0
........ r218107 | mvanbaak | 2009-09-12 15:08:16 +0200 (Sat, 12 Sep 2009) | 8 lines use the actual given ip address for 'rtp set debug ip <foo>' instead of the word 'ip' (closes issue 0015711) Reported by: davidw Patches: 2009082800-rtpdebug.diff.txt uploaded by mvanbaak (license 7) Tested by: davidw ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273193 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273144 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r273144 | tilghman | 2010-06-29 20:07:02 -0500 (Tue, 29 Jun 2010) | 8 lines Permission checking for the system application is backwards. (closes issue #17550) Reported by: kenner Patches: manager.c.diff uploaded by kenner (license 1040) Tested by: kenner ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273145 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-30Merged revisions 273142 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r273142 | tilghman | 2010-06-29 20:01:14 -0500 (Tue, 29 Jun 2010) | 5 lines Don't attempt to proceed if our internal parser indicates an invalid file. (closes issue #17560) Reported by: Nick_Lewis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273143 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 273078 via svnmerge from tilghman1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r273078 | tilghman | 2010-06-29 18:20:40 -0500 (Tue, 29 Jun 2010) | 17 lines Merged revisions 273060 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273060 | tilghman | 2010-06-29 18:15:28 -0500 (Tue, 29 Jun 2010) | 10 lines Allow the "useragent" value to be restored into memory from the realtime backend. This value is purely informational. It does not alter configuration at all. (closes issue #16029) Reported by: Guggemand Patches: realtime-useragent.patch uploaded by Guggemand (license 897) Tested by: Guggemand ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273087 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 273058 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r273058 | tilghman | 2010-06-29 17:59:51 -0500 (Tue, 29 Jun 2010) | 11 lines Recorded merge of revisions 273057 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r273057 | tilghman | 2010-06-29 17:58:58 -0500 (Tue, 29 Jun 2010) | 4 lines _Really_ skip the channel... don't just retry for another 200 cycles. (Closes issue SWP-1652, ABE-2240) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273059 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 273054 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r273054 | tilghman | 2010-06-29 17:39:22 -0500 (Tue, 29 Jun 2010) | 11 lines Send DialPlanComplete as a response, not as a separate event. Otherwise, it goes to all manager sessions and may exclude the current session, if the Events mask excludes it. (closes issue #17504) Reported by: rrb3942 Patches: showdialplan_patch.diff uploaded by rrb3942 (license 1003) Tested by: rrb3942 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273056 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-29Merged revisions 253357 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r253357 | russell | 2010-03-18 13:18:43 -0500 (Thu, 18 Mar 2010) | 8 lines Increase CLI command output timeout for asterisk -rx to 60 seconds. (closes issue #17049) Reported by: russell Tested by: russell Review: https://reviewboard.asterisk.org/r/573/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272972 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272926 via svnmerge from tilghman1-4/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r272926 | tilghman | 2010-06-28 16:50:57 -0500 (Mon, 28 Jun 2010) | 15 lines Merged revisions 272925 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272925 | tilghman | 2010-06-28 16:50:02 -0500 (Mon, 28 Jun 2010) | 8 lines Don't change ownership/group/permissions on run directory, if it already exists. (closes issue #17076) Reported by: stuarth Patches: 20100324__issue17076.diff.txt uploaded by tilghman (license 14) Tested by: stuarth ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272927 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272923 via svnmerge from tilghman1-15/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r272923 | tilghman | 2010-06-28 16:42:52 -0500 (Mon, 28 Jun 2010) | 19 lines Merged revisions 272921-272922 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272921 | tilghman | 2010-06-28 16:29:27 -0500 (Mon, 28 Jun 2010) | 8 lines Change the way that we read include files, to accommodate for changes in GCC 4.4. (closes issue #17472) Reported by: seandarcy Patches: config2.patch uploaded by nivan (license 1066) Tested by: nivan ........ r272922 | tilghman | 2010-06-28 16:38:49 -0500 (Mon, 28 Jun 2010) | 2 lines Also trim trailing blanks on #includes ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272924 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Backport applicable parts of test_astobj2 from trunk.russell1-0/+329
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272882 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272805 via svnmerge from mmichelson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r272805 | mmichelson | 2010-06-28 12:33:12 -0500 (Mon, 28 Jun 2010) | 11 lines Merged revisions 272804 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272804 | mmichelson | 2010-06-28 12:31:40 -0500 (Mon, 28 Jun 2010) | 5 lines Decode URI in contact header of 302 response. ABE-2352 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272806 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28remove accidentally added file.russell1-262/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272686 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-28Merged revisions 272684 via svnmerge from russell3-19/+282
https://origsvn.digium.com/svn/asterisk/trunk ........ r272684 | russell | 2010-06-28 10:33:32 -0500 (Mon, 28 Jun 2010) | 2 lines Use the underscore package so that underscores do not need to be escaped. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272685 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-25Merged revisions 272568 via svnmerge from tilghman1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r272568 | tilghman | 2010-06-25 15:18:47 -0500 (Fri, 25 Jun 2010) | 12 lines Merged revisions 272562 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272562 | tilghman | 2010-06-25 15:17:37 -0500 (Fri, 25 Jun 2010) | 5 lines Make the structure of the table specified before match the queries and results. (closes issue #17557) Reported by: cmaj ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272577 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-25Merged revisions 272533 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r272533 | tilghman | 2010-06-25 14:17:16 -0500 (Fri, 25 Jun 2010) | 2 lines Symlink sounds files, to save disk space, when multiple tarballs/checkouts are on the same system. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272556 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-25Backport unit test API from trunk.russell9-147/+1290
Also, update existing test modules that were already in this branch but had been converted to the unit test API in trunk. Review: https://reviewboard.asterisk.org/r/748/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272531 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-24Merged revisions 272447 via svnmerge from rmudgett1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r272447 | rmudgett | 2010-06-24 17:11:26 -0500 (Thu, 24 Jun 2010) | 17 lines Merged revisions 272446 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272446 | rmudgett | 2010-06-24 16:58:49 -0500 (Thu, 24 Jun 2010) | 10 lines ss_thread calls pri_grab without lock during overlap dial Recent changes to chan_dahdi with relation to overlap dialing call pri_grab without first obtaining a lock. (closes issue #17414) Reported by: pdf Patches: bug17414.patch uploaded by jpeeler (license 325) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272459 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272254,272256 via svnmerge from twilson2-132/+172
https://origsvn.digium.com/svn/asterisk/trunk ........ r272254 | twilson | 2010-06-23 15:53:48 -0500 (Wed, 23 Jun 2010) | 10 lines Honor the --with-${library}=path for AST_EXT_TOOL_CHECK (closes issue #16991) Reported by: pprindeville Patches: with_netsnmp.patch.txt uploaded by twilson (license 396) Tested by: twilson Review: https://reviewboard.asterisk.org/r/739/ ........ r272256 | twilson | 2010-06-23 15:59:17 -0500 (Wed, 23 Jun 2010) | 2 lines Update configure when changing autconf m4 files... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272440 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272370 via svnmerge from russell1-45/+62
https://origsvn.digium.com/svn/asterisk/trunk ........ r272370 | russell | 2010-06-23 18:09:28 -0500 (Wed, 23 Jun 2010) | 23 lines Resolve some errors produced during module unload of chan_iax2. The external test suite stops Asterisk using the "core stop gracefully" command. The logs from the tests show that there are a number of problems with Asterisk trying to cleanly shut down. This patch addresses the following type of error that comes from chan_iax2: [Jun 22 16:58:11] ERROR[29884]: lock.c:129 __ast_pthread_mutex_destroy: chan_iax2.c line 11371 (iax2_process_thread_cleanup): Error destroying mutex &thread->lock: Device or resource busy For an example in the context of a build, see: http://bamboo.asterisk.org/browse/AST-TRUNK-739/log The primary purpose of this patch is to change the thread pool shutdown procedure to be more explicit to ensure that the thread exits from a point where it is not holding a lock. While testing that, I encountered various crashes due to the order of operations in unload_module() being problematic. I reordered some things there, as well. Review: https://reviewboard.asterisk.org/r/736/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272371 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272368 via svnmerge from mnicholson1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r272368 | mnicholson | 2010-06-23 17:36:49 -0500 (Wed, 23 Jun 2010) | 16 lines Merged revisions 272367 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 This version of the patch only adds AgentComplete for attended transfers. It was already present for blind transfers. ........ r272367 | mnicholson | 2010-06-23 17:33:51 -0500 (Wed, 23 Jun 2010) | 8 lines Send AgentComplete manager events in the event of blind and attended transfers. (closes issue #16819) Reported by: elbriga Patches: app_queue.diff uploaded by elbriga (license 482) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272369 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272332 via svnmerge from tilghman1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r272332 | tilghman | 2010-06-23 16:53:49 -0500 (Wed, 23 Jun 2010) | 8 lines If there is realtime configuration, it does not get re-read on reload unless the config file also changes. (closes issue #16982) Reported by: dmitri Patches: res_musiconhold.patch uploaded by dmitri (license 1001) Tested by: atis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272333 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Revert previous commit, ast_test_flag64 does not exist in 1.6.2pabelanger1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272263 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272260 via svnmerge from tilghman4-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r272260 | tilghman | 2010-06-23 16:06:40 -0500 (Wed, 23 Jun 2010) | 8 lines Ensure a NULL file while debugging cannot crash AEL. (closes issue #17215) Reported by: vazir Patches: 20100518__issue17215.diff.txt uploaded by tilghman (license 14) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272262 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272259 via svnmerge from pabelanger1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r272259 | pabelanger | 2010-06-23 17:06:15 -0400 (Wed, 23 Jun 2010) | 2 lines Fix previous merge. ast_test_flag != ast_test_flag64 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272261 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272257 via svnmerge from pabelanger1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r272257 | pabelanger | 2010-06-23 17:00:00 -0400 (Wed, 23 Jun 2010) | 19 lines Merged revisions 272255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r272255 | pabelanger | 2010-06-23 16:57:01 -0400 (Wed, 23 Jun 2010) | 12 lines First caller into a dynamic conference now enter pin once. If MeetMe is configured to use dynamic conference numbers, then the first caller (which creates the conference) had to enter the PIN number twice. (closes issue #15878) Reported by: shawkris Patches: issue15878.patch uploaded by pabelanger (license 224) Tested by: pabelanger ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272258 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272252 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r272252 | pabelanger | 2010-06-23 16:35:45 -0400 (Wed, 23 Jun 2010) | 8 lines Correct manager variable 'EventList' case. (closes issue #17520) Reported by: kobaz Patches: manager.patch uploaded by kobaz (license 834) Tested by: lmadsen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272253 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272146 via svnmerge from twilson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r272146 | twilson | 2010-06-23 13:39:20 -0500 (Wed, 23 Jun 2010) | 2 lines Don't start the sla thread unless we realy need it ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272149 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-23Merged revisions 272109 via svnmerge from twilson1-2/+19
https://origsvn.digium.com/svn/asterisk/trunk ........ r272109 | twilson | 2010-06-23 12:21:40 -0500 (Wed, 23 Jun 2010) | 12 lines Make sure reload updates SLA config Even if there are no stations or trunks defined, we need to start the sla thread to make sure we get the reload event. Also, when doing a reload we need to remove the existing trunks and stations or they end up hanging around. (closes issue #16818) Reported by: mbonin Patches: sla_reload.patch uploaded by twilson (license 396) Tested by: twilson ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272124 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 272014 via svnmerge from dvossel1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r272014 | dvossel | 2010-06-22 17:11:50 -0500 (Tue, 22 Jun 2010) | 5 lines fixes issue with 'dialplan remove extension blah' segfaulting with tab completion (closes issue #17440) Reported by: kobaz ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@272015 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271903 via svnmerge from mnicholson1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r271903 | mnicholson | 2010-06-22 12:35:17 -0500 (Tue, 22 Jun 2010) | 15 lines Merged revisions 271902 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271902 | mnicholson | 2010-06-22 12:31:57 -0500 (Tue, 22 Jun 2010) | 8 lines Decrease the module ref count in sip_hangup when SIP_DEFER_BYE_ON_TRANSFER is set. This is necessary to keep the ref count correct. (closes issue #16815) Reported by: rain Patches: chan_sip-unref-fix.diff uploaded by rain (license 327) (modified) Tested by: rain ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271904 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271867 via svnmerge from russell2-36/+43
https://origsvn.digium.com/svn/asterisk/trunk ........ r271867 | russell | 2010-06-22 11:28:03 -0500 (Tue, 22 Jun 2010) | 7 lines Resolve some errors that occur on a graceful shutdown. Don't Finalize() if Initialize() did not succeed. This resulted in an error about trying to Finalize() an invalid handle. Also trim some trailing whitespace while in the area. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271869 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271831 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r271831 | dvossel | 2010-06-22 10:46:22 -0500 (Tue, 22 Jun 2010) | 10 lines fixes attended transfer behavior when both transferee and transferer hung up If both the transferer and transferee of a attended transfer hangup before the new channel picks up, the new channel should be hung up as well as it has no endpoint to talk to. This mirrors the expected behavior used in 1.4. (closes issue #17444) Reported by: corruptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271832 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271762 via svnmerge from mnicholson2-5/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r271762 | mnicholson | 2010-06-22 09:54:58 -0500 (Tue, 22 Jun 2010) | 15 lines Merged revisions 271761 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271761 | mnicholson | 2010-06-22 09:49:36 -0500 (Tue, 22 Jun 2010) | 9 lines Allow users to specify a port for dundi peers. (closes issue #17056) Reported by: klaus3000 Patches: dundi-peerport-patch-trunk.txt uploaded by klaus3000 (license 65) Tested by: klaus3000 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271763 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-22Merged revisions 271690 via svnmerge from mnicholson3-135/+141
https://origsvn.digium.com/svn/asterisk/trunk ................ r271690 | mnicholson | 2010-06-22 07:58:28 -0500 (Tue, 22 Jun 2010) | 18 lines Merged revisions 271689 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271689 | mnicholson | 2010-06-22 07:52:27 -0500 (Tue, 22 Jun 2010) | 8 lines Modify chan_sip's packet generation api to automatically calculate the Content-Length. This is done by storing packet content in a buffer until it is actually time to send the packet, at which time the size of the packet is calculated. This change was made to ensure that the Content-Length is always correct. (closes issue #17326) Reported by: kenner Tested by: mnicholson, kenner Review: https://reviewboard.asterisk.org/r/693/ ........ This change also adds an ast_str_copy_string() function (similar to ast_copy_string), that copies one ast_str into another, properly handling embedded nulls. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271691 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-21Merged revisions 271554 via svnmerge from jpeeler1-46/+47
https://origsvn.digium.com/svn/asterisk/trunk ................ r271554 | jpeeler | 2010-06-21 15:46:53 -0500 (Mon, 21 Jun 2010) | 14 lines Merged revisions 271552 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271552 | jpeeler | 2010-06-21 15:37:47 -0500 (Mon, 21 Jun 2010) | 7 lines Do not use sizeof to calculate size of a heap allocated character array. Change left out from 271399. (closes issue #16053) Reported by: diLLec ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271555 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-18Merged revisions 271483 via svnmerge from jpeeler3-23/+66
https://origsvn.digium.com/svn/asterisk/trunk ................ r271483 | jpeeler | 2010-06-18 16:32:09 -0500 (Fri, 18 Jun 2010) | 18 lines Merged revisions 271399 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r271399 | jpeeler | 2010-06-18 14:28:24 -0500 (Fri, 18 Jun 2010) | 11 lines Fix crash when parsing some heavily nested statements in AEL on reload. Due to the recursion used when compiling AEL in gen_prios, all the stack space was being consumed when parsing some AEL that contained nesting 13 levels deep. Changing a few large buffers to be heap allocated fixed the crash, although I did not test how many more levels can now be safely used. (closes issue #16053) Reported by: diLLec Tested by: jpeeler ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271484 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-18Merged revisions 269307 via svnmerge from jpeeler1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r269307 | rmudgett | 2010-06-09 11:54:38 -0500 (Wed, 09 Jun 2010) | 12 lines Eliminate deadlock potential in dahdi_fixup(). Calling dahdi_indicate() within dahdi_fixup() while the owner pointers are in a potentially inconsistent state is a potentially bad thing in principle. However, calling dahdi_indicate() when the channel private lock is already held can cause a deadlock if the PRI lock is needed because dahdi_indicate() will also get the channel private lock. The pri_grab() function assumes that the channel private lock is held once to avoid deadlock. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271338 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-17Merged revisions 271089 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r271089 | pabelanger | 2010-06-16 20:30:51 -0400 (Wed, 16 Jun 2010) | 5 lines option w[(secs)] incorrectly capitalized in xmldoc (closes issue #17516) Reported by: karlfife ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@271090 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16Merged revisions 270987 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r270987 | pabelanger | 2010-06-16 17:17:39 -0400 (Wed, 16 Jun 2010) | 11 lines Merged revisions 270979 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r270979 | pabelanger | 2010-06-16 17:10:05 -0400 (Wed, 16 Jun 2010) | 4 lines Fixed typo in macro-page Reported to #asterisk-dev by a student of jsmith. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@270997 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16Merged revisions 270981 via svnmerge from qwell1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r270981 | qwell | 2010-06-16 16:10:48 -0500 (Wed, 16 Jun 2010) | 11 lines Merged revisions 270980 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r270980 | qwell | 2010-06-16 16:10:09 -0500 (Wed, 16 Jun 2010) | 4 lines Need to lock the agent chan before access its internal bits. Pointed out by russellb on asterisk-dev mailing list. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@270982 f38db490-d61c-443f-a65b-d21fe96a405b
2010-06-16Merged revisions 270974 via svnmerge from mnicholson2-9/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r270974 | mnicholson | 2010-06-16 15:34:31 -0500 (Wed, 16 Jun 2010) | 8 lines Set sin_family to AF_INET when doing lookups, also reset sin_port the first time the ip address changes. (closes issue #17496) Reported by: ManChicken (closes issue #15827) Reported by: DennisD Patches: dnsmgr_15827.patch uploaded by chappell (license 8) Tested by: DennisD, gentlec, damage, wimpy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@270975 f38db490-d61c-443f-a65b-d21fe96a405b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 09:52:27 +0000