Commit Graph

17216 Commits

Author SHA1 Message Date
Mark Michelson
9341e2212c Recorded merge of revisions 202574 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202574 | mmichelson | 2009-06-23 10:11:47 -0500 (Tue, 23 Jun 2009) | 8 lines
  
  Blocked revisions 202572 via svnmerge
  
  ........
    r202572 | mmichelson | 2009-06-23 10:08:27 -0500 (Tue, 23 Jun 2009) | 3 lines
    
    Fix potential memory leak in chan_sip when video rtp is not allocated properly.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-23 15:15:30 +00:00
Russell Bryant
a03fe391fb Merged revisions 202497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202497 | russell | 2009-06-22 15:11:04 -0500 (Mon, 22 Jun 2009) | 11 lines
  
  Merged revisions 202496 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202496 | russell | 2009-06-22 15:08:53 -0500 (Mon, 22 Jun 2009) | 4 lines
    
    Report CallerID change during a masquerade.
    
    Reported by: markster
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 20:12:29 +00:00
Sean Bright
5e6fbf81c7 Merged revisions 202417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202417 | seanbright | 2009-06-22 12:09:50 -0400 (Mon, 22 Jun 2009) | 4 lines
  
  Fix lock usage in cdr_sqlite3_custom to avoid potential crashes during reload.
  
  Pointed out by Russell while working on the CEL branch.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 16:30:58 +00:00
Russell Bryant
eca12f6e13 Merged revisions 202415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202415 | russell | 2009-06-22 11:05:08 -0500 (Mon, 22 Jun 2009) | 9 lines
  
  Merged revisions 202414 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines
    
    Make Polycom subscription type override check more explicit.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 16:06:43 +00:00
David Vossel
9f41725a79 Blocked revisions 202410 via svnmerge
........
  r202410 | dvossel | 2009-06-22 10:33:35 -0500 (Mon, 22 Jun 2009) | 5 lines
  
  attempting to load running modules
  
  Modules placed in the priority heap for loading were not properly removed from the linked list.  This resulted in some modules attempting to load twice.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 15:42:34 +00:00
