Commit Graph

422 Commits

Author SHA1 Message Date
Mark Michelson 0f4489dc0f Fix TLS port binding behavior as well as reload behavior:
* Removes references to tlsbindport from http.conf.sample and manager.conf.sample
* Properly bind to port specified in tlsbindaddr, using the default port if specified.
* On a reload, properly close socket if the service has been disabled.

A note has been added to UPGRADE.txt to indicate how ports must be set for TLS.

(closes issue ASTERISK-16959)
reported by Olaf Holthausen

(closes issue ASTERISK-19201)
reported by Chris Mylonas

(closes issue ASTERISK-19204)
reported by Chris Mylonas

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

Merged revisions 353770 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 353820 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-02 18:55:05 +00:00
Richard Mudgett 23bc964e1c Constify some more channel driver technology callback parameters.
Review: https://reviewboard.asterisk.org/r/1707/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-01 19:53:38 +00:00
Richard Mudgett 2d7a40de58 Fix memory leak in error paths for action_originate().
* Fix memory leak of vars in error paths for action_originate().

* Moved struct fast_originate_helper tech and data members to stringfields.

* Simplified ActionID header handling for fast_originate().

* Added doxygen note to ast_request() and ast_call() and the associated
channel callbacks that the data/addr parameters should be treated as const
char *.

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

Merged revisions 353454 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 353463 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-31 17:26:09 +00:00
Terry Wilson 99cae5b750 Opaquify channel stringfields
Continue channel opaque-ification by wrapping all of the stringfields.
Eventually, we will restrict what can actually set these variables, but
the purpose for now is to hide the implementation and keep people from
adding code that directly accesses the channel structure. Semantic
changes will follow afterward.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-24 20:12:09 +00:00
Terry Wilson 04da92c379 Replace direct access to channel name with accessor functions
There are many benefits to making the ast_channel an opaque handle, from
increasing maintainability to presenting ways to kill masquerades. This patch
kicks things off by taking things a field at a time, renaming the field to
'__do_not_use_${fieldname}' and then writing setters/getters and converting the
existing code to using them. When all fields are done, we can move ast_channel
to a C file from channel.h and lop off the '__do_not_use_'.

This patch sets up main/channel_interal_api.c to be the only file that actually
accesses the ast_channel's fields directly. The intent would be for any API
functions in channel.c to use the accessor functions. No more monkeying around
with channel internals. We should use our own APIs.

