asterisk/asterisk.git
8 years agoUse int for storing ao2_container_count instad of size_t
Terry Wilson [Tue, 25 Oct 2011 21:11:14 +0000 (21:11 +0000)]
Use int for storing ao2_container_count instad of size_t

AST-676
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342437 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoSimplify queue membercount code
Terry Wilson [Tue, 25 Oct 2011 20:07:59 +0000 (20:07 +0000)]
Simplify queue membercount code

Despite an ominous sounding comment stating that membercount was for "logged
in" members only and thus we couldn't use ao2_container_count(), I could not
find a single place in the code where that seemed to be accurate. The only time
we decremented membercount was when we were marking something dead or actually
removing it. The only places we incremented it were either after ao2_link(), or
trying to correct for having set it to 0 during a reload. In every case where
we were correcting the value, it seemed that we were trying to make the count
actually match what ao2_container_count() would return. The only place I could
find where we made a determination about something being "logged in" or not, we
didn't trust the membercount, but instead looked at devicestate, paused, etc.

This patch removes membercount, replaces its use with ao2_container_count, and
manually adds the results of ao2_container_count to a "membercount" field for
ast_data queue query results. This patch also would fix AST-676, but as it is
slightly riskier than the previously committed fix, the two commits have been
made separately.

Reivew: https://reviewboard.asterisk.org/r/1541/
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342385 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoProperly update membercount for reloaded members
Terry Wilson [Tue, 25 Oct 2011 19:54:17 +0000 (19:54 +0000)]
Properly update membercount for reloaded members

Since q->membercount is set to 0 before reloading, it is important
to increment it again for reloaded members as well as added.

(closes issue AST-676)

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

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342382 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix compilation on Snow Leopard/FreeBSD for pbx_spool.c
Kinsey Moore [Tue, 25 Oct 2011 19:09:32 +0000 (19:09 +0000)]
Fix compilation on Snow Leopard/FreeBSD for pbx_spool.c

One of the changes in the recent spool handling of hardlinks patch was just
outside a HAVE_INOTIFY block and caused compilation to fail in some build
environments.  This has been corrected.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342330 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 342277 via svnmerge from
Kinsey Moore [Tue, 25 Oct 2011 16:08:52 +0000 (16:08 +0000)]
Merged revisions 342277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r342277 | kmoore | 2011-10-25 11:08:04 -0500 (Tue, 25 Oct 2011) | 25 lines

  Merged revisions 342276 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r342276 | kmoore | 2011-10-25 11:06:57 -0500 (Tue, 25 Oct 2011) | 18 lines

    Fix spool handling to allow call files to be hardlinked into place

    This fixes the inotify code to handle call files being hardlinked into the
    spool directory.

    The smsq utility does this, instead of rename(), to ensure that it cannot
    accidentally overwrite an existing spool file. A rename() might do that, but
    link() will definitely not.

    The inotify code had broken this, because it would wait for an IN_CLOSE_WRITE
    event on the file... which was never forthcoming, since it was never opened.
    Now we look for IN_OPEN events following the IN_CREATE event, and only wait
    for an IN_CLOSE_WRITE if the file was actually opened.

    Patch-by: dwmw2
    (closes issue ASTERISK-18331)
    Review: https://reviewboard.asterisk.org/r/1391/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342278 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoReturn NULL when no results returned for realtime_multientry
Terry Wilson [Tue, 25 Oct 2011 01:29:32 +0000 (01:29 +0000)]
Return NULL when no results returned for realtime_multientry

It was not documented what the return value should be when no entries
were returned with the multientry realtime callback. This change forces
consistent behavior even if the backends return an empty ast_config.

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

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342225 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix ao2obj.h comment typos and add missing link/unlink nolock debug defines.
Richard Mudgett [Mon, 24 Oct 2011 22:37:58 +0000 (22:37 +0000)]
Fix ao2obj.h comment typos and add missing link/unlink nolock debug defines.
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342184 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFixes a segfault caused by referencing null frames introduced in r338623
Jonathan Rose [Mon, 24 Oct 2011 22:09:11 +0000 (22:09 +0000)]
Fixes a segfault caused by referencing null frames introduced in r338623

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342148 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix use of OBJ_KEY in Queue application.
Richard Mudgett [Mon, 24 Oct 2011 21:01:58 +0000 (21:01 +0000)]
Fix use of OBJ_KEY in Queue application.

To use the new OBJ_KEY flag, the container hash and compare callback
functions must be updated to support OBJ_KEY.  Otherwise, bad things
happen.

(issue ASTERISK-14769)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342112 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoOutbound SIP OPTIONS messages will now include fromuser of related peer.
Jonathan Rose [Mon, 24 Oct 2011 20:01:28 +0000 (20:01 +0000)]
Outbound SIP OPTIONS messages will now include fromuser of related peer.

This behavior matches up more closely with the way invite/register/etc are handled.
This patch also modifies some adjacent code for code style compliance.  Pretty minor.