Mark Michelson
25b0edc60a Merged revisions 202343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202343 | mmichelson | 2009-06-22 09:58:24 -0500 (Mon, 22 Jun 2009) | 36 lines
  
  Merged revisions 202341-202342 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202341 | mmichelson | 2009-06-22 09:42:55 -0500 (Mon, 22 Jun 2009) | 26 lines
    
    Fix a situation in which Asterisk would not stop retransmitting 487s.
    
    If a CANCEL were received by Asterisk, we would send a 487 in response
    to the original INVITE and a 200 OK for the CANCEL. If there were a network
    hiccup which caused the 200 OK and the 487 to be lost, then the UA communicating
    with Asterisk may try to retransmit its CANCEL. Asterisk's response to this used
    to be to try sending another 487 to the canceled INVITE and another 200 OK to the
    CANCEL.
    
    The problem here is that the originally-sent 487 was sent "reliably" meaning that
    it will be retransmitted until it is received properly. So when we receive the second
    CANCEL it is likely that the first batch of 487s we sent is still going strong and
    reaches the UA. The result was that the second set of 487s would be retransmitted
    constantly until the maximum number of retries had been reached.
    
    The fix for this is that if we receive a second CANCEL for an INVITE, then we cancel
    the retransmission of the first set of 487s and start a second set. This causes the
    dialog to be terminated reasonably.
    
    (closes issue #14584)
    Reported by: klaus3000
    Patches:
          14584_v2.patch uploaded by mmichelson (license 60)
    Tested by: klaus3000
  ........
    r202342 | mmichelson | 2009-06-22 09:44:58 -0500 (Mon, 22 Jun 2009) | 3 lines
    
    Remove an extra debug line left from previous commit.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 15:05:00 +00:00
Mark Michelson
03f46e7a81 Merged revisions 202337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202337 | mmichelson | 2009-06-22 09:35:09 -0500 (Mon, 22 Jun 2009) | 31 lines
  
  Merged revisions 202336 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202336 | mmichelson | 2009-06-22 09:34:05 -0500 (Mon, 22 Jun 2009) | 25 lines
    
    Fix a possible infinite loop in SDP parsing during glare situation.
    
    There was a while loop in get_ip_and_port_from_sdp which was controlled
    by a call to get_sdp_iterate. The loop would exit either if what we were
    searching for was found or if the return was NULL. The problem is that
    get_sdp_iterate never returns NULL. This means that if what we were searching
    for was not present, the loop would run infinitely. This modification of the
    loop fixes the problem.
    
    (closes issue #15213)
    Reported by: schmidts
    
    (closes issue #15349)
    Reported by: samy
    
    (closes issue #14464)
    Reported by: pj
    
    (closes issue #15345)
    Reported by: aragon
    Patches:
          sip_inf_loop.patch uploaded by mmichelson (license 60)
    Tested by: aragon
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 14:35:35 +00:00
Russell Bryant
c364f6af66 Merged revisions 202262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202262 | russell | 2009-06-21 11:11:48 -0500 (Sun, 21 Jun 2009) | 2 lines
  
  Fix possibility of crashiness during reload in custom fields handling.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-21 16:14:05 +00:00
Russell Bryant
a6429678a3 Merged revisions 202258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202258 | russell | 2009-06-21 11:00:23 -0500 (Sun, 21 Jun 2009) | 2 lines
  
  Standardize return values of load_config() so reload() doesn't report an error on success.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-21 16:02:50 +00:00
Sean Bright
eef330e9d9 Merged revisions 202183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202183 | seanbright | 2009-06-20 15:09:47 -0400 (Sat, 20 Jun 2009) | 5 lines
  
  Fix version detection for API changes in spandsp.
  
  (closes issue #15355)
  Reported by: deuffy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-20 19:14:20 +00:00
Matthew Nicholson
93017afcc8 Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
Review: https://reviewboard.asterisk.org/r/287/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 21:07:53 +00:00
David Vossel
ac6ab2899d Merged revisions 201994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201994 | dvossel | 2009-06-19 15:24:37 -0500 (Fri, 19 Jun 2009) | 14 lines
  
  Merged revisions 201993 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201993 | dvossel | 2009-06-19 15:22:02 -0500 (Fri, 19 Jun 2009) | 8 lines
    
    timestamp was being converted to host order as a short rather than a long
    
    (closes issue #15361)
    Reported by: ffloimair
    Patches:
          ts_issue.diff uploaded by dvossel (license 671)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 20:27:31 +00:00
Matthew Nicholson
74bc7c2a28 Blocked revisions 201717 via svnmerge
........
  r201717 | mnicholson | 2009-06-18 12:41:09 -0500 (Thu, 18 Jun 2009) | 4 lines
  
  Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
  
  Review: https://reviewboard.asterisk.org/r/285/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 17:42:13 +00:00
Tilghman Lesher
fca68adb95 Merged revisions 201829 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201829 | tilghman | 2009-06-18 19:43:41 -0500 (Thu, 18 Jun 2009) | 13 lines
  
  Merged revisions 201828 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201828 | tilghman | 2009-06-18 19:40:41 -0500 (Thu, 18 Jun 2009) | 6 lines
    
    If the "h" extension fails, give it another chance in main/pbx.c.
    If the "h" extension fails, give it another chance in main/pbx.c, when it
    returns from the bridge code.  Fixes an issue where the "h" extension may
    occasionally not fire, when a Dial is executed from a Macro.
    Debugged in #asterisk with user tompaw.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 00:44:18 +00:00
Tilghman Lesher
287972bc55 Merged revisions 201783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201783 | tilghman | 2009-06-18 15:52:36 -0500 (Thu, 18 Jun 2009) | 6 lines
  
  One of the changes in 1.6.1 was to allow app_directory to use functionality
  within app_voicemail for directory functions.  It is therefore no longer
  necessary for app_directory to be linked against the ODBC libraries (and it
  never was necessary for app_directory to be linked against IMAP, though it
  was).
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 20:59:16 +00:00
David Vossel
986be7d2a2 Merged revisions 201678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  fixes some memory leaks and redundant conditions
  
  (closes issue #15269)
  Reported by: contactmayankjain
  Patches:
        patch.txt uploaded by contactmayankjain (license 740)
        memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
  Tested by: contactmayankjain, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 16:58:03 +00:00
Russell Bryant
07a26c8744 Merged revisions 201610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201610 | russell | 2009-06-18 10:27:10 -0500 (Thu, 18 Jun 2009) | 36 lines
  
  Merged revisions 201600 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201600 | russell | 2009-06-18 10:24:31 -0500 (Thu, 18 Jun 2009) | 29 lines
    
    Fix memory corruption and leakage related reloads of non files mode MoH classes.
    
    For Music on Hold classes that are not files mode, meaning that we are executing
    an application that will feed us audio data, we use a thread to monitor the
    external application and read audio from it.  This thread also makes use of the
    MoH class object.  In the MoH class destructor, we used pthread_cancel() to ask
    the thread to exit.  Unfortunately, the code did not wait to ensure that the
    thread actually went away.  What needed to be done is a pthread_join() to ensure
    that the thread fully cleans up before we proceed.  By adding this one line, we
    resolve two significant problems:
    
      1) Since the thread was never joined, it never fully goes away.  So, on every
         reload of non-files mode MoH, an unused thread was sticking around.
    
      2) There was a race condition here where the application monitoring thread
         could still try to access the MoH class, even though the thread executing
         the MoH reload has already destroyed it.
    
    (issue #15109)
    Reported by: jvandal
    
    (issue #15123)
    Reported by: axisinternet
    
    (issue #15195)
    Reported by: amorsen
    
    (issue AST-208)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 15:32:37 +00:00
David Vossel
b47546614f Blocked revisions 201570 via svnmerge
........
  r201570 | dvossel | 2009-06-18 10:16:05 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  parsing extension correctly from sip register lines
  
  If a transport type was specified, but no extension, parsing of the extension would return whatever was after the transport rather than defaulting to 's'.
  
  (closes issue #15111)
  Reported by: ffs
  Patches:
        chan_sip.c_register-parser.patch uploaded by ffs (license 730)
  Tested by: ffs, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 15:29:35 +00:00
Mark Michelson
82f2aa293d Merged revisions 201462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201462 | mmichelson | 2009-06-17 15:10:01 -0500 (Wed, 17 Jun 2009) | 12 lines
  
  Fix problem with no audio due to ignoring the SDP.
  
  A recent change to our SDP version comparison made audio not function
  on some calls. This was because of a test wherein we were trying to
  see if an unsigned value was less than 0. This is a dumb comparison
  and arguably the compiler should have warned about it. Alas, though,
  it slipped past. Now it's fixed by changing the variable to be a
  signed type.
  
  Found by several developers. Tested by mnicholson and dbrooks.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 20:10:50 +00:00
Mark Michelson
3068fa75a2 Merged revisions 201458 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201458 | mmichelson | 2009-06-17 15:04:12 -0500 (Wed, 17 Jun 2009) | 15 lines
  
  Merged revisions 201450 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201450 | mmichelson | 2009-06-17 14:59:31 -0500 (Wed, 17 Jun 2009) | 9 lines
    
    Change the datastore traversal in ast_do_masquerade to use a safe list traversal.
    
    It is possible for datastore fixup functions to remove the datastore from the list
    and free it. In particular, the queue_transfer_fixup in app_queue does this. While
    I don't yet know of this causing any crashes, it certainly could.
    
    Found while discussing a separate issue with Brian Degenhardt.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 20:05:09 +00:00
David Vossel
48dd606532 Blocked revisions 201453 via svnmerge
........
  r201453 | dvossel | 2009-06-17 15:00:51 -0500 (Wed, 17 Jun 2009) | 3 lines
  
  ast_channel_datastore_alloc is no longer used. updating datastores.txt to reflect that.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 20:02:03 +00:00
David Vossel
86eaa43257 Merged revisions 201445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201445 | dvossel | 2009-06-17 14:45:35 -0500 (Wed, 17 Jun 2009) | 25 lines
  
  Merged revisions 201423 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201423 | dvossel | 2009-06-17 14:28:12 -0500 (Wed, 17 Jun 2009) | 19 lines
    
    StopMixMonitor race condition (not giving up file immediately)
    
    StopMixMonitor only indicates to the MixMonitor thread to stop
    writing to the file.  It does not guarantee that the recording's
    file handle is available to the dialplan immediately after execution.
    This results in a race condition.  To resolve this, the filestream
    pointer is placed in a datastore on the channel. When StopMixMonitor
    is called, the datastore is retrieved from the channel and the
    filestream is closed immediately before returning to the dialplan.
    Documentation indicating the use of StopMixMonitor to free files
    has been updated as well.
    
    (closes issue #15259)
    Reported by: travisghansen
    Tested by: dvossel
    
    Review: https://reviewboard.asterisk.org/r/283/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 19:55:44 +00:00
David Brooks
ca7b9b9fe4 Merged revisions 201381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201381 | dbrooks | 2009-06-17 14:15:07 -0500 (Wed, 17 Jun 2009) | 16 lines
  
  Merged revisions 201380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201380 | dbrooks | 2009-06-17 13:45:50 -0500 (Wed, 17 Jun 2009) | 9 lines
    
    Checks for NULL sip_pvt pointer in chan_sip.c->acf_channel_read()
    
    Zombie channels could be passed, and chan_sip.c wasn't checking for it.
    Could crash Asterisk. Now checking for NULL pointer.
    
    (closes issue #15330)
    Reported by: okrief
    Tested by: dbrooks
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 19:35:23 +00:00
David Vossel
ae2ea7cb34 Blocked revisions 201344 via svnmerge
........
  r201344 | dvossel | 2009-06-17 10:20:26 -0500 (Wed, 17 Jun 2009) | 16 lines
  
  SIP registry ref count error
  
  During a sip reload, the list of sip_registry objects are
  supposed to be traversed, unlinked, and destroyed, but
  destruction never takes place due to a ref counting error.
  This causes a memory leak when registry items are removed
  from sip.conf and reloaded.  While the registries are removed
  from the global list, they are not removed from the scheduler.
  Because of this, SIP register attempts continue to be sent
  out for the item even though it may no longer be in the .conf.
  
  (closes issue #15295)
  Reported by: amorsen
  
  Review: https://reviewboard.asterisk.org/r/282/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 15:39:49 +00:00
Kevin P. Fleming
af930c11b3 Merged revisions 201262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201262 | kpfleming | 2009-06-17 07:04:17 -0500 (Wed, 17 Jun 2009) | 15 lines
  
  Merged revisions 201261 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201261 | kpfleming | 2009-06-17 07:03:25 -0500 (Wed, 17 Jun 2009) | 9 lines
    
    Correct AST_LIST_APPEND_LIST behavior when list to be appended is empty.
    
    When the list to be appended is empty, and the list to be appended to is *not*,
    AST_LIST_APPEND_LIST would actually cause the target list to become broken,
    and no longer have a pointer to its last entry. This patch fixes the problem.
    
    (reported by Stanislaw Pitucha on the asterisk-dev mailing list)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 12:05:05 +00:00
David Vossel
6cbe57b730 Merged revisions 201223 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201223 | dvossel | 2009-06-16 17:29:30 -0500 (Tue, 16 Jun 2009) | 2 lines
  
  fix issue with build_contact introduced by the "SIP trasnport type issues" commit
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 22:31:42 +00:00
Kevin P. Fleming
968108c25c Merged revisions 201056,201090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201056 | kpfleming | 2009-06-16 13:54:30 -0500 (Tue, 16 Jun 2009) | 18 lines
  
  Merged revisions 200991 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200991 | kpfleming | 2009-06-16 12:05:38 -0500 (Tue, 16 Jun 2009) | 11 lines
    
    Improve support for media paths that can generate multiple frames at once.
    
    There are various media paths in Asterisk (codec translators and UDPTL, primarily)
    that can generate more than one frame to be generated when the application calling
    them expects only a single frame. This patch addresses a number of those cases,
    at least the primary ones to solve the known problems. In addition it removes the
    broken TRACE_FRAMES support, fixes a number of bugs in various frame-related API
    functions, and cleans up various code paths affected by these changes.
    
    https://reviewboard.asterisk.org/r/175/
  ........
................
  r201090 | kpfleming | 2009-06-16 14:27:12 -0500 (Tue, 16 Jun 2009) | 5 lines
  
  Another minor fix to compiler attribute checking.
  
  Defaulting to 'static' for the function scope was bad... so remove it.
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 19:34:39 +00:00
David Vossel
c2d79c89bb Merged revisions 200946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200946 | dvossel | 2009-06-16 11:03:30 -0500 (Tue, 16 Jun 2009) | 32 lines
  
  SIP transport type issues
  
  What this patch addresses:
  1. ast_sip_ouraddrfor() by default binds to the UDP address/port
  reguardless if the sip->pvt is of type UDP or not.  Now when no
  remapping is required, ast_sip_ouraddrfor() checks the sip_pvt's
  transport type, attempting to set the address and port to the
  correct TCP/TLS bindings if necessary.
  2.  It is not necessary to send the port number in the Contact
  header unless the port is non-standard for the transport type.
  This patch fixes this and removes the todo note.
  3.  In sip_alloc(), the default dialog built always uses transport
  type UDP.  Now sip_alloc() looks at the sip_request (if present)
  and determines what transport type to use by default.
  4.  When changing the transport type of a sip_socket, the file
  descriptor must be set to -1 and in some cases the tcptls_session's
  ref count must be decremented and set to NULL.  I've encountered
  several issues associated with this process and have created a function,
  set_socket_transport(), to handle the setting of the socket type.
  
  
  (closes issue #13865)
  Reported by: st
  Patches:
        dont_add_port_if_tls.patch uploaded by Kristijan (license 753)
        13865.patch uploaded by mmichelson (license 60)
        tls_port_v5.patch uploaded by vrban (license 756)
        transport_issues.diff uploaded by dvossel (license 671)
  Tested by: mmichelson, Kristijan, vrban, jmacz, dvossel
  
  Review: https://reviewboard.asterisk.org/r/278/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 17:11:51 +00:00
Kevin P. Fleming
64cfe299bd Merged revisions 200985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200985 | kpfleming | 2009-06-16 11:32:36 -0500 (Tue, 16 Jun 2009) | 7 lines
  
  Fix problems with new compiler attribute checking in configure script.
  
  The last changes to ast_gcc_attribute.m4 caused some problems checking for
  various attributes, because the scope of the symbol the attribute is applied
  to can be important; this patch allows the scope to be specified for the check.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 16:34:03 +00:00
Michiel van Baak
6ba01d613f Merged revisions 200943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200943 | mvanbaak | 2009-06-16 17:51:36 +0200 (Tue, 16 Jun 2009) | 9 lines
  
  add FILE_STORAGE to Voicemail Build Options
  
  Voicemail can only use one storage module at the moment.
  Because it's unclear that selecting one of the storage modules
  in menuselect will disable filesystem storage we now have
  a FILE_STORAGE option that conflicts with the other modules.
  
  (closes issue #15333)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 16:02:08 +00:00
Kevin P. Fleming
95157288a2 Merged revisions 200764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200764 | kpfleming | 2009-06-15 20:28:08 -0500 (Mon, 15 Jun 2009) | 11 lines
  
  Ensure that configure-script testing for compiler attributes actually works.
  
  The configure script tests for compiler attributes didn't actually enable
  enough warnings or provide a proper test harness to determine whether the 
  compiler supports the attribute in question or not; this caused gcc 4.1 to
  report that it supports 'weakref', but it doesn't actually support it in the
  way that is needed for our optional API mechanism. The new configure script
  test will properly distinguish between full support and partial support
  for this attribute, among others.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 01:33:30 +00:00
Kevin P. Fleming
c1cc00fae6 Merged revisions 200726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200726 | kpfleming | 2009-06-15 20:03:22 -0500 (Mon, 15 Jun 2009) | 6 lines
  
  Document the new automatic 'ignoresdpversion' behavior.
  
  Asterisk will now automatically ignore incorrect incoming SDP version numbers
  when necessary to complete a T.38 re-INVITE operation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 01:08:56 +00:00
Kevin P. Fleming
40757d599e Merged revisions 165180,200689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r165180 | mnicholson | 2008-12-17 12:49:12 -0600 (Wed, 17 Dec 2008) | 14 lines
  
  This patch adds a new 'ignoresdpversion' option to sip.conf.  When this is
  enabled (either globally or for a specific peer), chan_sip will treat any SDP
  data it receives as new data and update the media stream accordingly.  By
  default, Asterisk will only modify the media stream if the SDP session version
  received is different from the current SDP session version.  This option is
  required to interoperate with devices that have non-standard SDP session
  version implementations (observed by toc on the bug tracker with Microsoft OCS
  which always uses 0 as the session version).
  
  http://reviewboard.digium.com/r/94/
  (closes issue #13958)
  Reported by: toc
  Tested by: toc
........
  r200689 | kpfleming | 2009-06-15 15:42:38 -0500 (Mon, 15 Jun 2009) | 12 lines
  
  Accept T.38 re-INVITE responses with invalid SDP versions.
  
  This commit changes the 'incoming SDP version' check logic a bit more; when
  'ignoresdpversion' is *not* set for a peer, if we initiate a re-INVITE to
  switch to T.38, we'll always accept the peer's SDP response, even if they
  don't properly increment the SDP version number as they should. If this situation
  occurs, a warning message will be generated suggesting that the peer's
  configuration be changed to include the 'ignoresdpversion' configuration option
  (although ideally they'd fix their SIP implementation to be RFC compliant).
  
  AST-221
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-15 21:29:27 +00:00
Mark Michelson
5f0b3e489f Merged revisions 200514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r200514 | mmichelson | 2009-06-15 10:22:11 -0500 (Mon, 15 Jun 2009) | 11 lines
  
  Merged revisions 200513 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200513 | mmichelson | 2009-06-15 10:21:46 -0500 (Mon, 15 Jun 2009) | 5 lines
    
    Add INFO to our allowed methods so that endpoints know they may send it to us.
    
    AST-223
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-15 15:22:34 +00:00
Mark Michelson
660bceff3c Merged revisions 200361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r200361 | mmichelson | 2009-06-12 14:07:51 -0500 (Fri, 12 Jun 2009) | 16 lines
  
  Merged revisions 200360 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200360 | mmichelson | 2009-06-12 14:06:41 -0500 (Fri, 12 Jun 2009) | 10 lines
    
    Suppress a warning message and give a better return code when generating
    inband ringing after a call is answered.
    
    (closes issue #15158)
    Reported by: madkins
    Patches:
          15158.patch uploaded by mmichelson (license 60)
    Tested by: madkins
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-12 19:08:15 +00:00
Sean Bright
a5c9e82ebb Merged revisions 199781 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199781 | seanbright | 2009-06-09 14:08:53 -0400 (Tue, 09 Jun 2009) | 2 lines
  
  Fix all of the parallel build warnings issued when running make -j#.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-11 22:42:05 +00:00
Mark Michelson
bd9f6cf82d Merged revisions 200146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200146 | mmichelson | 2009-06-11 16:17:14 -0500 (Thu, 11 Jun 2009) | 5 lines
  
  Fix a crash due to a potentially NULL p->options.
  
  Thanks to mnicholson for pointing it out.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-11 21:18:03 +00:00
Leif Madsen
6651984931 Merged revisions 200039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200039 | lmadsen | 2009-06-11 08:15:09 -0400 (Thu, 11 Jun 2009) | 8 lines
  
  Fix path for .flavor and .version
  
  (issue #14737)
  Reported by: davidw
  Patches:
        flavor.patch uploaded by davidw (license 780)
  Tested by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-11 12:16:12 +00:00
David Brooks
3516eaa7e0 Fixes the argument order in definition of new_find_extension().
In the definition of new_find_extension(), the arguments 'callerid' and
'label' were swapped. The prototype declaration and all calls to the
function are ordered 'callerid' then 'label', but the function itself
was ordered 'label' then 'callerid'.

(closes issue #15303)
Reported by: JimDickenson


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 20:29:52 +00:00
Mark Michelson
7a3b46c789 The 1.6.0 branch was missing all invite_branch logic. It has now been added.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 20:20:53 +00:00
Mark Michelson
8bb3dcacad Blocked revisions 199958 via svnmerge
........
  r199958 | mmichelson | 2009-06-10 15:15:48 -0500 (Wed, 10 Jun 2009) | 6 lines
  
  Only try to use the invite_branch on outgoing INVITEs with auth credentials.
  
  I have added a comment to the code to help ease understanding of the logic here
  as well.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 20:18:58 +00:00
Sean Bright
1e91c9f3bc Merged revisions 199857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199857 | seanbright | 2009-06-10 12:10:23 -0400 (Wed, 10 Jun 2009) | 9 lines
  
  Merged revisions 199856 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199856 | seanbright | 2009-06-10 12:08:35 -0400 (Wed, 10 Jun 2009) | 2 lines
    
    __WORDSIZE is not available on all platforms, so use sizeof(void *) instead.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 16:13:14 +00:00
David Vossel
6cab2f47e6 Merged revisions 199818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199818 | dvossel | 2009-06-09 15:47:57 -0500 (Tue, 09 Jun 2009) | 11 lines
  
  CLI NOTIFY sending wrong transport type.
  
  SIP's cli NOTIFY command only used UDP rather than copying the transport type from the peer.
  
  (closes issue #15283)
  Reported by: jthurman
  Patches:
        sip-notify-tcp-svn199728.patch uploaded by jthurman (license 614)
  Tested by: jthurman, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-09 20:54:10 +00:00
David Vossel
36fe89c775 Blocked revisions 199743 via svnmerge
........
  r199743 | dvossel | 2009-06-09 11:22:04 -0500 (Tue, 09 Jun 2009) | 11 lines
  
  module load priority
  
  This patch adds the option to give a module a load priority. The value represents the order in which a module's load() function is initialized.  The lower the value, the higher the priority.  The value is only checked if the AST_MODFLAG_LOAD_ORDER flag is set.  If the AST_MODFLAG_LOAD_ORDER flag is not set, the value will never be read and the module will be given the lowest possible priority
  on load.  Since some modules are reliant on a timing interface, the timing modules have been given a high load priorty.
  
  (closes issue #15191)
  Reported by: alecdavis
  Tested by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/262/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-09 16:34:19 +00:00
Sean Bright
046332e03e Merged revisions 199630 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199630 | seanbright | 2009-06-08 15:33:09 -0400 (Mon, 08 Jun 2009) | 32 lines
  
  Merged revisions 199626,199628 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199626 | seanbright | 2009-06-08 15:24:32 -0400 (Mon, 08 Jun 2009) | 21 lines
    
    Increase the size of our thread stack on 64 bit processors.
    
    We were setting the stack size for each thread to 240KB regardless of
    architecture, which meant that in some scenarios we actually had less available
    stack space on 64 bit processors (pointers use 8 bytes instead of 4).  So now we
    calculate the stack size we reserve based on the platform's __WORDSIZE, which
    gives us:
    
         32 bit -> 240KB
         64 bit -> 496KB
        128 bit -> 1008KB (that's right, we're ready for 128 bit processors)
    
    Patch typed by me but written by several members of #asterisk-dev, including
    Kevin, Tilghman, and Qwell.
    
    (closes issue #14932)
    Reported by: jpiszcz
    Patches:
          06052009_issue14932.patch uploaded by seanbright (license 71)
    Tested by: seanbright
  ........
    r199628 | seanbright | 2009-06-08 15:28:33 -0400 (Mon, 08 Jun 2009) | 2 lines
    
    Fix a typo in the stack size calculation just introduced.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-08 19:39:22 +00:00
Mark Michelson
c1bece3429 Blocked revisions 199588 via svnmerge
........
  r199588 | mmichelson | 2009-06-08 12:32:04 -0500 (Mon, 08 Jun 2009) | 9 lines
  
  Fix a deadlock that could occur when setting rtp stats on SIP calls.
  
  (closes issue #15143)
  Reported by: cristiandimache
  Patches:
        15143.patch uploaded by mmichelson (license 60)
  Tested by: cristiandimache
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-08 17:33:17 +00:00
David Vossel
8e3df8bd1f Merged revisions 199298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199298 | dvossel | 2009-06-05 16:21:22 -0500 (Fri, 05 Jun 2009) | 21 lines
  
  Merged revisions 199297 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199297 | dvossel | 2009-06-05 16:19:56 -0500 (Fri, 05 Jun 2009) | 14 lines
    
    Fixes issue with hints giving unexpected results.
    
    Hints with two or more devices that include ONHOLD gave unexpected results.
    
    (closes issue #15057)
    Reported by: p_lindheimer
    Patches:
          onhold_trunk.diff uploaded by dvossel (license 671)
          pbx.c.1.4.patch uploaded by p (license 558)
          devicestate.c.trunk.patch uploaded by p (license 671)
    Tested by: p_lindheimer, dvossel
    
    Review: https://reviewboard.asterisk.org/r/254/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-05 21:37:01 +00:00
Mark Michelson
29113e4ad5 Merged revisions 199227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199227 | mmichelson | 2009-06-05 08:51:08 -0500 (Fri, 05 Jun 2009) | 14 lines
  
  Correct "dahdi show channels" output when specifying a group.
  
  Since a DAHDI channel may belong to multiple groups, we need to use
  a bitwise and instead of equivalence to determine whether to display
  the channel information.
  
  
  (closes issue #15248)
  Reported by: gentian
  Patches:
        15248.patch uploaded by mmichelson (license 60)
  Tested by: gentian
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-05 13:51:26 +00:00
David Vossel
ea62e16ffe Merged revisions 199139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199139 | dvossel | 2009-06-04 14:10:16 -0500 (Thu, 04 Jun 2009) | 9 lines
  
  Merged revisions 199138 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199138 | dvossel | 2009-06-04 14:00:15 -0500 (Thu, 04 Jun 2009) | 3 lines
    
    Additional updates to AST-2009-001
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-04 19:16:58 +00:00
Sean Bright
8340a34a4a Merged revisions 199051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199051 | seanbright | 2009-06-04 10:31:24 -0400 (Thu, 04 Jun 2009) | 47 lines
  
  Merged revisions 199022 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199022 | seanbright | 2009-06-04 10:14:57 -0400 (Thu, 04 Jun 2009) | 40 lines
    
    Safely handle AMI connections/reload requests that occur during startup.
    
    During asterisk startup, a lock on the list of modules is obtained by the
    primary thread while each module is initialized.  Issue 13778 pointed out a
    problem with this approach, however.  Because the AMI is loaded before other
    modules, it is possible for a module reload to be issued by a connected client
    (via Action: Command), causing a deadlock.
    
    The resolution for 13778 was to move initialization of the manager to happen
    after the other modules had already been lodaded.  While this fixed this
    particular issue, it caused a problem for users (like FreePBX) who call AMI
    scripts via an #exec in a configuration file (See issue 15189).
    
    The solution I have come up with is to defer any reload requests that come in
    until after the server is fully booted.  When a call comes in to
    ast_module_reload (from wherever) before we are fully booted, the request is
    added to a queue of pending requests.  Once we are done booting up, we then
    execute these deferred requests in turn.
    
    Note that I have tried to make this a bit more intelligent in that it will not
    queue up more than 1 request for the same module to be reloaded, and if a
    general reload request comes in ('module reload') the queue is flushed and we
    only issue a single deferred reload for the entire system.
    
    As for how this will impact existing installations - Before 13778, a reload
    issued before module initialization was completed would result in a deadlock.
    After 13778, you simply couldn't connect to the manager during startup (which
    causes problems with #exec-that-calls-AMI configuration files).  I believe this
    is a good general purpose solution that won't negatively impact existing
    installations.
    
    (closes issue #15189)
    (closes issue #13778)
    Reported by: p_lindheimer
    Patches:
          06032009_15189_deferred_reloads.diff uploaded by seanbright (license 71)
    Tested by: p_lindheimer, seanbright
    
    Review: https://reviewboard.asterisk.org/r/272/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-04 14:53:49 +00:00