The interesting changes in this patch are the addition of
channel_internal_api.c, the moving of the AST_DATA stuff from channel.c to
channel_internal_api.c (note: the AST_DATA stuff will have to be reworked to
use accessor functions when ast_channel is really opaque), and some re-working
of the way channel iterators/callbacks are handled so as to avoid creating fake
ast_channels on the stack to pass in matching data by directly accessing fields
(since "name" is a stringfield and the fake channel doesn't init the
stringfields, you can't use the ast_channel_name_set() function). I went with
ast_channel_name(chan) for a getter, and ast_channel_name_set(chan, name) for a
setter.

The majority of the grunt-work for this change was done by writing a semantic
patch using Coccinelle ( http://coccinelle.lip6.fr/ ).

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-09 22:15:50 +00:00
Richard Mudgett 395814c33e Update AMI Getvar and Setvar documentation about supplying a channel name.
(closes issue ASTERISK-18958)
Reported by: Red
Patches:
      jira_asterisk_18958_v1.8.patch (license #5621) patch uploaded by rmudgett
........

Merged revisions 347438 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 347439 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-12-07 21:42:29 +00:00
Walter Doekes bac9ff62ef Fix bad quoting of multiline mxml opaque_data that caused invalid xml.
The opaque_data was added and enclosed in single quotes, assuming it
would be only a single line. The rest of the lines were appended after
the closing quote.

(closes issue ASTERISK-18852)
Reported by: peep_ on IRC

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

Merged revisions 344835 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 344836 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-11-11 21:33:54 +00:00
Richard Mudgett 067250f74c Convert registered AMI actions to ao2 objects.
* Fixed race between calling an AMI action callback and unregistering that
action.  Refixes ASTERISK-13784 broken by ASTERISK-17785 change.

* Fixed potential memory leak if an AMI action failed to get registered
because is already was registered.  Part of the ao2 conversion.

* Fixed AMI ListCommands action not walking the actions list with a lock
held.

* Fix usage of ast_strdupa() and alloca() in loops.  Excess stack usage.

* Fix AMI Originate action Variable header requiring a space after the
header colon.  Reported by Yaroslav Panych on the asterisk-dev list.

* Increased the number of listed variables allowed per AMI Originate
action Variable header to 64.

* Fixed AMI GetConfigJSON action output format.

* Fixed usage of res contents outside of scope in append_channel_vars().

* Fixed inconsistency of config file channelvars option.  The values no
longer accumulate with every channelvars option in the config file.  Only
the last value is kept to be consistent with the CLI "manager show
settings" command.

(closes issue ASTERISK-18479)
Reported by: Jaco Kroon
........

Merged revisions 340279 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 340281 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340282 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-11 18:57:47 +00:00
Matthew Nicholson bb07ca66a1 Merged revisions 340109 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340109 | mnicholson | 2011-10-10 09:15:41 -0500 (Mon, 10 Oct 2011) | 18 lines
  
  Merged revisions 340108 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r340108 | mnicholson | 2011-10-10 09:14:48 -0500 (Mon, 10 Oct 2011) | 11 lines
    
    Load the proper XML documentation when multiple modules document the same application.
    
    This patch adds an optional "module" attribute to the XML documentation spec
    that allows the documentation processor to match apps with identical names from
    different modules to their documentation. This patch also fixes a number of
    bugs with the documentation processor and should make it a little more
    efficient. Support for multiple languages has also been properly implemented.
    
    ASTERISK-18130
    Review: https://reviewboard.asterisk.org/r/1485/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-10 14:16:27 +00:00
Richard Mudgett 5d5db050f8 Merged revisions 339508 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339508 | rmudgett | 2011-10-05 11:35:02 -0500 (Wed, 05 Oct 2011) | 18 lines
  
  Merged revisions 339504,339506 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339504 | rmudgett | 2011-10-05 11:26:45 -0500 (Wed, 05 Oct 2011) | 7 lines
    
    Add missing documentation of required AMI action Challenge AuthType header.
    
    (closes issue ASTERISK-18554)
    Reported by: Vlad Povorozniuc
    Patches:
          __20110919-manager-challenge-docs.patch.txt (license #4999) patch uploaded by Leif Madsen
  ........
    r339506 | rmudgett | 2011-10-05 11:32:03 -0500 (Wed, 05 Oct 2011) | 1 line
    
    Fix XML error in AMI action Challenge.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-05 16:36:49 +00:00
Olle Johansson eeefca7f91 Generate error message when AMI action originate extension doesn't exist
Review: https://reviewboard.asterisk.org/r/1445/

Is this a bug or a new feature? No responses on Asterisk-dev so I'm 
committing to trunk only.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-04 09:43:03 +00:00
Richard Mudgett 55b70ae625 Merged revisions 337974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r337974 | rmudgett | 2011-09-26 14:35:23 -0500 (Mon, 26 Sep 2011) | 37 lines
  
  Merged revisions 337973 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r337973 | rmudgett | 2011-09-26 14:30:39 -0500 (Mon, 26 Sep 2011) | 30 lines
    
    Fix deadlock when using dummy channels.
    
    Dummy channels created by ast_dummy_channel_alloc() should be destoyed by
    ast_channel_unref().  Using ast_channel_release() needlessly grabs the
    channel container lock and can cause a deadlock as a result.
    
    * Analyzed use of ast_dummy_channel_alloc() and made use
    ast_channel_unref() when done with the dummy channel.  (Primary reason for
    the reported deadlock.)
    
    * Made app_dial.c:dial_exec_full() not call ast_call() holding any channel
    locks.  Chan_local could not perform deadlock avoidance correctly.
    (Potential deadlock exposed by this issue.  Secondary reason for the
    reported deadlock since the held lock was part of the deadlock chain.)
    
    * Fixed some uses of ast_dummy_channel_alloc() not checking the returned
    channel pointer for failure.
    
    * Fixed some potential chan=NULL pointer usage in func_odbc.c.  Protected
    by testing the bogus_chan value.
    
    * Fixed needlessly clearing a 1024 char auto array when setting the first
    char to zero is enough in manager.c:action_getvar().
    
    (closes issue ASTERISK-18613)
    Reported by: Thomas Arimont
    Patches:
          jira_asterisk_18613_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Thomas Arimont
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-26 19:40:12 +00:00
Olle Johansson cab155e437 Merged revisions 336441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336441 | oej | 2011-09-19 14:15:06 +0200 (Mån, 19 Sep 2011) | 9 lines
  
  Merged revisions 336440 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336440 | oej | 2011-09-19 14:06:48 +0200 (Mån, 19 Sep 2011) | 2 lines
    
    Make sure manager_debug option is reset at reload
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 12:20:44 +00:00
Matthew Nicholson ec31b52547 Merged revisions 335791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335791 | mnicholson | 2011-09-14 08:28:50 -0500 (Wed, 14 Sep 2011) | 11 lines
  
  Merged revisions 335790 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335790 | mnicholson | 2011-09-14 08:28:16 -0500 (Wed, 14 Sep 2011) | 4 lines
    
    The tech and data members of fast_originate_helper are not string fields.
    
    ASTERISK-17709
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-14 13:29:41 +00:00
Matthew Nicholson b292ff3b32 Merged revisions 335653 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335653 | mnicholson | 2011-09-13 13:47:57 -0500 (Tue, 13 Sep 2011) | 12 lines
  
  Merged revisions 335618 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335618 | mnicholson | 2011-09-13 13:20:52 -0500 (Tue, 13 Sep 2011) | 5 lines
    
    Don't limit the size of appdata for manager originate actions.
    
    ASTERISK-17709
    Patch by: tilghman (with modifications)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-13 18:49:26 +00:00
Matthew Jordan 3b53a9cdb3 Merged revisions 332817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r332817 | mjordan | 2011-08-22 13:15:51 -0500 (Mon, 22 Aug 2011) | 4 lines
  
  Review: https://reviewboard.asterisk.org/r/1364/
  
  This update adds a new AMI event, TestEvent, which is enabled when the TEST_FRAMEWORK compiler flag is defined.  It also adds initial usage of this event to app_voicemail.  The TestEvent AMI event is used extensively by the voicemail tests in the Asterisk Test Suite.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-22 19:19:44 +00:00
Kinsey Moore 0208f0ac71 Merged revisions 331316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r331316 | kmoore | 2011-08-10 08:48:41 -0500 (Wed, 10 Aug 2011) | 15 lines
  
  Merged revisions 331315 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r331315 | kmoore | 2011-08-10 08:47:46 -0500 (Wed, 10 Aug 2011) | 8 lines
    
    AMI action ModuleReload returns Error if Module: missing or empty
    
    An empty string was not being checked for properly causing identification of
    the module to be reloaded to fail and return an Error with message
    "No such module."
    
    (closes issue AST-616)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-10 13:49:31 +00:00
Richard Mudgett 145c174565 Merged revisions 328329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

........
  r328329 | rmudgett | 2011-07-14 19:19:32 -0500 (Thu, 14 Jul 2011) | 2 lines
  
  Make hint watcher callback take const strings for context and exten parameters.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-15 00:23:14 +00:00
Leif Madsen a525edea59 Merged revisions 328247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328247 | lmadsen | 2011-07-14 16:25:31 -0400 (Thu, 14 Jul 2011) | 14 lines
  
  Merged revisions 328209 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328209 | lmadsen | 2011-07-14 16:13:06 -0400 (Thu, 14 Jul 2011) | 6 lines
    
    Introduce <support_level> tags in MODULEINFO.
    This change introduces MODULEINFO into many modules in Asterisk in order to show
    the community support level for those modules. This is used by changes committed
    to menuselect by Russell Bryant recently (r917 in menuselect). More information about
    the support level types and what they mean is available on the wiki at
    https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-14 20:28:54 +00:00
Kevin P. Fleming d37ac6a8a0 Merged revisions 327950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327950 | kpfleming | 2011-07-12 17:53:53 -0500 (Tue, 12 Jul 2011) | 14 lines
  
  Correct double-free situation in manager output processing.
  
  The process_output() function calls ast_str_append() and xml_translate() on its
  'out' parameter, which is a pointer to an ast_str buffer. If either of these
  functions need to reallocate the ast_str so it will have more space, they will
  free the existing buffer and allocate a new one, returning the address of the
  new one. However, because process_output only receives a pointer to the ast_str,
  not a pointer to its caller's variable holding the pointer, if the original
  ast_str is freed, the caller will not know, and will continue to use it (and
  later attempt to free it).
  
  (reported by jkroon on #asterisk-dev)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@327953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-12 23:02:31 +00:00
Mark Murawki 8b20d4ffe8 New feature: AMI Action FilterAdd
This adds a new action, FilterAdd to the manager interface that allows control over event filters for the current session

(closes issue ASTERISK-16795)
Reported by: kobaz
Tested by: kobaz,loloski



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-05 16:46:17 +00:00
Leif Madsen 3d6c1ccd91 Merged revisions 324178 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324178 | lmadsen | 2011-06-17 14:51:16 -0400 (Fri, 17 Jun 2011) | 2 lines
  
  Add Username and Secret fields to manager Login action.
  Pointed out by Vlad Povorozniuc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-17 18:52:33 +00:00
Sean Bright affae67cd2 Merged revisions 323608 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r323608 | seanbright | 2011-06-15 11:31:53 -0400 (Wed, 15 Jun 2011) | 39 lines
  
  Merged revisions 323579 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r323579 | seanbright | 2011-06-15 11:22:50 -0400 (Wed, 15 Jun 2011) | 32 lines
    
    Merged revisions 323559 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r323559 | seanbright | 2011-06-15 11:15:30 -0400 (Wed, 15 Jun 2011) | 25 lines
      
      Resolve a segfault/bus error when we try to map memory that falls on a page
      boundary.
      
      The fix for ASTERISK-15359 was incorrect in that it added 1 to the length of the
      mmap'd region.  The problem with this is that reading/writing to that extra byte
      outside of the bounds of the underlying fd causes a bus error.
      
      The real issue is that we are working with both a FILE * and the raw fd
      underneath it and not synchronizing between them.  The code that was removed in
      ASTERISK-15359 was correct, but we weren't flushing the FILE * before mapping
      the fd.
      
      Looking at the manager code in 1.4 reveals that the FILE * in 'struct
      mansession' is never used except to create a temporary file that we immediately
      fdopen.  This means we just need to write a 0 byte to the fd and everything will
      just work.  The other branches require a call to fflush() which, while not a
      guaranteed fix, should reduce the likelihood of a crash.
      
      This all makes sense in my head.
      
      (closes issue ASTERISK-16460)
      Reported by: Ravelomanantsoa Hoby (hoby)
      Patches:
      		issue17747_1.4_svn_markII.patch uploaded by Sean Bright (license #5060)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-15 15:33:57 +00:00
Richard Mudgett 0096238b52 Merged revisions 320823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320823 | rmudgett | 2011-05-25 12:06:38 -0500 (Wed, 25 May 2011) | 18 lines
  
  The AMI Newstate event contains different information between v1.4 and v1.8.
  
  The addition of connected line support in v1.8 changes the behavior of the
  channel caller ID somewhat.  The channel caller ID value no longer time
  shares with the connected line ID on outgoing call legs.  The timing of
  some AMI events/responses output the connected line ID as caller ID.
  These party ID's are now separate.
  
  * The ConnectedLineNum and ConnectedLineName headers were added to many
  AMI events/responses if the CallerIDNum/CallerIDName headers were also
  present.
  
  (closes issue #18252)
  Reported by: gje
  Tested by: rmudgett
  
  Review: https://reviewboard.asterisk.org/r/1227/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-25 17:14:11 +00:00
Richard Mudgett 024e4bd0f7 Merged revisions 320650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320650 | rmudgett | 2011-05-23 12:53:44 -0500 (Mon, 23 May 2011) | 16 lines
  
  Add ConnectedLineNum/Name headers to output of AMI action Status.
  
  * Add ConnectedLineNum and ConnectedLineName headers to the output of the
  AMI action Status.  This makes it easier to find out who the channel is
  connected to without having to lookup BridgedChannel or when they are
  connected to an application (e.g.: VoiceMail) which has no bridged
  channel.
  
  * Bridged channels with no CallerID had "" instead of "<unknown>" output,
  that might be a bug as "<unknown>" was what older versions used.
  
  (closes issue #18158)
  Reported by: gareth
  Patches:
        svn-292308.diff uploaded by gareth (license 208)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-23 18:00:02 +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 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
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
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
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
Matthew Nicholson 079e794b1c Merged revisions 314628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r314628 | mnicholson | 2011-04-21 13:24:05 -0500 (Thu, 21 Apr 2011) | 27 lines
  
  Merged revisions 314620 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r314620 | mnicholson | 2011-04-21 13:22:19 -0500 (Thu, 21 Apr 2011) | 20 lines
    
    Merged revisions 314607 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r314607 | mnicholson | 2011-04-21 13:19:21 -0500 (Thu, 21 Apr 2011) | 14 lines
      
      Added limits to the number of unauthenticated sessions TCP based protocols are allowed to have open simultaneously.  Also added timeouts for unauthenticated sessions where it made sense to do so.
      
      Unrelated, the manager interface now properly checks if the user has the "system" privilege before executing shell commands via the Originate action. 
      
      AST-2011-005
      AST-2011-006
      
      (closes issue #18787)
      Reported by: kobaz
      
      (related to issue #18996)
      Reported by: tzafrir
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-21 18:32:50 +00:00
Matthew Nicholson a77fd545ab Merged revisions 312766 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r312766 | mnicholson | 2011-04-05 09:14:50 -0500 (Tue, 05 Apr 2011) | 22 lines
  
  Merged revisions 312764 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r312764 | mnicholson | 2011-04-05 09:13:07 -0500 (Tue, 05 Apr 2011) | 15 lines
    
    Merged revisions 312761 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r312761 | mnicholson | 2011-04-05 09:10:34 -0500 (Tue, 05 Apr 2011) | 8 lines
      
      Limit the number of unauthenticated manager sessions and also limit the time they have to authenticate.
      
      AST-2011-005
      
      (closes issue #18996)
      Reported by: tzafrir
      Tested by: mnicholson
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-05 14:16:21 +00:00
Matthew Nicholson 581bfad2f3 Merged revisions 311141 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r311141 | mnicholson | 2011-03-17 10:00:33 -0500 (Thu, 17 Mar 2011) | 11 lines
  
  Merged revisions 311140 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r311140 | mnicholson | 2011-03-17 09:58:52 -0500 (Thu, 17 Mar 2011) | 4 lines
    
    Don't write items to the manager socket twice.
    
    AST-2011-003
    
    (closes issue 0018987)
    Reported by: ks-steven
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-17 15:02:12 +00:00
Terry Wilson d0846ea207 Merged revisions 310993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r310993 | twilson | 2011-03-16 14:26:57 -0500 (Wed, 16 Mar 2011) | 11 lines
  
  Merged revisions 310992 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r310992 | twilson | 2011-03-16 14:23:03 -0500 (Wed, 16 Mar 2011) | 4 lines
    
    Don't keep trying to write to a closed connection
    
    See security advisory AST-2011-003.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-16 19:51:04 +00:00
Terry Wilson 254092f8f6 Merged revisions 310240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r310240 | twilson | 2011-03-10 10:05:45 -0600 (Thu, 10 Mar 2011) | 13 lines
  
  Add \r\n to remaining http headers passed to ast_http_send
  
  r309204 changed the behavior of ast_http_send. It now requires headers
  to be passed with trailing \r\n. This change updates the remaining
  instances in the code that did not pass the \r\n.
  
  (closes issue #18186)
  Reported by: nivaldomjunior
  Patches: 
        res_phoneprov.c.diff uploaded by lathama (license 1028)
        manager.diff.txt uploaded by twilson (license 396)
  Tested by: lathama
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@310241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-10 16:09:09 +00:00
Terry Wilson f88ef55d74 Merged revisions 308815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308815 | twilson | 2011-02-24 11:57:18 -0600 (Thu, 24 Feb 2011) | 26 lines
  
  Merged revisions 308814 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r308814 | twilson | 2011-02-24 11:54:49 -0600 (Thu, 24 Feb 2011) | 19 lines
    
    Merged revisions 308813 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r308813 | twilson | 2011-02-24 11:42:16 -0600 (Thu, 24 Feb 2011) | 12 lines
      
      Don't broadcast FullyBooted to every AMI connection
      
      The FullyBooted event should not be sent to every AMI connection every
      time someone connects via AMI. It should only be sent to the user who
      just connected.
      
      (closes issue #18168)
      Reported by: FeyFre
      Patches: 
            bug0018168.patch uploaded by FeyFre (license 1142)
      Tested by: FeyFre, twilson
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-24 17:59:32 +00:00
Jeff Peeler 3d667d7c0f Send manager event for blackfilter only if it DOES NOT match.
The logic got reversed, oops. Works properly now when multiple blackfilters are
present.

(closes issue #18283)
Reported by: telecos82
Patches: 
      ast_managereventfilter.patch uploaded by telecos82 (license 687)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-04 22:37:11 +00:00
Paul Belanger 3556e4c2d4 Replace ast_log(LOG_DEBUG, ...) with ast_debug()
(closes issue #18556)
Reported by: kkm

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-04 16:55:39 +00:00
David Vossel c26c190711 Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal.  For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal

The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs.  Functionally
no change in behavior should be present in this patch.  Thanks to twilson
and russell for all the time they spent reviewing these changes.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 16:22:10 +00:00
Richard Mudgett f71322f239 Merged revisions 305923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305923 | rmudgett | 2011-02-02 18:24:40 -0600 (Wed, 02 Feb 2011) | 24 lines
  
  Merged revisions 305889 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r305889 | rmudgett | 2011-02-02 18:15:07 -0600 (Wed, 02 Feb 2011) | 17 lines
    
    Merged revisions 305888 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r305888 | rmudgett | 2011-02-02 18:02:43 -0600 (Wed, 02 Feb 2011) | 8 lines
    
      Minor AST_FRAME_TEXT related issues.
    
      * Include the null terminator in the buffer length.  When the frame is
      queued it is copied.  If the null terminator is not part of the frame
      buffer length, the receiver could see garbage appended onto it.
    
      * Add channel lock protection with ast_sendtext().
    
      * Fixed AMI SendText action ast_sendtext() return value check.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 00:29:46 +00:00
Russell Bryant 1c469717a4 Merged revisions 302837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302837 | russell | 2011-01-19 17:56:48 -0600 (Wed, 19 Jan 2011) | 2 lines
  
  Only check container count if it exists.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 23:57:27 +00:00
Russell Bryant b822431266 Merged revisions 302789 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302789 | russell | 2011-01-19 17:06:46 -0600 (Wed, 19 Jan 2011) | 11 lines
  
  Merged revisions 302788 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r302788 | russell | 2011-01-19 17:06:14 -0600 (Wed, 19 Jan 2011) | 4 lines
    
    Turn a noisy verbose message into a debug message.
    
    This can drown your console if you're using the AMI over HTTP.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 23:07:22 +00:00
Russell Bryant 0a6082c45a Merged revisions 302785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302785 | russell | 2011-01-19 16:35:15 -0600 (Wed, 19 Jan 2011) | 15 lines
  
  Resolve a memory leak with the manager interface is disabled.
  
  The intent of this check as it stands in previous versions of Asterisk was to
  check if there are any active sessions.  If there were no sessions, then the
  function would return immediately and not bother with queueing up the manager
  event to be processed.  Since the conversion of storing sessions in an astobj2
  container, this check will always pass.  I changed it to go back to checking
  what was intended.
  
  The side effect of this was that if the AMI is disabled, the manager event
  queue is populated anyway, but the code that runs to clear out the queue
  never runs.  A producer with no consumer is a bad thing.
  
  Reported internally by kmorgan.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 22:36:30 +00:00
Matthew Nicholson 8ad7304e66 Merged revisions 301595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301595 | mnicholson | 2011-01-12 12:51:37 -0600 (Wed, 12 Jan 2011) | 22 lines
  
  Merged revisions 301594 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r301594 | mnicholson | 2011-01-12 12:50:31 -0600 (Wed, 12 Jan 2011) | 15 lines
    
    Removed a usleep(1) that shouldn't be necessary in session_do, and removed the
    ms_t member from the mansession_session structure.
    
    Merged revisions 301591 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r301591 | mnicholson | 2011-01-12 12:39:03 -0600 (Wed, 12 Jan 2011) | 5 lines
      
      Don't store the thread id for the manager session in the structure we pass to
      the thread for the manager session.
      
      ABE-2543
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-12 18:52:30 +00:00
Paul Belanger 0aacbecacc Merged revisions 293611 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293611 | pabelanger | 2010-11-02 16:45:09 -0400 (Tue, 02 Nov 2010) | 2 lines
  
  If manager and tls are disabled, do not display TCP/TLS Bindaddress.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-02 20:47:37 +00:00
David Vossel 9189752c51 Merged revisions 292595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292595 | dvossel | 2010-10-21 11:14:33 -0500 (Thu, 21 Oct 2010) | 14 lines
  
  Fixes recursive lock problem in manager.c
  
  It is possible for a AMI session to freeze because of invalid
  use of recursive locks during the EVENT processing.  This
  patch removes the unnecessary locks.
  
  (closes issue #18167)
  Reported by: sustav
  Patches:
        manager_locking_v1.diff uploaded by dvossel (license 671)
  Tested by: sustav
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-21 16:46:15 +00:00
David Vossel a023be409e Merged revisions 291227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291227 | dvossel | 2010-10-12 10:58:56 -0500 (Tue, 12 Oct 2010) | 16 lines
  
  Fixes manager.c crash.
  
  This issue was caused by improper use of the mansession lock and
  manession_session lock.  These two structures are confusing to begin
  with so I'm not surprised this occurred.  I fixed this by consistently
  making sure we use each of these locks only to protect the data
  in the corresponding structure.  We had mismatched usage of these
  locks which resulted in no mutual exclusivity occurring at all.
  
  
  (closes issue #17994)
  Reported by: vrban
  Patches:
        mansession_locking_fix.diff uploaded by dvossel (license 671)
  Tested by: vrban
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-12 16:00:06 +00:00
Olle Johansson 138d5165e3 Merged revisions 289951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289951 | oej | 2010-10-02 10:56:08 +0200 (Lör, 02 Okt 2010) | 16 lines
  
  Merged revisions 289950 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289950 | oej | 2010-10-02 10:52:03 +0200 (Lör, 02 Okt 2010) | 9 lines
    
    Merged revisions 289949 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289949 | oej | 2010-10-02 10:50:05 +0200 (Lör, 02 Okt 2010) | 2 lines
      
      Add documentation for undocumented option to AMI action originate
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-02 08:58:34 +00:00
Terry Wilson 9c1c787c36 Merged revisions 288572 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288572 | twilson | 2010-09-23 13:05:16 -0500 (Thu, 23 Sep 2010) | 2 lines
  
  Make AMI honor enabled=no
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-23 18:08:23 +00:00
Olle Johansson 3478cfffca Merged revisions 287471 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287471 | oej | 2010-09-19 18:09:28 +0200 (Sön, 19 Sep 2010) | 21 lines
  
  Merged revisions 287470 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287470 | oej | 2010-09-19 18:06:10 +0200 (Sön, 19 Sep 2010) | 14 lines
    
    Merged revisions 287469 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287469 | oej | 2010-09-19 17:56:50 +0200 (Sön, 19 Sep 2010) | 7 lines
      
      Make sure we always free variables properly in manager originate.
      
      (closes issue #17891)
      reported, solved and tested by oej
      
      Review: https://reviewboard.asterisk.org/r/869/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287472 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-19 16:12:08 +00:00