(closes issue ASTERISK-17616)
Reported by: Jeremy Kister
Patches:
     chan_sip.c-options-fromuser-fix-v1.patch uploaded by Jeremy Kister (license #6232)
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342063 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoqueues container needs locking when using the OBJ_NOLOCK flag
Gregory Nietsky [Mon, 24 Oct 2011 07:40:18 +0000 (07:40 +0000)]
queues container needs locking when using the OBJ_NOLOCK flag
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342018 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoRemove some ref leaks and a return without unlock.
Gregory Nietsky [Sun, 23 Oct 2011 14:35:26 +0000 (14:35 +0000)]
Remove some ref leaks and a return without unlock.

There some resource leaks introduced in asterisk 10
make sure that locks are not held on return and we
release ref's held.
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341973 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoWhitespace Fixups / Add Braces
Gregory Nietsky [Sun, 23 Oct 2011 11:37:50 +0000 (11:37 +0000)]
Whitespace Fixups / Add Braces

This janitorial patch is related to work on RB1538

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341923 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 341313 via svnmerge from
Alexandr Anikin [Sat, 22 Oct 2011 12:03:23 +0000 (12:03 +0000)]
Merged revisions 341313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r341313 | may | 2011-10-19 03:33:49 +0400 (Wed, 19 Oct 2011) | 10 lines

  Merged revisions 341312 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r341312 | may | 2011-10-19 03:20:53 +0400 (Wed, 19 Oct 2011) | 3 lines

    fix issue on channel numbering (calls could have same channel number
    on heavy loaded system)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341869 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoonly process args that exist
Matthew Nicholson [Fri, 21 Oct 2011 16:42:56 +0000 (16:42 +0000)]
only process args that exist

ASTERISK-18395
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341811 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agodon't limit the length of app and function arguments
Matthew Nicholson [Fri, 21 Oct 2011 16:22:23 +0000 (16:22 +0000)]
don't limit the length of app and function arguments

ASTERISK-18395
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341808 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoWhite space fixes in res_fax
Gregory Nietsky [Fri, 21 Oct 2011 09:16:12 +0000 (09:16 +0000)]
White space fixes in res_fax

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341769 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix AGI exec Park to honor the Park application parameters.
Richard Mudgett [Thu, 20 Oct 2011 22:03:35 +0000 (22:03 +0000)]
Fix AGI exec Park to honor the Park application parameters.

The fix for ASTERISK-12715 and ASTERISK-12685 added a check for the Park
application because the channel needed to be masqueraded to prevent a
crash.  Since the Park application now always masquerades the channel into
the parking lot, the special check is no longer needed.  The fix also
resulted in AGI exec Park attempting to double park the call and not honor
the Park application parameters.

* Removed no longer necessary call to ast_masq_park_call() by AGI exec for
the Park application.  (Reverts -r146923)

* Fix Park application to only return 0 or -1.  The AGI exec Park was
causing broken pipe error messages because the Park application returned 1
on successful park.

(closes issue ASTERISK-18737)
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341719 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFixed typo from previous commit
Paul Belanger [Thu, 20 Oct 2011 21:28:31 +0000 (21:28 +0000)]
Fixed typo from previous commit
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341713 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoUpdated documentation for the optional CID parameter with CALLERID
Paul Belanger [Thu, 20 Oct 2011 20:48:31 +0000 (20:48 +0000)]
Updated documentation for the optional CID parameter with CALLERID
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341666 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 341599 via svnmerge from
Gregory Nietsky [Thu, 20 Oct 2011 18:27:29 +0000 (18:27 +0000)]
Merged revisions 341599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r341599 | irroot | 2011-10-20 20:20:08 +0200 (Thu, 20 Oct 2011) | 8 lines

  add documentation for check_state_unknown in configs/queues.conf.sample

  app_queue allows calls to members in a "Unknown" state to be treated as available
  setting check_state_unknown = yes will cause app_queue to query the channel driver
  to better determine the state this only applies to queues with ringinuse or ignorebusy
  set appropriately.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 341580 via svnmerge from
Gregory Nietsky [Thu, 20 Oct 2011 17:34:54 +0000 (17:34 +0000)]
Merged revisions 341580 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r341580 | irroot | 2011-10-20 19:13:23 +0200 (Thu, 20 Oct 2011) | 15 lines

  Add option to check state when state is unknown

  r341486 reverts r325483 this is a rework of the patch.
  optimize to minimize load.

  add option check_state_unknown to control whether a member with unknown
  device state is checked there is a small % chance that calls will be sent
  to the member when they on a call.

  app_queue will see a device with unknown state as available and does not
  try verify the state without this option enabled.

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341583 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoClean up ast_check_digits
Terry Wilson [Thu, 20 Oct 2011 15:17:53 +0000 (15:17 +0000)]
Clean up ast_check_digits

The code was originally copied from the is_int() function in the AEL
code. wdoekes pointed out that the function should take a const char*
and that their was an unneeded variable. This is now fixed.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341533 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 341486 via svnmerge from
Matthew Nicholson [Wed, 19 Oct 2011 21:24:07 +0000 (21:24 +0000)]
Merged revisions 341486 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r341486 | mnicholson | 2011-10-19 16:23:17 -0500 (Wed, 19 Oct 2011) | 18 lines

  Fix a performance regression introduced in r325483.

  The regression was caused by a call to ast_parse_device_state() in app_queue's
  ring_entry() function. The ast_parse_device_state() function eventually calls
  ast_channel_get_full() with a channel name prefix which causes it to walk the
  channel list causing massive lock contention and slow downs.

  This patch fixes the regression by removing the call to
  ast_parase_device_state() which should be unnecessary. Queue member device
  state should be maintained by device state events. Some users have seen
  instances where busy agents were called when they shouldn't have, which is the
  reason the call to ast_parse_device_state() was added. That change appears to
  have resolved that issue but also causes this performance regression. There may
  still be issues with queue member status, and if so, alternative methods should
  be investigated to resolve them.

  AST-695
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341487 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoOutgoing calls with Google Voice
Paul Belanger [Wed, 19 Oct 2011 19:02:09 +0000 (19:02 +0000)]
Outgoing calls with Google Voice

Google has recently make some changes (again) to their protocol.  Rather then
patching asterisk to flip between the two different methods, we now allow both.

Lets hope this keeps Google Voice happy for a while.

(closes issue ASTERISK-18714)
Reported by: Iordan Iordanov
Patches:
    chan_gtalk.patch uploaded by Iordan Iordanov (licenses 6311)
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341437 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoDon't use is_int() since it doesn't link well on all platforms
Terry Wilson [Wed, 19 Oct 2011 07:45:06 +0000 (07:45 +0000)]
Don't use is_int() since it doesn't link well on all platforms

Just create an normal API function in strings.h that does the same thing
just to be safe.

ASTERISK-17146
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341381 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoDon't sent in-dialog requests like UPDATE when Asterisk has not yet received a Contac...
Stefan Schmidt [Wed, 19 Oct 2011 07:27:58 +0000 (07:27 +0000)]
Don't sent in-dialog requests like UPDATE when Asterisk has not yet received a Contact URI from a UAS
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341378 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoDon't resolve numeric hosts or contact unresolved hosts
Terry Wilson [Tue, 18 Oct 2011 23:45:35 +0000 (23:45 +0000)]
Don't resolve numeric hosts or contact unresolved hosts

If a SIP dial string contains a numeric hostname that is not a peer name,
don't try to resolve it as it is unlikely that someone really means
Dial(SIP/0.0.4.26) when Dial(SIP/1050) is called. Also, make sure that
create_addr returns -1 if an address isn't resolved so that we don't
attempt to send SIP requests to an address that doesn't resolve.

(closes issue ASTERISK-17146, ASTERISK-17716)

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

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341316 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMore parking issues.
Richard Mudgett [Tue, 18 Oct 2011 21:15:45 +0000 (21:15 +0000)]
More parking issues.

* Fix potential deadlocks in SIP and IAX blind transfer to parking.

* Fix SIP, IAX, DAHDI analog, and MGCP channel drivers to respect the
parkext_exclusive option with transfers (Park(,,,,,exclusive_lot)
parameter).  Created ast_park_call_exten() and ast_masq_park_call_exten()
to maintian API compatibility.

* Made masq_park_call() handle a failed ast_channel_masquerade() setup.

* Reduced excessive struct parkeduser.peername[] size.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341256 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoRemove an unused include of md5.h
Tzafrir Cohen [Mon, 17 Oct 2011 17:58:00 +0000 (17:58 +0000)]
Remove an unused include of md5.h

Unused include of asterisk/md5.h in pbx_realtime.c . A commit needed to
test the commit message.

Merged-From: http://svn.asterisk.org/svn/asterisk/branches/1.8@341074

Merged-From: http://svn.asterisk.org/svn/asterisk/branches/10@341148

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341198 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoInitialize variables before calling parse_uri
Terry Wilson [Mon, 17 Oct 2011 17:38:53 +0000 (17:38 +0000)]
Initialize variables before calling parse_uri

If parse_uri was called with an empty URI, some pointers would be
modified and an invalid read could result. This patch avoids calling
parse_uri with an empty contact uri when parsing REGISTER requests.

AST-2011-012

(closes issue ASTERISK-18668)
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341191 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoSet 'core' support level for test_format_api.c
Paul Belanger [Mon, 17 Oct 2011 16:39:14 +0000 (16:39 +0000)]
Set 'core' support level for test_format_api.c
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341147 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMultiple revisions 341108,341112
Paul Belanger [Mon, 17 Oct 2011 16:27:42 +0000 (16:27 +0000)]
Multiple revisions 341108,341112

........
  r341108 | pabelanger | 2011-10-17 12:22:19 -0400 (Mon, 17 Oct 2011) | 2 lines

  Voicemail compiler flags are 'core' support
........
  r341112 | pabelanger | 2011-10-17 12:23:33 -0400 (Mon, 17 Oct 2011) | 2 lines

  Fix previous commit
........

Merged revisions 341108,341112 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341126 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoAdd information about limitations of new codec support in channel drivers.
Jason Parker [Mon, 17 Oct 2011 16:18:48 +0000 (16:18 +0000)]
Add information about limitations of new codec support in channel drivers.

(issue ASTERISK-18680)
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341096 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoDon't try to remove peers without IPs from peers_by_ip
Terry Wilson [Mon, 17 Oct 2011 15:45:18 +0000 (15:45 +0000)]
Don't try to remove peers without IPs from peers_by_ip

(closes issue ASTERISK-18696)
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341090 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoChange the internal name of the menuselect options that are used to control
Kevin P. Fleming [Fri, 14 Oct 2011 21:37:51 +0000 (21:37 +0000)]
Change the internal name of the menuselect options that are used to control
whether modules are embedded or not; using just the bare category name led to
accidentally enabling these options when users used the wrong "--enable"
operation on the menuselect command line.

Now the internal option names are prefixed with "EMBED_", so they won't be
the same as the name of the category containing the modules they control
the embedding of.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@341024 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix simple switch to not progress a call when call already progressed.
Damien Wedhorn [Fri, 14 Oct 2011 21:15:33 +0000 (21:15 +0000)]
Fix simple switch to not progress a call when call already progressed.

If a simple switch was started on a device and then a specific call
made (such as redial or speed dial), on timeout of the simple switch
the call would be attempted again. This patch only allows the simple
switch to make a call if the substate is still in the collecting
digits mode.

Also added small debug message to dialAndAactivate sub.

Tested by snuff and myself.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340973 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340971 via svnmerge from
Kinsey Moore [Fri, 14 Oct 2011 20:51:19 +0000 (20:51 +0000)]
Merged revisions 340971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340971 | kmoore | 2011-10-14 15:50:37 -0500 (Fri, 14 Oct 2011) | 15 lines

  Merged revisions 340970 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r340970 | kmoore | 2011-10-14 15:49:39 -0500 (Fri, 14 Oct 2011) | 8 lines

    Quiet RTCP Receiver Reports during fax transmission

    RTCP is now disabled for "inactive" RTP audio streams during SIP T.38 sessions.
    The ability to disable RTCP streams in res_rtp_asterisk was missing, so this
    code was added to support the bug fix.

    (closes issue ASTERISK-18400)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340972 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoSome additional module documentation changes for 10 for the menuselect change.
Jonathan Rose [Fri, 14 Oct 2011 18:38:08 +0000 (18:38 +0000)]
Some additional module documentation changes for 10 for the menuselect change.

(issue ASTERISK-18268)
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340932 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoAvoid unnecessary WARNING message
Terry Wilson [Fri, 14 Oct 2011 16:45:19 +0000 (16:45 +0000)]
Avoid unnecessary WARNING message

Add AST_CONTROL_UPDATE_RTP_PEER frame to be ignored here to avoid
displaying a WARNING message.

(closes issue ASTERISK-18610)
 Patch by: Kristijan_Vrban
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340880 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix DTMF blind transfer continuing to execute dialplan after transfer.
Richard Mudgett [Thu, 13 Oct 2011 23:08:48 +0000 (23:08 +0000)]
Fix DTMF blind transfer continuing to execute dialplan after transfer.

Party A calls Party B.
Party A DTMF blind transfers Party B to Party C.
Party A channel continues to execute dialplan.

* Fixed the return value of builtin_blindtransfer() to return the correct
value after a transfer so the dialplan will not keep executing.

* Removed unnecessary connected line update that did not really do
anything.

* Made access to GOTO_ON_BLINDXFR thread safe in check_goto_on_transfer().

* Fixed leak of xferchan for failure cases in check_goto_on_transfer().

* Updated debug messages in builtin_blindtransfer() and
check_goto_on_transfer().

(closes issue ASTERISK-18275)
Reported by: rmudgett
Tested by: rmudgett
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340813 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoUpdate 10 merged property.
Richard Mudgett [Thu, 13 Oct 2011 23:06:24 +0000 (23:06 +0000)]
Update 10 merged property.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340812 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoRestore branch 10 merge properties.
Richard Mudgett [Thu, 13 Oct 2011 22:58:30 +0000 (22:58 +0000)]
Restore branch 10 merge properties.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340811 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339463 via svnmerge from
Gregory Nietsky [Thu, 13 Oct 2011 08:53:05 +0000 (08:53 +0000)]
Merged revisions 339463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339463 | irroot | 2011-10-05 08:28:46 +0200 (Wed, 05 Oct 2011) | 9 lines

  Only change the capabilities on the gateway when
  the session is been destroyed there is still
  a race condition that ends in a segfault.

  if the caps are changed the logic in res_fax_spandsp
  will run T30 code not gateway code to end the session.
  this has been experienced on a "slower" under spec system.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340771 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340718 via svnmerge from
Stefan Schmidt [Thu, 13 Oct 2011 07:05:43 +0000 (07:05 +0000)]
Merged revisions 340718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340718 | schmidts | 2011-10-13 06:59:50 +0000 (Thu, 13 Oct 2011) | 9 lines

  Merged revisions 340717 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r340717 | schmidts | 2011-10-13 06:58:00 +0000 (Thu, 13 Oct 2011) | 3 lines

    storing the route-set also on a 181 response not only on 180,182 or 183.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340720 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoInitialize ast_sockaddr before calling ast_sockaddr_resolve
Terry Wilson [Thu, 13 Oct 2011 07:02:11 +0000 (07:02 +0000)]
Initialize ast_sockaddr before calling ast_sockaddr_resolve

Avoid possible jump based on unitialized value
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340719 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoDon't skip the query field on a realtime multi query
Terry Wilson [Thu, 13 Oct 2011 00:17:42 +0000 (00:17 +0000)]
Don't skip the query field on a realtime multi query

There is no documented reason to not add the query field to the varlist
returned by a realtime multi query, despite the config category being
set to its value. Of course, there is no documentation that the category
should be set to the value either. There is lots of no documentation
when it comes to realtime. But, other engines do not skip this field so
I am forcing this backend to follow the convention, because not doing so
is very silly.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340665 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340577 via svnmerge from
Stefan Schmidt [Wed, 12 Oct 2011 21:28:52 +0000 (21:28 +0000)]
Merged revisions 340577 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340577 | schmidts | 2011-10-12 20:33:37 +0000 (Mit, 12 Okt 2011) | 9 lines

  Merged revisions 340576 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r340576 | schmidts | 2011-10-12 20:30:37 +0000 (Mit, 12 Okt 2011) | 3 lines

    Store route-set from provisional SIP responses so early-dialog requests can be routed properly
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340626 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340578 via svnmerge from
Terry Wilson [Wed, 12 Oct 2011 21:02:24 +0000 (21:02 +0000)]
Merged revisions 340578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340578 | twilson | 2011-10-12 13:57:19 -0700 (Wed, 12 Oct 2011) | 16 lines

  Merged revisions 340534 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r340534 | twilson | 2011-10-12 13:19:36 -0700 (Wed, 12 Oct 2011) | 9 lines

    Update SIP realtime fullcontact regardless of caching

    We should update the fullcontact field in the realtime table whether or
    not rtcachefriends is set. There is no reason to treat a non-cached
    realtime entity differently than a cached in this regard.

    (closes issue ASTERISK-18446)
     Reported by: wdoekes
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340579 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoInitialize the PRI channel alarms properly on startup.
Richard Mudgett [Wed, 12 Oct 2011 20:09:49 +0000 (20:09 +0000)]
Initialize the PRI channel alarms properly on startup.

The PRI channel alarms were initialized with an inverted sense.

(closes issue ASTERISK-18710)
Reported by: Tzafrir Cohen
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340524 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoUpdate MeetMe p and X option documentation when interacting with the s option.
Richard Mudgett [Wed, 12 Oct 2011 17:52:55 +0000 (17:52 +0000)]
Update MeetMe p and X option documentation when interacting with the s option.

ASTERISK-12175 changed the p and X options to not interfere with the s
option when they are used together.  It makes more sense for the s option
to have priority for the DTMF '*' key since it cannot change its
activation code.  Otherwise, you could not use option s with the p or X
options.

JIRA AST-671
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340472 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix verbose messages when IPv6 logic was added
Paul Belanger [Wed, 12 Oct 2011 16:29:14 +0000 (16:29 +0000)]
Fix verbose messages when IPv6 logic was added

(closes issue ASTERISK-18612)
Reported by: Tim Osman
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340420 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoAdd protection for SS7 channel allocation and better glare handling.
Richard Mudgett [Tue, 11 Oct 2011 21:06:55 +0000 (21:06 +0000)]
Add protection for SS7 channel allocation and better glare handling.

* Added a CLI "ss7 show channels" command that might prove useful for
future debugging.

* Made the incoming SS7 channel event check and gripe message uniform.

* Made sure that the DNID string for an incoming call is always
initialized.

(issue ASTERISK-17966)
Reported by: Kenneth Van Velthoven
Patches:
      jira_asterisk_17966_v1.8_glare.patch (license #5621) patch uploaded by rmudgett
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340367 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix some potential deadlocks pointed out by helgrind.
Richard Mudgett [Tue, 11 Oct 2011 19:28:23 +0000 (19:28 +0000)]
Fix some potential deadlocks pointed out by helgrind.

* Fixed deadlock potential calling dialog_unlink_all() in
__sip_autodestruct().  Found by helgrind.

* Fixed deadlock potential in handle_request_invite() after calling
sip_new().  Found by helgrind.

* The sip_new() function now returns with the created channel already
locked.

* Removed the dead code that starts a PBX in in sip_new().  No sip_new()
callers caused that code to be executed and it was a bad thing to do
anyway.

* Removed unused parameters and return value from dialog_unlink_all().

* Made dialog_unlink_all() and __sip_autodestruct() safely obtain the
owner and private channel locks without a deadlock avoidance loop.
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340318 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoUpdate SHA1 code to RFC 6234
Tzafrir Cohen [Tue, 11 Oct 2011 19:06:29 +0000 (19:06 +0000)]
Update SHA1 code to RFC 6234

RFC 6234 is an update to RFC 3174 from which the code was originally taken.
It has a slightly better code, and a better phrased license (simple 3-clause
BSD).

* main/sha1.c is sha1.c from RFC 6234 with formatting changes only.
* include/asterisk/sha1.h merges sha.h and sha-private.h from RFC 6234.
* Removed unused include of asterisk/sha1.h from main/channels.c

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

Merge-From: http://svn.asterisk.org/svn/asterisk/branches/1.8@340263

Merge-From: http://svn.asterisk.org/svn/asterisk/branches/10@340280

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340283 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoConvert registered AMI actions to ao2 objects.
Richard Mudgett [Tue, 11 Oct 2011 18:57:47 +0000 (18:57 +0000)]
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

8 years agoReturn error when no rows are deleted for AMI DBDelTree
Terry Wilson [Mon, 10 Oct 2011 23:10:11 +0000 (23:10 +0000)]
Return error when no rows are deleted for AMI DBDelTree

(closes issue AST-654)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340224 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340222 via svnmerge from
Terry Wilson [Mon, 10 Oct 2011 22:58:10 +0000 (22:58 +0000)]
Merged revisions 340222 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340222 | twilson | 2011-10-10 15:55:39 -0700 (Mon, 10 Oct 2011) | 8 lines

  On astdb conversion, also warn about permissions requirements

  The user running Asterisk must have permission to the directory
  the Asterisk database resides in since SQLite 3 needs to be able
  to create a journal file.

  (closes issue ASTERISK-18174)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340223 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340219-340220 via svnmerge from
Terry Wilson [Mon, 10 Oct 2011 22:54:03 +0000 (22:54 +0000)]
Merged revisions 340219-340220 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340219 | twilson | 2011-10-10 15:38:06 -0700 (Mon, 10 Oct 2011) | 8 lines

  Add astdb conversion utility for Berkeley to SQLite 3

  If someone wants to backtrack from Asterisk 1.8 to 10 they can use the
  astdb2bdb utility to convert the database back to the Berkeley format
  that Asterisk 1.8 uses.

  Review: https://reviewboard.asterisk.org/r/1502/
........
  r340220 | twilson | 2011-10-10 15:39:41 -0700 (Mon, 10 Oct 2011) | 2 lines

  Add a missing file for the astdb2bdb conversion utility
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340221 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340165 via svnmerge from
Matthew Jordan [Mon, 10 Oct 2011 20:39:39 +0000 (20:39 +0000)]
Merged revisions 340165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340165 | mjordan | 2011-10-10 15:30:18 -0500 (Mon, 10 Oct 2011) | 20 lines

  Merged revisions 340164 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r340164 | mjordan | 2011-10-10 15:23:48 -0500 (Mon, 10 Oct 2011) | 13 lines

    Updated chan_sip to place calls on hold if SDP address in INVITE is ANY

    This patch fixes the case where an INVITE is received with c=0.0.0.0 or ::.
    In this case, the call should be placed on hold.  Previously, we checked for
    the address being null; this patch keeps that behavior but also checks for
    the ANY IP addresses.

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

    (closes issue ASTERISK-18086)
    Reported by: James Bottomley
    Tested by: Matt Jordan
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340166 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340109 via svnmerge from
Matthew Nicholson [Mon, 10 Oct 2011 14:16:27 +0000 (14:16 +0000)]
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

8 years agoAdd skinny version 17 protocol support.
Damien Wedhorn [Mon, 10 Oct 2011 00:57:06 +0000 (00:57 +0000)]
Add skinny version 17 protocol support.

Added some data to skinny packet structures to make compatible
with v17. Added protocolversion to device, set on registration
based on the version provided by device.

v17 includes some increased ip space for ip6. This patch increases
ip space in the packets but still only uses ip4. Some packet
structures duplicated (ip4 and ip6 types). ip4 type used unless
version is greater or equal to 17.

Tested by snuff and myself on 7961 with recent 8.5 firmware. Also
tested compatible with old 7960 and older 30VIPs.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340071 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoIncrease SKINNY_MAX_PACKET and add some logging.
Damien Wedhorn [Mon, 10 Oct 2011 00:36:02 +0000 (00:36 +0000)]
Increase SKINNY_MAX_PACKET and add some logging.

Increase SKINNY_MAX_PACKET to 2000 bytes to handle some messages
in v17 that are greater than the old 1000 bytes. Also add some
useful logging regarding packet and session handling.

A device (with protocol v17) was sending a packet with length
greater than 1000 which resulted in the TCP session being
destroyed and registration being retryed.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340070 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 340031 via svnmerge from
Damien Wedhorn [Sun, 9 Oct 2011 22:21:42 +0000 (22:21 +0000)]
Merged revisions 340031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340031 | wedhorn | 2011-10-10 09:18:27 +1100 (Mon, 10 Oct 2011) | 8 lines

  Return -1 to skinny_session if register rejected.

  If device registration is rejected, return -1 so that the session is
  destroyed immediately. Previously, a segfault would occur on a
  graceful shutdown if a register is rejected and the skinny_session
  has not yet timed out.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340032 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339992 via svnmerge from
Damien Wedhorn [Sun, 9 Oct 2011 21:15:09 +0000 (21:15 +0000)]
Merged revisions 339992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339992 | wedhorn | 2011-10-10 08:09:12 +1100 (Mon, 10 Oct 2011) | 9 lines

  Remove log message on traverse session list.

  On destroying a session, a list of sessions is traversed to find the
  matching session. For each session not matching, skinny erroneously
  logged that the session was not matched. While technically correct
  the message was misleading, and tended to indicate errors that
  were not there.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339993 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339942 via svnmerge from
Igor Goncharovskiy [Sun, 9 Oct 2011 01:19:30 +0000 (01:19 +0000)]
Merged revisions 339942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339942 | igorg | 2011-10-09 08:18:02 +0700 (Вск, 09 Окт 2011) | 12 lines

  Merged revisions 339938 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339938 | igorg | 2011-10-09 08:16:09 +0700 (Вск, 09 Окт 2011) | 6 lines

    Fix compilation issue, caused by missed session structure

    (closes issue ASTERISK-18694)
    Reported by: alex70
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339947 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339885 via svnmerge from
Igor Goncharovskiy [Sat, 8 Oct 2011 15:48:34 +0000 (15:48 +0000)]
Merged revisions 339885 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339885 | igorg | 2011-10-08 22:46:27 +0700 (Сбт, 08 Окт 2011) | 13 lines

  Merged revisions 339884 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339884 | igorg | 2011-10-08 22:45:20 +0700 (Сбт, 08 Окт 2011) | 7 lines

    Fix segfault in Unistim channel

    (closes issue ASTERISK-18638)
    Reported by: jonnt
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339886 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339831 via svnmerge from
Igor Goncharovskiy [Sat, 8 Oct 2011 15:05:41 +0000 (15:05 +0000)]
Merged revisions 339831 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339831 | igorg | 2011-10-08 22:01:35 +0700 (Сбт, 08 Окт 2011) | 14 lines

  Merged revisions 339830 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339830 | igorg | 2011-10-08 21:56:35 +0700 (Сбт, 08 Окт 2011) | 8 lines

    Fix char array cast as short array in send_client() function (for ARM
    platform)

    (closes issue ASTERISK-17314)
    Reported by: jjoshua
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339832 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339777 via svnmerge from
Richard Mudgett [Fri, 7 Oct 2011 19:37:33 +0000 (19:37 +0000)]
Merged revisions 339777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339777 | rmudgett | 2011-10-07 14:36:24 -0500 (Fri, 07 Oct 2011) | 12 lines

  Merged revisions 339776 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339776 | rmudgett | 2011-10-07 14:34:55 -0500 (Fri, 07 Oct 2011) | 5 lines

    Initialize option flags for SendURL application.

    (closes issue ASTERISK-18574)
    Reported by: marcelloceschia
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339778 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoRecorded merge of revisions 339681 via svnmerge from
Richard Mudgett [Thu, 6 Oct 2011 23:12:32 +0000 (23:12 +0000)]
Recorded merge of revisions 339681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339681 | wedhorn | 2011-10-06 15:47:08 -0500 (Thu, 06 Oct 2011) | 10 lines

  Fixed segfault on core stop gracefully.

  There was an issue that the cap and confcap pointers for each line and device
  were being memcpy'd so they all pointed to the same ast_format_cap. On
  destroying, a segfault occured on the second call to the same struct.

  skinny reload now works again as well.

  Tested by snuff (in trunk) and myself.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339723 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339720 via svnmerge from
Richard Mudgett [Thu, 6 Oct 2011 23:06:43 +0000 (23:06 +0000)]
Merged revisions 339720 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339720 | rmudgett | 2011-10-06 17:58:40 -0500 (Thu, 06 Oct 2011) | 27 lines

  Merged revisions 339719 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339719 | rmudgett | 2011-10-06 17:47:50 -0500 (Thu, 06 Oct 2011) | 20 lines

    Fix regression in configure script for libpri capability checks.

    JIRA AST-598 added the PRI_L2_PERSISTENCE option to fix BRI PTMP TE layer
    2 persistence issues with some telcos.  ASTERISK-18535 attempted to fix
    the unexpected requirement that libpri *must* have that feature to work
    with Asterisk.  The AST_EXT_LIB_SETUP_DEPENDENT lines made the PRI
    optional features required.  Unfortunately, I thought
    AST_EXT_LIB_SETUP_DEPENDENT didn't do anything useful for libpri and
    deleted those lines for libpri.  The result was the HAVE_PRI_xxx defines
    that control the ability to use optional libpri features were also
    deleted.

    * Created AST_EXT_LIB_SETUP_OPTIONAL configuration macro to allow optional
    features in a library that the source code could take advantage of if the
    code supports the feature.

    (closes issue ASTERISK-18687)
    Reported by: Norbert
    Tested by: rmudgett
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339721 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFixed segfault on core stop gracefully.
Damien Wedhorn [Thu, 6 Oct 2011 20:18:45 +0000 (20:18 +0000)]
Fixed segfault on core stop gracefully.

There was an issue that the cap and confcap pointers for each line and device
were being memcpy'd so they all pointed to the same ast_format_cap. On
destroying, a segfault occured on the second call to the same struct.

skinny reload now works again as well.

Tested by snuff and myself.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339680 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339626 via svnmerge from
Richard Mudgett [Thu, 6 Oct 2011 17:54:42 +0000 (17:54 +0000)]
Merged revisions 339626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339626 | rmudgett | 2011-10-06 12:53:00 -0500 (Thu, 06 Oct 2011) | 25 lines

  Merged revisions 339625 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339625 | rmudgett | 2011-10-06 12:49:38 -0500 (Thu, 06 Oct 2011) | 18 lines

    Fix debugging messages generated by 'udptl debug'.

    * Makes chan_sip set the tag to the channel name.

    * Fixes received debug message sequence number.

    * Removed tx/rx debug message type since it was hard coded to 0.

    * Made udptl.c logged message header consistent if possible: "UDPTL (%s): ".

    * Removed unused rx_expected_seq_no from struct ast_udptl.

    (closes issue ASTERISK-18401)
    Reported by: Kevin P. Fleming
    Patches:
          jira_asterisk_18401_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Matthew Nicholson
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339586 via svnmerge from
Leif Madsen [Thu, 6 Oct 2011 13:43:52 +0000 (13:43 +0000)]
Merged revisions 339586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339586 | lmadsen | 2011-10-06 08:43:21 -0500 (Thu, 06 Oct 2011) | 16 lines

  Merged revisions 339566 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339566 | lmadsen | 2011-10-05 16:30:11 -0500 (Wed, 05 Oct 2011) | 8 lines

    Update prep_tarball script to download pre-exported documentation.

    I've updated the prep_tarball script to now download the pre-exported documentation
    from the Asterisk wiki. This will give us more control over what is being included
    in the tarball releases, and will make both the PDF and HTML exported documentation
    look much better (especially when viewing from a console).

    (Closes issue ASTERISK-18677)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339587 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339512 via svnmerge from
Richard Mudgett [Wed, 5 Oct 2011 17:02:17 +0000 (17:02 +0000)]
Merged revisions 339512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339512 | rmudgett | 2011-10-05 12:01:46 -0500 (Wed, 05 Oct 2011) | 9 lines

  Merged revisions 339511 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339511 | rmudgett | 2011-10-05 12:01:01 -0500 (Wed, 05 Oct 2011) | 1 line

    Fix Dial F option notes formatting.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339513 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339508 via svnmerge from
Richard Mudgett [Wed, 5 Oct 2011 16:36:49 +0000 (16:36 +0000)]
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

8 years agoMerged revisions 339507 via svnmerge from
Matthew Nicholson [Wed, 5 Oct 2011 16:35:03 +0000 (16:35 +0000)]
Merged revisions 339507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339507 | mnicholson | 2011-10-05 11:32:59 -0500 (Wed, 05 Oct 2011) | 10 lines

  Merged revisions 339505 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339505 | mnicholson | 2011-10-05 11:31:21 -0500 (Wed, 05 Oct 2011) | 3 lines

    The app name in the documentation must match what we register the application
    as.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339509 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoAdd generic faxdetect framehook to res_fax
Gregory Nietsky [Wed, 5 Oct 2011 06:50:18 +0000 (06:50 +0000)]
Add generic faxdetect framehook to res_fax

Added func FAXOPT(faxdetect)=yes,cng,t38[,timeout]/no
to enable dialplan faxdetect allowing more flexibility.

as soon as a fax tone is detected the framehook is removed.
there is a penalty involved in running this framehook on
non G711 channels as they will be transcoded.

CNG tone is suppresed using the SQUELCH flag to allow
WaitForNoise to be run on the channel to detect Voice.

(Closes issue ASTERISK-18569)
Reported by: Myself
Reviewed by: Matthew Nicholson, Kevin Fleming

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339465 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339463 via svnmerge from
Gregory Nietsky [Wed, 5 Oct 2011 06:40:40 +0000 (06:40 +0000)]
Merged revisions 339463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339463 | irroot | 2011-10-05 08:28:46 +0200 (Wed, 05 Oct 2011) | 9 lines

  Only change the capabilities on the gateway when
  the session is been destroyed there is still
  a race condition that ends in a segfault.

  if the caps are changed the logic in res_fax_spandsp
  will run T30 code not gateway code to end the session.
  this has been experienced on a "slower" under spec system.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339464 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339407 via svnmerge from
Richard Mudgett [Tue, 4 Oct 2011 22:59:07 +0000 (22:59 +0000)]
Merged revisions 339407 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339407 | rmudgett | 2011-10-04 17:56:25 -0500 (Tue, 04 Oct 2011) | 15 lines

  Merged revisions 339406 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339406 | rmudgett | 2011-10-04 17:54:15 -0500 (Tue, 04 Oct 2011) | 8 lines

    Make always create the MOH directory (/var/lib/asterisk/moh).

    (closes issue ASTERISK-18409)
    Reported by: abelbeck
    Patches:
          asterisk-1.8-makefile-moh.patch (license #5903) patch uploaded by abelbeck
    Tested by: abelbeck, Michael Keuter
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339408 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339353 via svnmerge from
Jonathan Rose [Tue, 4 Oct 2011 19:51:27 +0000 (19:51 +0000)]
Merged revisions 339353 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339353 | jrose | 2011-10-04 14:44:02 -0500 (Tue, 04 Oct 2011) | 18 lines

  Merged revisions 339352 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339352 | jrose | 2011-10-04 14:33:12 -0500 (Tue, 04 Oct 2011) | 12 lines

    Removes improper use of sound 'and' in German language mode from application saynumber

    Asterisk would say 'Five hundert und sechs und zwanzig' instead of 'Five hundert sechs
    und zwanzig'... which is both weird sounding and wrong.  This patch makes sure Asterisk
    will only say the 'and' word between the single digit and double digit places.

    (closes issue ASTERISK-18212)
    Reported By: Lionel Elie Mamane
    Patches:
     upstream_germand_no_and.diff (License #5402) uploaded by Lionel Elie Mamane
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339354 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339298 via svnmerge from
Jonathan Rose [Tue, 4 Oct 2011 14:22:11 +0000 (14:22 +0000)]
Merged revisions 339298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339298 | jrose | 2011-10-04 09:09:50 -0500 (Tue, 04 Oct 2011) | 19 lines

  Merged revisions 339297 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339297 | jrose | 2011-10-04 09:01:05 -0500 (Tue, 04 Oct 2011) | 13 lines

    Reverting revision 333265 due to component connection problems it introduces.

    I'm going to attempt some generic res_jabber cleanup and come up with a new fix for this
    problem, but first it seems prudent to remove this rather broad attempt to fix it and
    instead approach this problem either from the same angle but looking only at canceling
    (or possibly rescheduling) the send when we absolutely know it will cause a segfault
    or, if that can't be easily accomplished, strictly from the devstate side of things.
    Also, I'm pretty sure a lot of the code in res_jabber isn't thread safe.

    (issue ASTERISK-18626)
    (issue ASTERISK-18078)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339315 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339245 via svnmerge from
Alexandr Anikin [Tue, 4 Oct 2011 12:27:02 +0000 (12:27 +0000)]
Merged revisions 339245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339245 | may | 2011-10-04 15:49:49 +0400 (Tue, 04 Oct 2011) | 9 lines

  Merged revisions 339244 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339244 | may | 2011-10-04 15:44:55 +0400 (Tue, 04 Oct 2011) | 2 lines

    fix forget declaration in previous change
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339262 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoGenerate error message when AMI action originate extension doesn't exist
Olle Johansson [Tue, 4 Oct 2011 09:43:03 +0000 (09:43 +0000)]
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

8 years agoMerged revisions 339148 via svnmerge from
Leif Madsen [Mon, 3 Oct 2011 20:13:44 +0000 (20:13 +0000)]
Merged revisions 339148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339148 | lmadsen | 2011-10-03 15:13:16 -0500 (Mon, 03 Oct 2011) | 14 lines

  Merged revisions 339147 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339147 | lmadsen | 2011-10-03 15:12:43 -0500 (Mon, 03 Oct 2011) | 6 lines

    Remove duplicated Maxforwards line in AMI output.

    (Closes issue ASTERISK-18637)
    Reported by: Jacek Konieczny
    Patches:
         asterisk-sipshowpeer.patch (License #6298) uploaded by Jacek Konieczny
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339149 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339145 via svnmerge from
Leif Madsen [Mon, 3 Oct 2011 20:07:08 +0000 (20:07 +0000)]
Merged revisions 339145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339145 | lmadsen | 2011-10-03 14:55:15 -0500 (Mon, 03 Oct 2011) | 13 lines

  Merged revisions 339144 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339144 | lmadsen | 2011-10-03 14:54:52 -0500 (Mon, 03 Oct 2011) | 6 lines

    Make documentation for Dial() options 'F' and 'F()' more clear.

    (Closes issue ASTERISK-18646)
    Reported by: Physis Heckman
    Tested by: Richard Mudgett
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339146 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339089 via svnmerge from
Alexandr Anikin [Mon, 3 Oct 2011 19:16:19 +0000 (19:16 +0000)]
Merged revisions 339089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339089 | may | 2011-10-03 22:52:55 +0400 (Mon, 03 Oct 2011) | 10 lines

  Merged revisions 339087 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339087 | may | 2011-10-03 22:42:49 +0400 (Mon, 03 Oct 2011) | 4 lines

    destroy memheap mutex properly before memheap deleted
    (fix memory leak occured after r304950 changes with DEBUG_THREAD compile option)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339088 via svnmerge from
Terry Wilson [Mon, 3 Oct 2011 18:58:33 +0000 (18:58 +0000)]
Merged revisions 339088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339088 | twilson | 2011-10-03 11:44:27 -0700 (Mon, 03 Oct 2011) | 17 lines

  Merged revisions 339086 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r339086 | twilson | 2011-10-03 11:40:52 -0700 (Mon, 03 Oct 2011) | 10 lines

    Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places

    After the change in r336294, the new AST_CONTROL_UPDATE_RTP_PEER frame
    is sent when a re-invite happens. If we receive a re-invite from a device
    the waitstream_core was not aware of the new control frame and would drop
    the call.

    (closes issue ASTERISK-18610)
     Reported by: Kristijan_Vrban
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339090 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339045 via svnmerge from
Matthew Nicholson [Mon, 3 Oct 2011 15:55:28 +0000 (15:55 +0000)]
Merged revisions 339045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339045 | mnicholson | 2011-10-03 10:54:55 -0500 (Mon, 03 Oct 2011) | 4 lines

  Ported ast_fax_caps_to_str() to 10, not sure why it wasn't already here.

  This function prints a list of caps instead of a hex bitfield.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339046 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339043 via svnmerge from
Matthew Nicholson [Mon, 3 Oct 2011 15:42:01 +0000 (15:42 +0000)]
Merged revisions 339043 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339043 | mnicholson | 2011-10-03 10:41:36 -0500 (Mon, 03 Oct 2011) | 2 lines

  Don't clear the AST_FAX_TECH_MULTI_DOC flag right after we set it.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339044 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 339011 via svnmerge from
Matthew Nicholson [Mon, 3 Oct 2011 15:21:50 +0000 (15:21 +0000)]
Merged revisions 339011 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339011 | mnicholson | 2011-10-03 10:19:44 -0500 (Mon, 03 Oct 2011) | 2 lines

  properly remove the AST_FAX_TECH_GATEWAY flag (instead of setting all of the other flags)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339021 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338997 via svnmerge from
Gregory Nietsky [Mon, 3 Oct 2011 14:40:57 +0000 (14:40 +0000)]
Merged revisions 338997 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338997 | irroot | 2011-10-03 16:38:25 +0200 (Mon, 03 Oct 2011) | 1 line

  Documentation noting the extension of CHANNEL() for chan_ooh323
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338998 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338995 via svnmerge from
Gregory Nietsky [Mon, 3 Oct 2011 14:24:45 +0000 (14:24 +0000)]
Merged revisions 338995 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338995 | irroot | 2011-10-03 16:21:40 +0200 (Mon, 03 Oct 2011) | 6 lines

  Remove the channel function OOH323() and place its options into
  CHANNEL()

  channel drivers should not have there own dialplan functions.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338996 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338950 via svnmerge from
Gregory Nietsky [Mon, 3 Oct 2011 09:49:38 +0000 (09:49 +0000)]
Merged revisions 338950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338950 | irroot | 2011-10-03 11:37:59 +0200 (Mon, 03 Oct 2011) | 14 lines

  Fixup a race condition in res_fax.c where FAXOPT(gateway)=no will
  turn off the gateway but the framehook is not destroyed.

  this problem happens when a gateway is attempted in the dialplan and
  the device is not available i may want to do fax to mail in the server
  it will not be allowed.

  instead of checking only AST_FAX_TECH_GATEWAY also check gateway_id

  Reverts 338904

  Fix some white space.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338904 via svnmerge from
Gregory Nietsky [Sun, 2 Oct 2011 14:20:35 +0000 (14:20 +0000)]
Merged revisions 338904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338904 | irroot | 2011-10-02 16:17:32 +0200 (Sun, 02 Oct 2011) | 8 lines

  Remove T38 Gateway capability when detaching framehook.

  SET(FAXOPT(gateway)=no) does not remove the capability when
  detaching the framehook.

  small patch to fix this problem.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338905 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoUpdate "configure" based on r338139.
TransNexus OSP Development [Sat, 1 Oct 2011 01:56:50 +0000 (01:56 +0000)]
Update "configure" based on r338139.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338855 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338801 via svnmerge from
Richard Mudgett [Fri, 30 Sep 2011 22:08:48 +0000 (22:08 +0000)]
Merged revisions 338801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338801 | rmudgett | 2011-09-30 17:06:48 -0500 (Fri, 30 Sep 2011) | 19 lines

  Merged revisions 338800 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r338800 | rmudgett | 2011-09-30 17:05:10 -0500 (Fri, 30 Sep 2011) | 12 lines

    Fix segfault in analog_ss_thread() not checking ast_read() for NULL.

    NOTE: The problem was reported against v1.6.2.  It is unlikely to ever
    happen on v1.8 and above since chan_dahdi.c:analog_ss_thread() is unlikely
    to be used.  The version in sig_analog.c has largely replaced it.

    (closes issue ASTERISK-18648)
    Reported by: Stephan Bosch
    Patches:
          jira_asterisk_18648_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Stephan Bosch
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338802 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFormatting changes only
Olle Johansson [Fri, 30 Sep 2011 19:25:36 +0000 (19:25 +0000)]
Formatting changes only
--Denna och nedanstående rader kommer inte med i loggmeddelandet--

M    channels/chan_sip.c

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338755 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoMerged revisions 338719 via svnmerge from
Jonathan Rose [Fri, 30 Sep 2011 18:59:01 +0000 (18:59 +0000)]
Merged revisions 338719 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338719 | jrose | 2011-09-30 13:55:27 -0500 (Fri, 30 Sep 2011) | 9 lines

  Merged revisions 338718 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r338718 | jrose | 2011-09-30 13:54:30 -0500 (Fri, 30 Sep 2011) | 1 line

    Adds documentation for QueueMemberStatus event generation
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338720 65c4cc65-6c06-0410-ace0-fbb531ad65f3

8 years agoFix formatting of AMI header for SIP show peer.
Richard Mudgett [Fri, 30 Sep 2011 16:40:14 +0000 (16:40 +0000)]
Fix formatting of AMI header for SIP show peer.

ASTERISK-17486 exposed the problem for AMI parsers.

(closes issue ASTERISK-18649)
Reported by: Jacek Konieczny
Patches:
      asterisk-sipshowpeer_response_end.patch (license #6298) patch uploaded by Jacek Konieczny
........

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338665 65c4cc65-6c06-0410-ace0-fbb531ad65f3