Commit Graph

21218 Commits

Author SHA1 Message Date
Russell Bryant 2dfb427540 Add CEL extra field to cel_pgsql.
(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: https://origsvn.digium.com/svn/asterisk/trunk@317482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 23:08:05 +00:00
Russell Bryant 15b8740f80 Merged revisions 317480 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 23:02:11 +00:00
Russell Bryant 0938974902 Merged revisions 317478 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:55:09 +00:00
Russell Bryant ea4d4dfabf Merged revisions 317476 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:49:36 +00:00
Russell Bryant f0f5e237bf Merged revisions 317474 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317475 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:44:52 +00:00
Russell Bryant c28e2d380c Merged revisions 317429 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:12:10 +00:00
Russell Bryant 0ea3d21929 Merged revisions 317427 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 22:02:31 +00:00
Russell Bryant 19b45ad446 Merged revisions 317425 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 21:54:17 +00:00
Sean Bright d508a921bf Add some new editline bindings by default, and allow for user specified 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: https://origsvn.digium.com/svn/asterisk/trunk@317395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 21:20:00 +00:00
Damien Wedhorn e98ac1f0f4 Move hold stuff to the setsubstate arrangement.
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: https://origsvn.digium.com/svn/asterisk/trunk@317382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 20:46:49 +00:00
Sean Bright 41bfc0c9e0 Merged revisions 317370 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 20:27:25 +00:00
Russell Bryant 7a2103efa6 Merged revisions 317336 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 19:56:44 +00:00
Jonathan Rose 932e34ee62 Merged revisions 317283 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 19:33:11 +00:00
Russell Bryant 4d612d126b Merged revisions 317281 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 18:46:22 +00:00
Matthew Nicholson 89da27b780 Merged revisions 317196 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@317198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 18:09:23 +00:00
David Vossel 00dc1556ab Fixes reliability issues with func_jitterbuffer's usage in the new ConfBridge application.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 18:08:42 +00:00
Leif Madsen 87a8619e34 Merged revisions 317104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r317104 | lmadsen | 2011-05-05 11:04:24 -0400 (Thu, 05 May 2011) | 15 lines
  
  Merged revisions 317102 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r317102 | lmadsen | 2011-05-05 10:54:46 -0400 (Thu, 05 May 2011) | 8 lines
    
    Disable console colourization inside safe_asterisk checks.
    
    (closes issue #19213)
    Reported by: lefoyer
    Patches: 
          issue19213_strip_color_in_safe_asterisk-svn.patch uploaded by wdoekes (license 717)
    Tested by: wdoekes, lefoyer
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 15:06:59 +00:00
Leif Madsen c85a903198 Merged revisions 317058 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317058 | lmadsen | 2011-05-05 08:27:56 -0400 (Thu, 05 May 2011) | 7 lines
  
  Remove unused directory and clear up some documentation.
  
  (closes issue #19193)
  Reported by: bchia
  Patches: 
        cel-csv.diff uploaded by lathama (license 1028)
  Tested by: lathama, Marquis42
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 12:28:40 +00:00
Damien Wedhorn 2ae06c3e6d Add setsubstate_congestion and setsubstate_progress.
Move handling of both state handling from skinny_indicate to it's own sub.
Also, modified behaviour to not hangup the sub and let the dialplan
have a chance in doing what it wants for congestion. Added various states to
substate2str and added these states where applicable for other set_substate_
procs.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 09:03:32 +00:00
Damien Wedhorn 468b8229a7 Add setsubstate_busy.
Move handling of setting busy state from skinny_indicate to it's own sub.
Also, modified behaviour to not hangup the sub and let the dialplan
have a chance in doing what it wants (eg busy(10); hangup() in the dialplan
now gives a busy indication for 10 secs and then hangs up.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 08:10:14 +00:00
Stefan Schmidt 19eb6c7384 Adding the Move to Front Hash functionality
Moving a found object to the front of its bucket to reduce the necessary traversal steps to find an object. This change improves the search time on large system with many data or in link lists.

(closes issue #19233)
Reported by: schmidts

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 07:09:20 +00:00
Sean Bright fe5938c51e Merged revisions 316917-316919 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316917 | seanbright | 2011-05-04 22:23:28 -0400 (Wed, 04 May 2011) | 5 lines
  
  Make sure that tcptls_session is properly initialized.
  
  (issue #18598)
  Reported by: ksn
........
  r316918 | seanbright | 2011-05-04 22:25:20 -0400 (Wed, 04 May 2011) | 5 lines
  
  Look at the correct buffer for our digest info instead of an empty one.
  
  (issue #18598)
  Reported by: ksn
........
  r316919 | seanbright | 2011-05-04 22:30:45 -0400 (Wed, 04 May 2011) | 10 lines
  
  Use the correct HTTP method when generating our digest, otherwise we always fail.
  
  When calculating the 'A2' portion of our digest for verification, we need the
  HTTP method that is currently in use.  Unfortunately our mapping function was
  incorrect, resulting in invalid hashes being generated and, in turn, failures
  in authentication.
  
  (closes issue #18598)
  Reported by: ksn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-05 02:34:29 +00:00
Damien Wedhorn b9e763ecae Add setsubstate_ringout (equivalent to AST_STATE ringing).
Renamed previous setsubstate_ringout to setsubstate_dialing for a state
when attempting to dial a number, substate ringout now for when core
has indicated that the channel is actually ringing on the other end.
Also added substate2str for debugging purposes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316885 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 21:44:06 +00:00
Richard Mudgett a45d2f29c6 Merged revisions 316831 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316831 | rmudgett | 2011-05-04 13:51:40 -0500 (Wed, 04 May 2011) | 9 lines
  
  Wait for leader with Music On Hold allows crosstalk between participants.
  
  Parenthesis in the wrong position.  Regression from issue #14365 when
  expanding conference flags to use 64 bits.
  
  (closes issue #18418)
  Reported by: MrHanMan
  Tested by: rmudgett
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 18:57:02 +00:00
David Vossel 1f96380da5 Reverts rev 316218 as it breaks parsing the [general] section of sip.conf.
The functionality this patch attempts to achieve should already
be possible using [general](+) in the config file.

issue #17957



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316798 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 16:42:19 +00:00
Sean Bright 51fc64d13a Merged revisions 316709 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316709 | seanbright | 2011-05-04 12:15:32 -0400 (Wed, 04 May 2011) | 22 lines
  
  Merged revisions 316708 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r316708 | seanbright | 2011-05-04 12:10:59 -0400 (Wed, 04 May 2011) | 15 lines
    
    Merged revisions 316707 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r316707 | seanbright | 2011-05-04 12:08:50 -0400 (Wed, 04 May 2011) | 8 lines
      
      If sox fails when processing a voicemail, don't delete the original file.
      
      (closes issue #18111)
      Reported by: sysreq
      Patches:
            issue18111_trunk.patch uploaded by seanbright (license 71)
      Tested by: seanbright
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 16:17:14 +00:00
Sean Bright 34734f727f Merged revisions 316663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316663 | seanbright | 2011-05-04 10:35:05 -0400 (Wed, 04 May 2011) | 8 lines
  
  Only return a single error via AMI when requesting a forbidden action.
  
  (closes issue #19216)
  Reported by: oej
  Patches:
        issue19216-1.8-r316204.patch uploaded by seanbright (license 71)
  Tested by: seanbright
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 14:40:08 +00:00
David Vossel a3fd2b77b6 Merged revisions 316650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316650 | dvossel | 2011-05-04 09:25:03 -0500 (Wed, 04 May 2011) | 15 lines
  
  Merged revisions 316644 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r316644 | dvossel | 2011-05-04 09:23:39 -0500 (Wed, 04 May 2011) | 9 lines
    
    Fixes one-way-audio when chanspy activated with the 'o' option
    
    (closes issue #18382)
    Reported by: jkister
    Patches: 
          0001-Bugfix-18382-one-way-audio-when-chanspy-activated.patch.txt uploaded by malin (license )
    Tested by: firstsip, Greenlightcrm, malin, wdoekes, boroda, dvossel
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 14:26:33 +00:00
David Vossel 3bf4b09a6e Merged revisions 316617 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316617 | dvossel | 2011-05-04 08:44:41 -0500 (Wed, 04 May 2011) | 19 lines
  
  Merged revisions 316616 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r316616 | dvossel | 2011-05-04 08:40:41 -0500 (Wed, 04 May 2011) | 12 lines
    
    Fixes session-timers=refuse not being enforced for *caller*
    
    During handle_request_invite, the session timer mode was retrieved from
    a cached variable.  This patch forces a peer lookup of the session timer
    mode in the case of an incoming invite.
    
    (closes issue #18804)
    Reported by: wdoekes
    Patches: 
          issue18804_session_timer_refuse_caller.patch uploaded by wdoekes (license 717)
          issue_18804_v2.diff uploaded by dvossel (license 671)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316618 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 13:48:07 +00:00
Damien Wedhorn 99d0da2a2d Add setsubstate_ringin.
Added setsubstate_ringin. skinny_call now calls sss_ringin rather than inline.
Fixed previous issue so that setsubstate_connected now use SUBSTATE_RINGIN
to determine is an AST_CONTROL_ANSWER should be queued.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 08:25:47 +00:00
Damien Wedhorn bc814dc84a Make skinny_answer use setsubsate_connected.
Cosolidated the code so that skinny_answer now uses the setsubstate procedures
rather than doing the handling inline.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 07:43:58 +00:00
Tzafrir Cohen bf72b5b395 Merged revisions 316193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316193 | tzafrir | 2011-05-03 13:57:16 +0300 (ג', 03 מאי 2011) | 8 lines
  
  Re-fix bashism in ./configure: s/let/$(( ))/
  
  A forward-port in r278985 accidentally re-introduced issue 17485. Fixing
  it. Thanks to Jilles Tjoelker for the good report.
  
  (closes issue #17485)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 07:13:18 +00:00
Damien Wedhorn c6f189cd71 Cleanup skinny callinfo.
Cosolidated the working out of the callinfo to be sent into
transmit_callinfo. Replaced ambiguous sub->outgoing with calldirection
which can be SKINNY_INCOMING or SKINNY_OUTGOING (same value as the
skinny protocol). 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 07:10:04 +00:00
Sean Bright c596329564 Merged revisions 316476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316476 | seanbright | 2011-05-03 22:34:01 -0400 (Tue, 03 May 2011) | 17 lines
  
  Merged revisions 316475 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r316475 | seanbright | 2011-05-03 22:23:01 -0400 (Tue, 03 May 2011) | 10 lines
    
    Honor the C option to MeetMe when L is passed.
    
    This fixes a case that r304773 and friends missed.
    
    (closes issue #17317)
    Reported by: var
    Patches:
          meetme-continue-on-l_16218.diff uploaded by var (license 1227)
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 02:39:11 +00:00
Tilghman Lesher fbe3c85dee Merged revisions 316429 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316429 | tilghman | 2011-05-03 19:12:25 -0500 (Tue, 03 May 2011) | 7 lines
  
  Escape column names in case they contain illegal characters ('-') or reserved words.
  
  (closes issue #19063)
   Reported by: festr
   Patches: 
         patch uploaded by festr (license 443)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-04 00:13:23 +00:00
Tilghman Lesher ed56ae3ef7 If multiple [general] contexts occur from sip.conf (usually due to external includes), merge them.
The original implementation of this did the merging of all contexts with the
same name in the realtime layer, but that implementation severely breaks
drivers which use the same context name (e.g. iax.conf, type={peer,user}).
Therefore, the implementation needs to do the merging for particular entries
only, based upon what contexts would allow that in the channel driver itself.
This implementation is for chan_sip only, but others could be added in the
future.

(closes issue #17957)
 Reported by: marcelloceschia
 Patches: 
       chan-sip_parsing-general_branch162.patch uploaded by marcelloceschia (license 1079)
 Tested by: tilghman


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 23:36:35 +00:00
Russell Bryant 95561bd37a Merged revisions 316336 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316336 | russell | 2011-05-03 17:13:31 -0500 (Tue, 03 May 2011) | 8 lines
  
  Use htons() instead of ntohs() in some places.
  
  (closes issue #19200)
  Reported by: wdoekes
  Patches:
        issue19200-trunk.patch uploaded by wdoekes (license 717)
        issue19200-1.8.x.patch uploaded by wdoekes (license 717)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 22:16:23 +00:00
David Vossel f4417923ce Merged revisions 316334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316334 | dvossel | 2011-05-03 17:05:59 -0500 (Tue, 03 May 2011) | 8 lines
  
  Fixes framehook segfault on indicate
  
  (closes issue #19215)
  Reported by: irroot
  Patches: 
        framehook_indicate.patch uploaded by irroot (license 52)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 22:07:18 +00:00
Russell Bryant 277f9f46dc Merged revisions 316331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316331 | russell | 2011-05-03 16:41:11 -0500 (Tue, 03 May 2011) | 2 lines
  
  Resolve another warning.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 21:48:40 +00:00
David Vossel bb5e875b65 Merged revisions 316330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316330 | dvossel | 2011-05-03 16:37:59 -0500 (Tue, 03 May 2011) | 24 lines
  
  Merged revisions 316329 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r316329 | dvossel | 2011-05-03 16:29:55 -0500 (Tue, 03 May 2011) | 17 lines
    
    Merged revisions 316328 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r316328 | dvossel | 2011-05-03 16:27:59 -0500 (Tue, 03 May 2011) | 10 lines
      
      Fixes chan_local crashs in local_fixup()
      
      Thanks OEJ for tracking down the issue and submitting the patch.
      
      (closes issue #19053)
      Reported by: oej
      Tested by: oej
      
      Review: https://reviewboard.asterisk.org/r/1158/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 21:45:46 +00:00
Russell Bryant 37aa52fd78 Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
  
  Fix a bunch of compiler warnings generated by gcc 4.6.0.
  
  Most of these are -Wunused-but-set-variable, but there were a few others
  mixed in here, as well.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 20:45:32 +00:00
Richard Mudgett 810b9c8879 Merged revisions 316224 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316224 | rmudgett | 2011-05-03 14:18:30 -0500 (Tue, 03 May 2011) | 16 lines
  
  The dahdi_hangup() call does not clean up the channel fully.
  
  After dahdi_hangup() has supposedly hungup an ISDN channel there is still
  traffic on the S0-bus because the channel was not cleaned up fully.
  
  Shuffled the hangup code to include some missing cleanup.  Also fixed some
  code formatting in the area.  I think the primary missing clean up code
  was the call to tone_zone_play_tone() to turn off any active tones on the
  channel.
  
  (closes issue #19188)
  Reported by: jg1234
  Patches:
        issue19188_v1.8.patch uploaded by rmudgett (license 664)
  Tested by: jg1234
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 19:22:29 +00:00
David Vossel db72ee299a Merged revisions 316217 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316217 | dvossel | 2011-05-03 13:59:06 -0500 (Tue, 03 May 2011) | 9 lines
  
  Never put the Require: timer header in an Invite.
  
  This has already been discussed and should have been resolved earlier.  View
  revsion 285565's log for more information about why it is important to not
  put timer in the Require header.
  
  (closes issue #18704)
  Reported by: mfrager
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 19:00:26 +00:00
David Vossel 5f7fd9ae9b Merged revisions 316215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316215 | dvossel | 2011-05-03 13:49:48 -0500 (Tue, 03 May 2011) | 9 lines
  
  Fixes a random crash (NULL reference) in res_odbc.c.
  
  (closes issue #19180)
  Reported by: pruiz
  Patches: 
        tmp.diff uploaded by pruiz (license 1152)
  Tested by: pruiz, seanbright
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 18:51:41 +00:00
Sean Bright a52395aaee Merged revisions 316206 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316206 | seanbright | 2011-05-03 14:17:36 -0400 (Tue, 03 May 2011) | 8 lines
  
  If we aren't interested in events, don't generate the FullyBooted event on AMI login.
  
  (closes issue #19089)
  Reported by: bklang
  Patches:
        issue19089-1.8-r316204.patch uploaded by seanbright (license 71)
  Tested by: seanbright
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316213 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-03 18:23:03 +00:00
Tilghman Lesher 1fca95b1d4 Merged revisions 316094 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r316094 | tilghman | 2011-05-02 14:09:55 -0500 (Mon, 02 May 2011) | 15 lines
  
  Merged revisions 316093 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r316093 | tilghman | 2011-05-02 14:04:36 -0500 (Mon, 02 May 2011) | 8 lines
    
    More possible crashes based upon invalid inputs.
    
    (closes issue #18161)
     Reported by: wdoekes
     Patches: 
           20110301__issue18161.diff.txt uploaded by tilghman (license 14)
     Tested by: wdoekes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-02 19:15:46 +00:00
Paul Belanger 7c3d14957b Formatting change, remove red blobs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-02 15:58:27 +00:00
Matthew Nicholson e87639fc26 Merged revisions 315894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r315894 | mnicholson | 2011-04-27 14:14:27 -0500 (Wed, 27 Apr 2011) | 28 lines
  
  Merged revisions 315893 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r315893 | mnicholson | 2011-04-27 14:03:05 -0500 (Wed, 27 Apr 2011) | 21 lines
    
    Merged revisions 315891 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r315891 | mnicholson | 2011-04-27 13:57:56 -0500 (Wed, 27 Apr 2011) | 14 lines
      
      Fix our compliance with RFC 3261 section 18.2.2.
      
      This change optimizes the free_via() function and removes some redundant null
      checking. It also fixes compliance with RFC 3261 section 18.2.2 by always using
      the port specified in the Via header for routing responses (even when maddr is
      not set). Also the htons() function is now used when setting the port.
      Additional documentation comments have been added in various places to make the
      logic in the code clearer.
      
      (closes issue #18951)
      Reported by: jmls
      Patches:
            issue18951_set_proper_port_from_via.patch uploaded by wdoekes (license 717) (modified)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-27 19:15:49 +00:00
David Vossel 696c77c59e Makes the new ConfBridge join and leave sounds be used by default rather than beep and beeperr.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-27 17:51:53 +00:00
David Vossel 237d47b010 Clears exception flag during ast_read when func_jitterbuffer is enabled
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-27 17:44:02 +00:00