Commit Graph

20491 Commits

Author SHA1 Message Date
Matthew Nicholson 269989c50f Altered my comment about TCP_NODELAY
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-01 14:34:31 +00:00
Matthew Nicholson 57d9f8e42d Don't free written frames in chan_mobile's mbl_write() function.
(closes issue #16430)
Reported by: azbest
Tested by: azbest



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-01 12:57:18 +00:00
Matthew Nicholson 2dc3b3a8c2 Set TCP_NODELAY on manager TCP sockets to prevent delays on outgoing packets. This regression was introduced in r48338.
AST-359


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 18:48:21 +00:00
Paul Belanger 6012128a48 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: https://origsvn.digium.com/svn/asterisk/trunk@273233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 17:28:04 +00:00
Richard Mudgett 25156a326d Remove unnecessary if test in CV_DSTR()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 17:17:05 +00:00
Richard Mudgett 522ea689c4 Misc doxygen cleanup in config.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 17:15:46 +00:00
Tilghman Lesher aed189605b 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: https://origsvn.digium.com/svn/asterisk/trunk@273144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 01:07:02 +00:00
Tilghman Lesher c8b8c90f99 Don't attempt to proceed if our internal parser indicates an invalid file.
(closes issue #17560)
 Reported by: Nick_Lewis


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-30 01:01:14 +00:00
Tilghman Lesher 62a3133df2 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: https://origsvn.digium.com/svn/asterisk/trunk@273078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-29 23:20:40 +00:00
Tilghman Lesher 60eb82c2be 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: https://origsvn.digium.com/svn/asterisk/trunk@273058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-29 22:59:51 +00:00
Tilghman Lesher 0f9e53b6ef Exclude libical for insufficient versions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@273055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-29 22:40:00 +00:00
Tilghman Lesher a3342f0c67 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: https://origsvn.digium.com/svn/asterisk/trunk@273054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-29 22:39:22 +00:00
David Vossel 64ae2e1e2a send a 400 Bad Request on malformed sip request
RFC 2361 section 24.4.1 send a 400 Bad Request if the request
can not be understood due to malformed syntax.  Currently we
simply ignore a packet with a missing callid, to, from, or
via header.  Instead of ignoring we now send the 400 Bad request.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-29 20:44:05 +00:00
Tilghman Lesher 1555c082e3 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: https://origsvn.digium.com/svn/asterisk/trunk@272926 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 21:50:57 +00:00
Tilghman Lesher cbc311cd8f 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: https://origsvn.digium.com/svn/asterisk/trunk@272923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 21:42:52 +00:00
David Vossel 8a07dbf95d rfc compliant sip option parsing + new unit test
RFC 3261 section 8.2.2.3 states that if any unsupported options
are found in the Require header field, a "420 (Bad Extension)"
response should be sent with an Unsupported header field containing
only the unsupported options.

This is not currently being done correctly.  Right now, if Asterisk
detects any unsupported sip options in a Require header the entire
list of options are returned in the Unsupported header even if some
of those options are in fact supported.  This patch fixes that by
building an unsupported options character buffer when parsing the
options that can be sent with the 420 response.  A unit test verifying
this functionality has been created.  Some code refactoring was required.

Review: https://reviewboard.asterisk.org/r/680/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 18:38:47 +00:00
Mark Michelson dc877759cb 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: https://origsvn.digium.com/svn/asterisk/trunk@272805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 17:33:12 +00:00
Russell Bryant 910cd8be1d Use the underscore package so that underscores do not need to be escaped.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 15:33:32 +00:00
David Vossel 43871a926b code guidelines cleanup for retrans_pkt() function
I am doing work in this function.  I noticed a large number of
coding guidline fixes that needed to be made.  Rather than have
those changes distract from my functional changes I decided
to separate these into a separate patch.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-28 14:55:25 +00:00
Tilghman Lesher 7aa382b53f 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: https://origsvn.digium.com/svn/asterisk/trunk@272568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-25 20:18:47 +00:00
Matthew Nicholson 480b7e43ca Implemement support for handling multiple documents when sending.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-25 19:42:54 +00:00
David Vossel aa428b8967 chan_sip: more accurate retransmissions
RFC3261 states that Timer A should start at 500ms (T1) by default.
In chan_sip this value initially started at 1000ms and I changed
it to 500ms recently. After doing that I noticed in my packet
captures that it still occasionally retransmitted starting at
1000ms instead of 500ms like I told it to.  This occurs because
the scheduler runs in the do_monitor thread.  If a new retransmission
is added while the do_monitor thread is sleeping then it may not
detect that retransmission for nearly 1000ms.  To fix this I just
poke the do_monitor thread to wake up when a new packet is sent
reliably requiring retransmits.  The thread then detects the new
scheduler entry and adjusts its sleep time to account for it.

Review: https://reviewboard.asterisk.org/r/747



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-25 19:39:53 +00:00
Tilghman Lesher 041932c6c6 Symlink sounds files, to save disk space, when multiple tarballs/checkouts are on the same system.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-25 19:17:16 +00:00
Richard Mudgett 30888f913d 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: https://origsvn.digium.com/svn/asterisk/trunk@272447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-24 22:11:26 +00:00
Russell Bryant 450f4ff2ee 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: https://origsvn.digium.com/svn/asterisk/trunk@272370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 23:09:28 +00:00
Matthew Nicholson cb22af3ec5 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: https://origsvn.digium.com/svn/asterisk/trunk@272368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 22:36:49 +00:00
Tilghman Lesher 621a86db18 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: https://origsvn.digium.com/svn/asterisk/trunk@272332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:53:49 +00:00
Tilghman Lesher 9ec4987d3b 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: https://origsvn.digium.com/svn/asterisk/trunk@272260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:06:40 +00:00
Paul Belanger 90c850b5b1 Fix previous merge. ast_test_flag != ast_test_flag64
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:06:15 +00:00
Paul Belanger affec518d6 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: https://origsvn.digium.com/svn/asterisk/trunk@272257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 21:00:00 +00:00
Terry Wilson 9328d05d90 Update configure when changing autconf m4 files...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 20:59:17 +00:00
Terry Wilson e7d3a5edfa 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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 20:53:48 +00:00
Paul Belanger c9a0c500ae 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: https://origsvn.digium.com/svn/asterisk/trunk@272252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 20:35:45 +00:00
Paul Belanger f044ccbb16 Add localization support for Spanish
(closes issue #17548)
Reported by: cjacobsen
Patches:
      say.conf.sample.diff uploaded by cjacobsen (license 1029)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 20:22:44 +00:00
Tim Ringenbach c6b7eae5e6 Add new AMI command LocalOptimizeAway.
This command lets you request a "/n" local channel
optimize itself out of the way anyway.

Review: https://reviewboard.asterisk.org/r/732/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 19:59:43 +00:00
Tilghman Lesher 48ae8ded89 D'oh! Defaultenabled FTL.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 18:45:18 +00:00
Tilghman Lesher 7cd0856d00 Recorded merge of revisions 272147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r272147 | tilghman | 2010-06-23 13:40:28 -0500 (Wed, 23 Jun 2010) | 5 lines
  
  Backport part of revision 136715 to fix callerid in voicemail text files (IMAP only).
  
  (closes issue #16945)
   Reported by: mneuhauser
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 18:41:18 +00:00
Terry Wilson 2bcef29e11 Don't start the sla thread unless we realy need it
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 18:39:20 +00:00
Tilghman Lesher cae6fa66ed Load all lines from realtime, not just the first one.
(closes issue #17144)
 Reported by: nahuelgreco
 Patches: 
       20100513__issue17144__trunk.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 18:25:54 +00:00
Terry Wilson 7938510af9 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: https://origsvn.digium.com/svn/asterisk/trunk@272109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 17:21:40 +00:00
Mark Michelson 2c798f321a Add extra protection for reinvite glare scenario.
Testing proved that if Asterisk sent a connected line reinvite, and
the endpoint to which the reinvite were being sent sent a reinvite, Asterisk
would not properly respond with a 491 response.

The reason is that on connected line reinvites, we set the dialog's invitestate
to INV_CALLING to prevent Asterisk from sending a rapid flurry of connected line
reinvites. For other reinvites we do not do this. Because of the current invitestate,
when Asterisk received the reinvite, we interpreted this as a spiraled INVITE, and thus
did not behave properly.

The fix for this is to not enter the loop detection or spiral logic in handle_request_invite
if the channel state is currently up. This way, no mid-call reinvites will be misinterpreted,
no matter what the nature of the reinvite may have been.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-23 17:08:34 +00:00
Russell Bryant 746d8e6013 Don't try to lock/unlock an uninitialized lock on a dahdi_pri.
This small changes prevents destroy_all_channels() from accessing a lock on an
unused dahdi_pri struct, resolving a ton of ERRORs that get spewed out when
shutting Asterisk down gracefully.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 23:20:37 +00:00
David Vossel 3f00e3ff03 fixes issue with 'dialplan remove extension blah' segfaulting with tab completion
(closes issue #17440)
Reported by: kobaz


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@272014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 22:11:50 +00:00
David Vossel 1509737580 ignore CANCEL request after having already received final response to INVITE
RFC 3261 section 9 states that a CANCEL has no effect on a
request to a UAS that has already given a final response.  This
patch checks to make sure there is a pending invite before
allowing a CANCEL request to be processed, otherwise it responds
to the CANCEL with a "481 Call/Transaction Does Not Exist".

Review: https://reviewboard.asterisk.org/r/697/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 20:37:05 +00:00
David Vossel 3a875d8524 minor fixes for white/black event filters
This fixes a ref count leak in event filters and checks for
a filter container allocation failure during session creation.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 17:57:28 +00:00
Matthew Nicholson 5f45ca4d50 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: https://origsvn.digium.com/svn/asterisk/trunk@271903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 17:35:17 +00:00
Jeff Peeler 42c24b585a Add regular expression filtering for manager events.
This patch as documented in the sample config allows one to optionally apply
white, black, or both types of filtering to manager events. The new
'eventfilter' option is set per user.

(closes issue #14861)
Reported by: fnordian
Patches: 
      eventfilter3.patch uploaded by fnordian (license 110),
      modified by me

Review: https://reviewboard.asterisk.org/r/673/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 16:29:18 +00:00
Russell Bryant 294c78a27e 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: https://origsvn.digium.com/svn/asterisk/trunk@271867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 16:28:03 +00:00
Russell Bryant 9cc7c55578 Change the method of retrieving the Asterisk version string.
Using this method makes it so res_fax doesn't have to be rebuilt on every
svn update.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@271833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 16:17:14 +00:00
David Vossel 6d82dbb905 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: https://origsvn.digium.com/svn/asterisk/trunk@271831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-06-22 15:46:22 +00:00