aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-05-09Merged revisions 318148 via svnmerge from jrose1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r318148 | jrose | 2011-05-09 09:18:14 -0500 (Mon, 09 May 2011) | 4 lines Documenting an observed behavior of features in features.conf. Since parkinglots use an integer for the parkinglot extensions, leading zeros specified in the configuration file are ignored. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318162 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-09Merged revisions 318142 via svnmerge from mnicholson1-1/+3
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r318142 | mnicholson | 2011-05-09 09:09:38 -0500 (Mon, 09 May 2011) | 9 lines Make indicate/control frames WRITE events on framehooks. Also, if a framehook returns a non-control frame, don't forward it to the channel. (closes issue #19251) Reported by: irroot Patches: (modified) framehook_indicate.patch2 uploaded by irroot (license 52) Tested by: irroot ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318143 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-09Allows ParkedCall application to specify a parkinglot.jrose2-4/+40
When invoking the app parkedcall, the argument can now include '@parkinglot' after the extension. (closes issue #18777) Reported by: cartama Patches: 0018777.diff uploaded by cartama (license 1157) Review: https://reviewboard.asterisk.org/r/1209/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318141 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-09Add setsubstate_callwait.wedhorn1-2/+31
If a call is made to a line that already has a call and the device is offhook (ie activeish call), the call is set to CALLWAIT rather than RINGIN. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318106 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-07Merged revisions 318057 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r318057 | russell | 2011-05-07 18:35:37 -0500 (Sat, 07 May 2011) | 8 lines res_config_curl: fix a crash with static realtime. (closes issue #18413) Reported by: jmls Patches: 20101202__issue18413.diff.txt uploaded by tilghman (license 14) Tested by: jmls ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318058 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-07Merged revisions 318055 via svnmerge from russell1-1/+3
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r318055 | russell | 2011-05-07 18:24:18 -0500 (Sat, 07 May 2011) | 7 lines chan_iax2: Don't overwrite port found with an SRV lookup. (closes issue #17291) Reported by: jcovert Patches: chan_iax2.c.1.8.3-srvlookup-corrected.patch uploaded by jcovert (license 551) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318056 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Only allow voicemail if substate is OFFHOOK or no channel active (UNSET).wedhorn1-5/+11
(closes issue #17901) Reported by: salecha git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318019 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Rename sub->parent to sub->line.wedhorn1-45/+45
Improve readability of code, eg, (sub->parent == d->activeline) becomes (sub->line == d->activeline). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@318018 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Move the hookstate from line to device.wedhorn1-36/+33
Long time coming, finally moving the hookstate from line to device. This may fix some issues where a device has multiple lines. Previously we had to run through all lines on a device to see if it was actually onhook or not. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317996 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317969 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317969 | russell | 2011-05-06 16:49:01 -0500 (Fri, 06 May 2011) | 10 lines Use the right variable to print the time in a debug message. The original patch also increased some buffer sizes, but that was already done in this version. (closes issue #17034) Reported by: sysreq Patches: asterisk-issue-17034.patch uploaded by sysreq (license 1009) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317970 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317967 via svnmerge from russell1-6/+0
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317967 | russell | 2011-05-06 16:38:54 -0500 (Fri, 06 May 2011) | 2 lines Fix some more "set but unused" compiler warnings. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317968 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317918 via svnmerge from dvossel1-3/+3
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317918 | dvossel | 2011-05-06 16:06:55 -0500 (Fri, 06 May 2011) | 7 lines Fixes missing colon from To/From headers in RTCP manager events. (closes issue #18221) Reported by: clegall_proformatique Patches: 18221_1.patch uploaded by ebroad (license 878) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317920 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317917 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317917 | russell | 2011-05-06 16:06:33 -0500 (Fri, 06 May 2011) | 7 lines Fix calculation of free RAM to make minmemfree option work. (closes issue #17124) Reported by: loic Patches: pbx_c.diff uploaded by loic (license 1020) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317919 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Add a cdr_csv to MySQL import script to contrib/scripts.russell1-0/+81
(closes issue #17036) Reported by: precisenetworks Patches: import-cdr-csv-mysql.pl uploaded by precisenetworks (license 1010) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317916 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Add the Uniqueid header to Userevent.russell2-1/+7
(closes issue #16962) Reported by: jlpedrosa Patches: patch.diff uploaded by jlpedrosa (license 1002) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317915 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317867 via svnmerge from russell1-1/+2
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317867 | russell | 2011-05-06 15:01:16 -0500 (Fri, 06 May 2011) | 10 lines chan_sip: Destroy variables on a sip_pvt before copying vars from the sip_peer. Don't duplicate variables on the sip_pvt. Just reset the variable list each time. (closes issue #19202) Reported by: wdoekes Patches: issue19202_destroy_challenged_invite_chanvars.patch uploaded by wdoekes (license 717) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317868 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317865 via svnmerge from russell1-4/+5
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317865 | russell | 2011-05-06 14:46:49 -0500 (Fri, 06 May 2011) | 11 lines chan_sip: fix a deadlock in check_rtp_timeout. Don't block doing silly deadlock avoidance. Just return and try again later. The funciton gets called often enough that it's fine. Also, this change was already made in trunk. (closes issue #18791) Reported by: irroot Patches: chan_sip.rtptimeout.patch uploaded by irroot (license 52) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317866 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Blocked revisions 317861 via svnmergerussell0-0/+0
........ r317861 | russell | 2011-05-06 14:35:00 -0500 (Fri, 06 May 2011) | 11 lines URI encode less characters in the RPID and Contact headers. If this change causes any problems, we will need to backport the more extensive uri encoding and decoding handling changes that are in trunk/1.10. (closes issue #18686) Reported by: wolfgang Patches: quick-and-dirty.patch uploaded by wdoekes (license 717) Tested by: wdoekes, devellow, wolfgang, mav3rick ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317862 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Blocked revisions 317858 via svnmergemnicholson0-0/+0
........ r317858 | mnicholson | 2011-05-06 14:31:50 -0500 (Fri, 06 May 2011) | 6 lines pbx_lua autoservice fixes Don't start an autoservice in pbx_lua if pbx_lua already started one and don't stop one if we didn't start one. Also start and stop the autoservice when transferring control from and to the pbx. ........ This change is already implemented in trunk. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317860 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317837 via svnmerge from russell1-1/+5
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317837 | russell | 2011-05-06 14:24:11 -0500 (Fri, 06 May 2011) | 11 lines Fix a crash in the MySQL() application. This code was not handling channel datastores safely. The channel must be locked. (closes issue #17964) Reported by: wuwu Patches: issue17964_addon_1.6.2_svn.patch uploaded by seanbright (license 71) Tested by: wuwu ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317843 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Updated CHANGES to note the autoservice changes for pbx_luamnicholson1-0/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317833 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Updated the sample pbx_lua config file to reflect autoservice changes.mnicholson1-6/+8
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317818 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317805 via svnmerge from russell1-51/+93
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317805 | russell | 2011-05-06 14:14:39 -0500 (Fri, 06 May 2011) | 7 lines Add a new sipfriends.sql for MySQL that has more fields in it. (closes issue #16399) Reported by: pabelanger Patches: sipfriends.sql.v3 uploaded by pabelanger (license 224) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317807 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Default to starting an autoservice in pbx_lua. The autoservice ismnicholson2-1/+2
automatically stopped when applications are executed, so this shouldn't cause any problems. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317806 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Make pbx_lua handle managing the autoservice better.mnicholson2-18/+36
Make autoservice_start() and autoservice_stop() return nothing. Also check if the autoservice flag is set before starting or stopping the autoservice and stop and start the autoservice when returning control to and getting control from the pbx engine. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317803 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Added note about changes in pbx_lua's behavior when applications do dialplan ↵mnicholson1-0/+6
jumps git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317802 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Use two spaces after periods for the recent pbx_lua change descriptionsmnicholson1-3/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317723 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Updated CHANGES for hints support in pbx_luamnicholson1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317722 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Detect Goto in pbx_lua.mnicholson2-0/+81
This code will actually detect any dialplan jump from any application that calls ast_explicit_goto(). This change is only being done in trunk as it may change the way some dialplans execute. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317721 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317670 via svnmerge from rmudgett1-69/+105
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317670 | rmudgett | 2011-05-06 11:19:18 -0500 (Fri, 06 May 2011) | 22 lines Fix SIP connected line updates. This patch fixes a couple SIP connected line update problems: 1) The connected line needs to be updated when the initial INVITE is sent if there is a peer callerid configured. Previously, the connected line information did not get reported until the call was connected so SIP could not report connected line information in ringing or progress messages. 2) The connected line should not be updated on initial connect if there is no connected line information. Previously, all it did was wipe out any default preset CONNECTEDLINE information set by the dialplan with empty strings. (closes issue #18367) Reported by: GeorgeKonopacki Patches: issue18367_v1.8.patch uploaded by rmudgett (license 664) Tested by: rmudgett Review: https://reviewboard.asterisk.org/r/1199/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317671 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-06Merged revisions 317584 via svnmerge from twilson1-0/+11
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r317584 | twilson | 2011-05-06 01:18:53 -0700 (Fri, 06 May 2011) | 20 lines Merged revisions 317575 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r317575 | twilson | 2011-05-06 01:04:17 -0700 (Fri, 06 May 2011) | 13 lines Merged revisions 317574 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r317574 | twilson | 2011-05-06 00:55:21 -0700 (Fri, 06 May 2011) | 6 lines Re-fix queue round-robin This part of the change for r315596 was incorrect. No bridge occurs when doing a roundrobin dial and no one answers, so this code shouldn't have been removed. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317596 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317530 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317530 | russell | 2011-05-05 18:46:54 -0500 (Thu, 05 May 2011) | 10 lines If the configure script runs, force a rebuild of menuselect-tree. Some contents in the menuselect tree are dependent on configure script parameters, namely --enable-dev-mode. (closes issue #17219) Reported by: Nick_Lewis Patches: issue_17219.rev1.txt uploaded by russell (license 2) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317531 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317486 via svnmerge from russell2-1/+2
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317486 | russell | 2011-05-05 18:15:53 -0500 (Thu, 05 May 2011) | 9 lines Fix some more realtime MySQL schema issues. (closes issue #18537) Reported by: denzs Patches: sipfriends.sql.svndiff uploaded by denzs (license 1182) queue_log.sql.svndiff uploaded by denzs (license 1182) meetme.sql.svndiff uploaded by denzs (license 1182) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317487 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317484 via svnmerge from russell2-4/+4
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317484 | russell | 2011-05-05 18:12:35 -0500 (Thu, 05 May 2011) | 8 lines Fix some errors in sample MySQL realtime schema files. (closes issue #18915) Reported by: Dovid Patches: sipfriends.patch uploaded by Dovid (license 652) meetme.patch uploaded by Dovid (license 652) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317485 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Add "calendar show types" CLI command.russell2-0/+32
(closes issue #18246) Reported by: junky Patches: calendar_types.diff uploaded by junky (license 177) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317483 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Add CEL extra field to cel_pgsql.russell4-1/+12
(closes issue #18462) Reported by: joscas Patches: bug_18462.diff uploaded by snuffy (license 35) cel_pgsql.conf.sample.issue18462.patch uploaded by joscas (license 1180) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317482 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317480 via svnmerge from russell1-2/+4
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317480 | russell | 2011-05-05 18:00:55 -0500 (Thu, 05 May 2011) | 8 lines Don't lose cdr_syslog config on a reload. (closes issue #18679) Reported by: enegaard Patches: issue18679_seanbright.patch uploaded by seanbright (license 71) Tested by: enegaard ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317481 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317478 via svnmerge from russell11-74/+86
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317478 | russell | 2011-05-05 17:53:45 -0500 (Thu, 05 May 2011) | 12 lines Fix some consistency issues with jitterbuffer config. Store the defaults noted in the sample config files in the jitterbuffer config data structure. This makes the CLI commands that output these settings show the right thing. Also only show the settings that are relevant in the settings CLI commands, based on which jitterbuffer is selected and whether it's enabled. (closes issue #19083) Reported by: rgagnon Patches: issue-19083-trunk-r313139.diff uploaded by rgagnon (license 1202) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317479 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317476 via svnmerge from russell1-0/+17
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317476 | russell | 2011-05-05 17:47:57 -0500 (Thu, 05 May 2011) | 8 lines Add a datastore fixup to fix a pbx_lua crash. (closes issue #19055) Reported by: jamhed Patches: lua_datastore_fixup1.diff uploaded by mnicholson (license 96) Tested by: mnicholson, jamhed ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317477 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317474 via svnmerge from russell14-72/+48
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317474 | russell | 2011-05-05 17:36:33 -0500 (Thu, 05 May 2011) | 2 lines Fix more "set but unused" warnings. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317475 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317429 via svnmerge from russell1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317429 | russell | 2011-05-05 17:11:19 -0500 (Thu, 05 May 2011) | 5 lines Only display inband DTMF warning if inband DTMF detection is enabled. (closes issue #18901) Reported by: irroot ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317430 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317427 via svnmerge from russell1-2/+6
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317427 | russell | 2011-05-05 16:58:45 -0500 (Thu, 05 May 2011) | 7 lines Fix potential memory leak, and use of uninitialized memory. (closes issue #16476) Reported by: junky Patches: M16476.diff uploaded by junky (license 177) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317428 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317425 via svnmerge from russell1-8/+16
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317425 | russell | 2011-05-05 16:53:13 -0500 (Thu, 05 May 2011) | 7 lines Add missing ActioID handling to Events action. (closes issue #18949) Reported by: edersohe Patches: 0018949.patch uploaded by edersohe (license 1228) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317426 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Add some new editline bindings by default, and allow for user specified ↵seanbright1-2/+20
configuration. I excluded the part of this patch that used the HOME environment variable since the built-in editline library goes to great lengths to disallow that. Instead only settings the EDITRC environment variable will use a user specified file. Also, the default environment variable use to determine the edit more is AST_EDITMODE instead of AST_EDITOR (although the latter is still supported). (closes issue #15929) Reported by: kkm Patches: astcli-editrc-v2.diff uploaded by kkm (license 888) 015929-astcli-editrc-trunk.240324.diff uploaded by kkm (license 888) Tested by: seanbright git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317395 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Move hold stuff to the setsubstate arrangement.wedhorn1-65/+31
skinny_hold moved to setsubstate_hold and skinny_unhold integrated into setsubstate_connected. Removed sub->onhold and replaced with SUBSTATE_HOLD. Also fixed inbound call answering by queueing an AST_CONTROL_ANSWER on answering a SUBSTATE_RINGIN sub (was a typo). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317382 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317370 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317370 | seanbright | 2011-05-05 16:25:52 -0400 (Thu, 05 May 2011) | 10 lines Don't duplicate our data on the stack and just use the MYSQL_ROW directly. With large result sets we were blowing out the stack. (closes issue #19090) Reported by: mickecarlsson Patches: issue19090_trunk_svn.patch uploaded by seanbright (license 71) Tested by: mickecarlsson ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317377 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317336 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317336 | russell | 2011-05-05 14:55:58 -0500 (Thu, 05 May 2011) | 7 lines Increase buffer size to be PATH_MAX for a path. (closes issue #19239) Reported by: byronclark Patches: queue_announce_length.patch uploaded by byronclark (license 1200) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317337 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317283 via svnmerge from jrose1-1/+2
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317283 | jrose | 2011-05-05 14:09:13 -0500 (Thu, 05 May 2011) | 10 lines Resolves a deadlock that occurs during sip_new This is based on an uncommitted patch by jpeeler for the issue. Instead of relocking and then unlocking the channel though, we keep the lock on the channel until we are finished doing what we need to the channel. (closes issue #18441) Reported by: Alric ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317334 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317281 via svnmerge from russell1-2/+9
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r317281 | russell | 2011-05-05 13:39:44 -0500 (Thu, 05 May 2011) | 29 lines Merged revisions 317255 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r317255 | russell | 2011-05-05 13:29:53 -0500 (Thu, 05 May 2011) | 22 lines Merged revisions 317211 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r317211 | russell | 2011-05-05 13:20:29 -0500 (Thu, 05 May 2011) | 15 lines chan_sip: fix broken realtime peer count, fix memory leak This patch addresses two bugs in chan_sip: 1) The count of realtime peers and users was off. The increment checked the value of the caching option, while the decrement did not. 2) Add a missing regfree() for a regex. (closes issue #19108) Reported by: vrban Patches: missing_regfree.patch uploaded by vrban (license 756) sip_object_counter.patch uploaded by vrban (license 756) ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317282 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-05Merged revisions 317196 via svnmerge from mnicholson1-0/+6
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317196 | mnicholson | 2011-05-05 13:02:52 -0500 (Thu, 05 May 2011) | 8 lines Set SO_KEEPALIVE on SIP TCP sockets so that they eventually go away when a peer abruptly disappears. This mostly occurs after a successful registration. (closes issue #17544) Reported by: marcelloceschia Patches: (modified) tcptls.patch uploaded by st (license 907) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317198 f38db490-d61c-443f-a65b-d21fe96a405b