Commit Graph

17265 Commits

Author SHA1 Message Date
David Vossel
200935605b Merged revisions 174325 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174325 | dvossel | 2009-02-09 11:26:02 -0600 (Mon, 09 Feb 2009) | 9 lines
  
  Fixes issue with hangups not being sent and external process never terminating. 
  
  The ignore_hangup, run_dead, and noanswer flags were never initilized to zero causing hangups to never be issued.  If the external script expects to be notified of a hangup and never receives one, it runs indefinitely. 
  
  (closes issue #14251)
  Reported by: chris-mac
  Tested by: dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 17:47:27 +00:00
Mark Michelson
1e4f1aff0c Merged revisions 174327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r174327 | mmichelson | 2009-02-09 11:27:32 -0600 (Mon, 09 Feb 2009) | 3 lines

Fix something I messed up in the merge I just did


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 17:30:33 +00:00
Mark Michelson
b9b73e763b Merged revisions 174301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r174301 | mmichelson | 2009-02-09 11:20:55 -0600 (Mon, 09 Feb 2009) | 20 lines

Merged revisions 174282 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r174282 | mmichelson | 2009-02-09 11:11:05 -0600 (Mon, 09 Feb 2009) | 12 lines

Don't do an SRV lookup if a port is specified

RFC 3263 says to do A record lookups on a hostname
if a port has been specified, so that's what we're
going to do. See section 4.2.

(closes issue #14419)
Reported by: klaus3000
Patches:
      patch_chan_sip_nosrvifport_1.4.23.txt uploaded by klaus3000 (license 65)


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174326 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 17:26:39 +00:00
Joshua Colp
90b3566d84 Merged revisions 174219 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r174219 | file | 2009-02-09 10:49:24 -0400 (Mon, 09 Feb 2009) | 11 lines
  
  Merged revisions 174218 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r174218 | file | 2009-02-09 10:48:21 -0400 (Mon, 09 Feb 2009) | 4 lines
    
    Don't overwrite our pointer to the music class when music on hold stops. We will use this if it starts again to see if we can resume the music where it left off.
    (closes issue #14407)
    Reported by: mostyn
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-09 14:50:50 +00:00
Russell Bryant
1b0db3b12d Merged revisions 174149 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r174149 | russell | 2009-02-07 10:16:50 -0600 (Sat, 07 Feb 2009) | 10 lines

Merged revisions 174148 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r174148 | russell | 2009-02-07 10:15:07 -0600 (Sat, 07 Feb 2009) | 2 lines

Fix a race condition that could cause a crash.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-07 16:18:02 +00:00
Dwayne M. Hubbard
697dd6060d Merged revisions 174084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r174084 | dhubbard | 2009-02-06 17:51:56 -0600 (Fri, 06 Feb 2009) | 13 lines

Merged revisions 174082 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r174082 | dhubbard | 2009-02-06 17:36:03 -0600 (Fri, 06 Feb 2009) | 5 lines

check ast_strlen_zero() before calling ast_strdupa() in sip_uri_headers_cmp()
and sip_uri_params_cmp()

The reporter didn't actually upload a properly-formed patch, instead a 
modified chan_sip.c file was uploaded.  I created a patch to determine the
changes, then modified the suggested changes to create a proper fix.  The
summary above is a complete description of the changes.

(closes issue #13547)
Reported by: tecnoxarxa
Patches:
      chan_sip.c.gz uploaded by tecnoxarxa (license 258)
Tested by: tecnoxarxa

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-07 00:09:08 +00:00
David Vossel
41659546aa Blocked revisions 174046 via svnmerge
........
  r174046 | dvossel | 2009-02-06 14:12:33 -0600 (Fri, 06 Feb 2009) | 12 lines
  
  Adds immediate yes/no option to iax.conf
  
  This is very similar to the DAHDI immediate=yes option.  When the phone is picked up, instead of giving a dialtone it connects directly to the "s" extension.  Changes where implemented in chan_iax2.c to directly connect to the "s" extension in the appropriate context when this option is enabled.  Examples explaining its use are added to iax2.conf.sample.  CHANGES has been updated as well. 
  
  (closes issue #14266)
  Reported by: jcovert
  Patches:
        chan_iax2.c.patch-trunk uploaded by jcovert (license 551)
        iax.conf.sample.patch uploaded by jcovert (license 551)
  Tested by: jcovert, dvossel
  Review: http://reviewboard.digium.com/r/143/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 20:29:58 +00:00
Joshua Colp
4484e4e6d6 Merged revisions 174041 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r174041 | file | 2009-02-06 15:28:53 -0400 (Fri, 06 Feb 2009) | 4 lines
  
  Don't subscribe to a mailbox on pseudo channels. It is futile. This solves an issue where duplicated pseudo channels would cause a crash because the first one would unsubscribe and the next one would also try to unsubscribe the same subscription.
  (closes issue #14322)
  Reported by: amessina
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@174043 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 19:30:29 +00:00
Joshua Colp
38e93d7b01 Merged revisions 173974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173974 | file | 2009-02-06 13:18:35 -0400 (Fri, 06 Feb 2009) | 15 lines
  
  Merged revisions 173967-173968 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173967 | file | 2009-02-06 13:14:15 -0400 (Fri, 06 Feb 2009) | 4 lines
    
    Some clients do not put the call-id for replaces at the beginning, so support it being anywhere in the string.
    (closes issue #14350)
    Reported by: fhackenberger
  ........
    r173968 | file | 2009-02-06 13:15:01 -0400 (Fri, 06 Feb 2009) | 2 lines
    
    Remove a debug message I put in by accident.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:22:56 +00:00
Matthew Nicholson
e414d0d27d Merged revisions 173952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173952 | mnicholson | 2009-02-06 10:28:19 -0600 (Fri, 06 Feb 2009) | 14 lines
  
  Merged revisions 173917 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173917 | mnicholson | 2009-02-06 10:20:23 -0600 (Fri, 06 Feb 2009) | 7 lines
    
    Limit the addition of the Contact header in SIP responses according to various
    SIP RFCs.
    
    (closes issue #13602)
    Reported by: hjourdain
    Tested by: mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:05:05 +00:00
Matthew Nicholson
af64f9e802 revert revision 173964
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173965 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 17:04:04 +00:00
Matthew Nicholson
0cff12dd4b Merged revisions 173952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173952 | mnicholson | 2009-02-06 10:28:19 -0600 (Fri, 06 Feb 2009) | 14 lines
  
  Merged revisions 173917 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173917 | mnicholson | 2009-02-06 10:20:23 -0600 (Fri, 06 Feb 2009) | 7 lines
    
    Limit the addition of the Contact header in SIP responses according to various
    SIP RFCs.
    
    (closes issue #13602)
    Reported by: hjourdain
    Tested by: mnicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 16:39:21 +00:00
Joshua Colp
993d0af118 Merged revisions 173902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173902 | file | 2009-02-06 11:59:17 -0400 (Fri, 06 Feb 2009) | 4 lines
  
  Always detach and destroy the whisper and barge audiohooks. Additionally also allow an audiohook to be detached if it has not been attached.
  (closes issue #14414)
  Reported by: bluecrow76
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 16:01:01 +00:00
Russell Bryant
da8622724d Blocked revisions 173858 via svnmerge
........
r173858 | russell | 2009-02-06 04:55:35 -0600 (Fri, 06 Feb 2009) | 13 lines

Add a common implementation of a scheduler context with a dedicated thread.

This commit expands the Asterisk scheduler API to include a common implementation
of a scheduler context being processed by a dedicated thread.  chan_iax2 has been
updated to use this new code.  Also, as a result, this resolves some race
conditions related to the previous chan_iax2 scheduler handling.

Related to rev 171452 which resolved the same issues in 1.4.

Code from team/russell/sched_thread2

Review: http://reviewboard.digium.com/r/129/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 10:57:30 +00:00
Russell Bryant
2e38587bd0 Merged revisions 173848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r173848 | russell | 2009-02-06 04:25:09 -0600 (Fri, 06 Feb 2009) | 2 lines

Resolve a memory leak that would occur on an invalid channel given to Action: Status

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-06 10:26:18 +00:00
Mark Michelson
113fb5ca88 Merged revisions 173776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r173776 | mmichelson | 2009-02-05 17:48:48 -0600 (Thu, 05 Feb 2009) | 14 lines

Update extensions.conf.sample to be correct.

In trunk, the only necessary change pointed out was that the call
to ChanIsAvail uses an option that has been removed.

For the 1.6.1 branch, however, it appears that the sample file is
badly in need of updating since there are |'s used all over the place
there. My tentative plan is just to copy trunk's sample config file
to those branches since the info there is most up-to-date and should
be correct for use in 1.6.1

Thanks to macli in #asterisk-dev for bringing this up


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 23:53:09 +00:00
Tilghman Lesher
a3fb73e5aa Oops, merge from trunk broke 1.6.1
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 23:51:18 +00:00
Mark Michelson
41859bdb73 Merged revisions 173773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r173773 | mmichelson | 2009-02-05 17:28:19 -0600 (Thu, 05 Feb 2009) | 7 lines

Properly set "seen" and "unseen" flags when moving messages from the new to the old folder when using IMAP for voicemail storage

(closes issue #13905)
Reported by: jaroth
Patches:
      foldermove_v2.patch uploaded by jaroth (license 50)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 23:31:53 +00:00
Mark Michelson
e26e521d95 Blocked revisions 173771 via svnmerge
................
r173771 | mmichelson | 2009-02-05 17:19:51 -0600 (Thu, 05 Feb 2009) | 27 lines

Blocked revisions 173770 via svnmerge

........
r173770 | mmichelson | 2009-02-05 17:19:16 -0600 (Thu, 05 Feb 2009) | 20 lines

Fix logic regarding when to perform an SRV lookup for outgoing REGISTER requests

With this fix, we only will perform an SRV lookup at the following times:

* The first time we register with a remote registrar
* If we send a REGISTER but do not receive a response
* If the sendto() function returns an error

While I wrote the patch that fixes this issue, a huge amount of credit is due
to Brett Bryant, who wrote the initial patch on which I based this one.

(closes issue #12312)
Reported by: jrast
Patches:
      12312.patch uploaded by putnopvut (license 60)
Tested by: blitzrage

Review: http://reviewboard.digium.com/r/132/


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 23:20:25 +00:00
Jeff Peeler
9f3e4e86b3 Merged revisions 173697 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173697 | jpeeler | 2009-02-05 15:00:26 -0600 (Thu, 05 Feb 2009) | 18 lines
  
  Merged revisions 173696 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173696 | jpeeler | 2009-02-05 14:47:51 -0600 (Thu, 05 Feb 2009) | 12 lines
    
    Add new configuration option to make shared IMAP mailboxes function as expected.
    
    The new option is "imapvmshareid" which is an ID to tag multiple mailboxes
    using the same IMAP storage location to function as one mailbox. This allows
    all messages to be retrieved for any user in the group. The patch alters the
    'X-Asterisk-VM-Extension' header that is responsible for matching voicemails
    for a given user.
    
    (closes issue #13673)
    Reported by: howardwilkinson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 21:06:12 +00:00
Mark Michelson
d9694895c9 Merged revisions 173693 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r173693 | mmichelson | 2009-02-05 14:30:45 -0600 (Thu, 05 Feb 2009) | 20 lines

Merged revisions 173692 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173692 | mmichelson | 2009-02-05 14:29:09 -0600 (Thu, 05 Feb 2009) | 12 lines

Fix situations where queue members could be autopaused unexpectedly

Specifically, this patch prevents us from autopausing members when
we receive a busy or congestion frame from them.

(closes issue #14376)
Reported by: fiddur
Patches:
      14376.patch uploaded by putnopvut (license 60)
Tested by: fiddur


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 20:35:42 +00:00
Tilghman Lesher
a41fb27c15 Merged revisions 173657 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173657 | tilghman | 2009-02-05 13:36:29 -0600 (Thu, 05 Feb 2009) | 2 lines
  
  Change the first field, or we don't get the necessary field separation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 19:37:55 +00:00
Mark Michelson
075fb9b0cd Merged revisions 173593 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r173593 | mmichelson | 2009-02-05 12:48:55 -0600 (Thu, 05 Feb 2009) | 11 lines

Merged revisions 173592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173592 | mmichelson | 2009-02-05 12:47:24 -0600 (Thu, 05 Feb 2009) | 3 lines

Add some missing cleanup to app_mixmonitor


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 18:50:00 +00:00
Mark Michelson
616a6fdd54 Merged revisions 173589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r173589 | mmichelson | 2009-02-05 12:34:06 -0600 (Thu, 05 Feb 2009) | 33 lines

Merged revisions 173559 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173559 | mmichelson | 2009-02-05 11:34:33 -0600 (Thu, 05 Feb 2009) | 25 lines

Fix a problem where a channel pointer becomes invalid due to masquerading or hanging up.

app_mixmonitor runs its own thread to monitor the channel's activity and write the mixed
audio to a file. Since this thread runs independently of the channel, it is possible that
the mixmonitor thread's channel pointer will point to freed memory when the channel either
is masqueraded or hangs up (technically, both cases are hangups, but we need to handle the
cases slightly differently).

The solution for this is to employ a datastore, which has the nice benefit of allowing us 
to hook into channel masquerades and hangups and update our pointer as necessary. If this
looks familiar, this same technique is employed in app_chanspy. app_chanspy is a bit more
involved since it does a lot more operations on the channel that is being spied upon.

app_mixmonitor does have an extra touch that app_chanspy doesn't have, though. Since there
is a thread race between the channel's thread and the mixmonitor thread on a hangup, we em-
ploy a condition-and-boolean combination to ensure that the channel thread finishes with
our structure before the mixmonitor thread attempts to free it. No crashes!

(closes issue #14374)
Reported by: aragon
Patches:
	  14374.patch uploaded by putnopvut (license 60)
Tested by: aragon, putnopvut


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-05 18:42:12 +00:00
Mark Michelson
e24a4644e4 Merged revisions 173507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r173507 | mmichelson | 2009-02-04 16:16:19 -0600 (Wed, 04 Feb 2009) | 7 lines

Fix some areas where the incorrect interface was passed to ast_device_state

I swear it feels like I already did this once...

(closes issue #14359)
Reported by: francesco_r

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 22:25:06 +00:00
David Vossel
914cb3409a Merged revisions 173502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173502 | dvossel | 2009-02-04 15:25:14 -0600 (Wed, 04 Feb 2009) | 9 lines
  
  Fixes issue with IAX2 transfer not handing off calls. Reverts changes in 116884
    
  Fixes issue with IAX2 transfers not taking place. As it was, a call that was being transfered would never be handed off correctly to the call ends because of how call numbers were stored in a hash table. The hash table, "iax_peercallno_pvt", storing all the current call numbers did not take into account the complications associated with transferring a call, so a separate hash table was required. This second hash table "iax_transfercallno_pvt" handles calls being transfered, once the call transfer is complete the call is removed from the transfer hash table and added to the peer hash table resuming normal operations. Addition functions were created to handle storing, removing, and comparing items in the iax_transfercallno_pvt table. The changes reverted in 116884 caused backwards compatibility issues involving iax2 transfer with 1.6.0, 1.4, and 1.2. 
    
  (closes issue #13468)
  Reported by: nicox
  Tested by: dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 21:32:32 +00:00
Jeff Peeler
709a359e6b Merged revisions 173500 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173500 | jpeeler | 2009-02-04 15:17:53 -0600 (Wed, 04 Feb 2009) | 23 lines
  
  Merged revisions 173211 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173211 | jpeeler | 2009-02-03 15:57:01 -0600 (Tue, 03 Feb 2009) | 17 lines
    
    Parking attempts made to one end of a bridge no longer will hang up due to a
    parking failure.
    
    Parking attempts made using either one-touch, or doing either a blind or 
    assisted transfer to the parking extension now keep up the bridge instead of
    hanging up the attempted parked party. Normal causes for the parking attempt
    to fail includes the specific specified extension (via PARKINGEXTEN) not being 
    available or if all the parking spaces are currently in use. To avoid having
    to reverse a masquerade park_space_reserve was made to provide foresight if
    a parking attempt will succeed and if so reserve the parking space.
    
    (closes issue #13494)
    Reported by: mdu113
    
    Reviewed by Russell: http://reviewboard.digium.com/r/133/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 21:28:56 +00:00
Tilghman Lesher
2e734fdd12 Blocked revisions 173503 via svnmerge
........
  r173503 | tilghman | 2009-02-04 15:26:15 -0600 (Wed, 04 Feb 2009) | 6 lines
  
  Add XML documentation for the applications and functions in res_jabber
  (closes issue #14405)
   Reported by: snuffy
   Patches: 
         xml_jabber.diff uploaded by snuffy (license 35)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 21:27:08 +00:00
Tilghman Lesher
a32d0a1a8f Merged revisions 173458 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173458 | tilghman | 2009-02-04 12:48:06 -0600 (Wed, 04 Feb 2009) | 9 lines
  
  When using a socket as a FILE *, the stdio functions will sometimes try to do
  an fseek() on the stream, which is an invalid operation for a socket.  Turning
  off buffering explicitly lets the stdio functions know they cannot do this,
  thus avoiding a potential error.
  (closes issue #14400)
   Reported by: fnordian
   Patches: 
         tcptls.patch uploaded by fnordian (license 110)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 18:52:27 +00:00
Mark Michelson
f932b09c5f Merged revisions 173397 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r173397 | mmichelson | 2009-02-04 11:45:14 -0600 (Wed, 04 Feb 2009) | 11 lines

Merged revisions 173396 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173396 | mmichelson | 2009-02-04 11:44:48 -0600 (Wed, 04 Feb 2009) | 3 lines

Revert my previous change because it was stupid


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 17:46:36 +00:00
Mark Michelson
0017b5cf52 Merged revisions 173393 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r173393 | mmichelson | 2009-02-04 11:41:02 -0600 (Wed, 04 Feb 2009) | 11 lines

Merged revisions 173392 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173392 | mmichelson | 2009-02-04 11:40:29 -0600 (Wed, 04 Feb 2009) | 3 lines

Add a missing unlock. Extremely unlikely to ever matter, but it's needed.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 17:42:41 +00:00
Mark Michelson
36d745dcbf Merged revisions 173354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r173354 | mmichelson | 2009-02-04 09:30:12 -0600 (Wed, 04 Feb 2009) | 30 lines

Fix a problem where file playback would cause fds to remain open forever

The problem came from the fact that a frame read from a format interpreter
was not freed. Adding a call to ast_frfree fixed this. The explanation for
why this caused the problem is a bit complex, but here goes:

There was a problem in all versions of Asterisk where the embedded frame
of a filestream structure was referenced after the filestream was freed. This
was fixed by adding reference counting to the filestream structure. The refcount
would increase every time that a filestream's frame pointer was pointing to an
actual frame of data. When the frame was freed, the refcount would decrease. Once
the refcount reached 0, the filestream was freed, and as part of the operation,
the open files were closed as well.

Thus it becomes more clear why a missing ast_frfree would cause a reference leak
and cause the files to not be closed. You may ask then if there was a frame leak
before this patch. The answer to that is actually no! The filestream code was
"smart" enough to know that since the frame we received came from a format interpreter,
the frame had no malloced data and thus didn't need to be freed. Now, however, there
is cleanup that needs to be done when we finish with the frame, so we do need to
call ast_frfree on the frame to be sure that the refcount for the filestream is
decremented appropriately.

(closes issue #14384)
Reported by: fiddur
Patches:
      14384.patch uploaded by putnopvut (license 60)
Tested by: fiddur, putnopvut


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 15:31:26 +00:00
Tilghman Lesher
92c38cee3e Merged revisions 173311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173311 | tilghman | 2009-02-03 18:43:52 -0600 (Tue, 03 Feb 2009) | 10 lines
  
  Ensure that commas placed in the middle of extension character classes do not
  interfere with correct parsing of the extension.  Also, if an unterminated
  character class DOES make its way into the pbx core (through some other
  method), ensure that it does not crash Asterisk.
  (closes issue #14362)
   Reported by: Nick_Lewis
   Patches: 
         20090129__bug14362.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-04 00:46:25 +00:00
Tilghman Lesher
27cda01383 Blocked revisions 173130 via svnmerge
........
  r173130 | tilghman | 2009-02-02 18:29:49 -0600 (Mon, 02 Feb 2009) | 2 lines
  
  Make OS X compile cleanly with app_stack
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-03 00:31:53 +00:00
Tilghman Lesher
d9dba5fe20 Merged revisions 173104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173104 | tilghman | 2009-02-02 18:24:52 -0600 (Mon, 02 Feb 2009) | 12 lines
  
  Merged revisions 173070 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines
    
    Add warning to standard config, that globals may be overridden by other
    dialplan configuration files.
    (closes issue #14388)
     Reported by: macli
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-03 00:26:55 +00:00
Terry Wilson
8024a0df33 Merged revisions 173067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173067 | twilson | 2009-02-02 17:57:25 -0600 (Mon, 02 Feb 2009) | 9 lines
  
  Merged revisions 173066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173066 | twilson | 2009-02-02 17:48:06 -0600 (Mon, 02 Feb 2009) | 2 lines
    
    Fix a feature inheritance bug I added after code review
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-03 00:01:13 +00:00
Mark Michelson
b87793e0f1 Blocked revisions 173047 via svnmerge
........
r173047 | mmichelson | 2009-02-02 17:21:33 -0600 (Mon, 02 Feb 2009) | 4 lines

Reverting commit number 173028 as there are some
potential issues


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-02 23:22:00 +00:00
Mark Michelson
ea2c5d8a4d Blocked revisions 173028 via svnmerge
........
r173028 | mmichelson | 2009-02-02 17:10:47 -0600 (Mon, 02 Feb 2009) | 9 lines

Add a CLI command to log out a manager user

(closes issue #13877)
Reported by: eliel
Patches:
      cli_manager_logout.patch.txt uploaded by eliel (license 64)
Tested by: eliel, putnopvut


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@173039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-02 23:19:35 +00:00
Leif Madsen
c03b454a8a Merged revisions 172894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172894 | lmadsen | 2009-02-02 13:13:40 -0500 (Mon, 02 Feb 2009) | 7 lines
  
  Update the res_ldap.conf file with a better working example.
  
  (closes issue #13861)
  Reported by: scramatte
  Patches:
        __20080110-res_ldap.conf-2.patch uploaded by blitzrage (license 10)
  Tested by: jcovert
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-02 18:15:00 +00:00
Steve Murphy
f8d0b5d6fb Blocked revisions 172890 via svnmerge
........
  r172890 | murf | 2009-02-02 10:37:15 -0700 (Mon, 02 Feb 2009) | 41 lines
  
  This change allows the disconnect feature (as in "one-touch" in features.c)
  to be used within the dial app, before a call is bridged.
  
  Many thanks to sobomax for submitting this patch. 
  
  Quoting from bug 11582:
  
    "So the goal of the patch was to use the user configured feature code during the 
     call setup phase. The original ast_feature_interpret() function is not well suited 
     for this purpose as it uses much call bridge specific data and doesn't separate a 
     detection of feature from a feature handler call. So a new function ast_feature_detect() 
     has been extracted off the ast_feature_interpret() function but keeping the original 
     logic intact except some insignificant changes to locking.
  
    "Having created the ast_feature_detect() function the possibility to use feature detection 
     in almost any place of the asterisk code. So a call to this function has been added to 
     wait_for_answer() function of app_dial.so module. This code doesn't call the feature handler 
     however and uses old call leg disconnect logic to make the changes as small and simple as 
     possible to prevent unexpected problems. A disconnect feature currently is the only one 
     supported during call setup as other features as call parking and call transfer don't make much 
     sense during call setup. However if need in some of the features would arise it is much easier to 
     implement as the infrastructure changes are already in place with this patch."
  
  I have cleaned up the patch somewhat, and verified that the existing functionality is not
  harmed, and that the new functionality works. Terry has committed his stuff, and there were
  no conflicts (see 14274).
  
  (closes issue #11583)
  Reported by: sobomax
  Patches:
        patch-apps__app_dial.c uploaded by sobomax (license 359)
        patch-include__asterisk__features.h uploaded by sobomax (license 359)
        patch-res__res_features.c uploaded by sobomax (license 359)
        enable-features-during-call-setup.diff uploaded by sobomax (license 359)
        11583.newdiff uploaded by murf (license 17)
        enable-features-during-call-setup-1.diff uploaded by sobomax (license 359)
        11583.latest-patch uploaded by murf (license 17)
  Tested by: sobomax, murf
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-02 17:41:40 +00:00
Tilghman Lesher
13508cc9f3 Merged revisions 172741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172741 | tilghman | 2009-01-31 20:44:23 -0600 (Sat, 31 Jan 2009) | 4 lines
  
  Blank argument crashes Asterisk
  (closes issue #14377)
   Reported by: amorsen
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-01 02:45:47 +00:00
Tilghman Lesher
00d2242b66 Merged revisions 172706 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172706 | tilghman | 2009-01-31 10:40:59 -0600 (Sat, 31 Jan 2009) | 7 lines
  
  Don't increment the loop, now that incrementing is taken care of by the
  decoder function.
  (closes issue #14363)
   Reported by: andrew53
   Patches: 
         func_strings_filter.patch uploaded by andrew53 (license 519)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-31 16:42:12 +00:00
Terry Wilson
e03cab5568 Merged revisions 172581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines
  
  Remove incorret line from sample config
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-31 00:07:15 +00:00
Terry Wilson
ef566503d3 Merged revisions 172580 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r172580 | twilson | 2009-01-30 15:29:12 -0600 (Fri, 30 Jan 2009) | 44 lines
  
  Merged revisions 172517 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r172517 | twilson | 2009-01-30 11:47:41 -0600 (Fri, 30 Jan 2009) | 37 lines
    
    Fix feature inheritance with builtin features
    
    When using builtin features like parking and transfers, the AST_FEATURE_* flags
    would not be set correctly for all instances when either performing a builtin
    attended transfer, or parking a call and getting the timeout callback.  Also,
    there was no way on a per-call basis to specify what features someone should
    have on picking up a parked call (since that doesn't involve the Dial() command).
    There was a global option for setting whether or not all users who pickup a
    parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
    AUTOMON, or PARKCALL.
    
    This patch:
    1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
    dialplan or with setvar in channels that support it.  This variable can be set
    to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
    equivalent dial options), to set what features should be activated on this
    channel.  The patch moves the setting of the features datastores into the
    bridging code instead of app_dial to help facilitate this.
    
    2) adds global options parkedcallparking, parkedcallhangup, and
    parkedcallrecording to be similar to the parkedcalltransfers option for
    globally setting features.
    
    3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
    extension since tracking everything through multiple masquerades, etc. is
    difficult and error-prone
    
    4) attempts to fix all cases of return calls from parking and completed builtin
    transfers not having the correct permissions
    (closes issue #14274)
    Reported by: aragon
    Patches: 
          fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
    Tested by: aragon, otherwiseguy
    
    Review http://reviewboard.digium.com/r/138/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-31 00:05:17 +00:00
Mark Michelson
9cfdc405ed Merged revisions 172598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r172598 | mmichelson | 2009-01-30 16:22:04 -0600 (Fri, 30 Jan 2009) | 3 lines

Fix redefinition of flag in channel.h


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 22:24:12 +00:00
Olle Johansson
793f6f8f49 Remove an extra "the" and restructure a bit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 08:27:42 +00:00
Tilghman Lesher
95c892e3f9 Merged revisions 172441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r172441 | tilghman | 2009-01-29 17:15:40 -0600 (Thu, 29 Jan 2009) | 16 lines
  
  Merged revisions 172438 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r172438 | tilghman | 2009-01-29 16:54:29 -0600 (Thu, 29 Jan 2009) | 9 lines
    
    Lose the CAP_NET_ADMIN at every fork, instead of at startup.  Otherwise, if
    Asterisk runs as a non-root user and the administrator does a 'restart now',
    Asterisk loses the ability to set QOS on packets.
    (closes issue #14004)
     Reported by: nemo
     Patches: 
           20090105__bug14004.diff.txt uploaded by Corydon76 (license 14)
     Tested by: Corydon76
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 23:53:12 +00:00
Richard Mudgett
a057dcb747 Merged revisions 172400 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172400 | rmudgett | 2009-01-29 14:38:34 -0600 (Thu, 29 Jan 2009) | 12 lines
  
  channels/chan_dahdi.c
  *  Added doxygen comments to the major dahdi structures.
  *  Fixed PRI and SS7 using an incorrect string value if the extension
  delimiter is not present in the Dial() function.
  *  Fixed SS7 not checking if the dialed extension is at least as long
  as the stripmsd option.
  *  Fixed PRI not handling unknown TON/NPI prefix letters correctly.
  *  Fixed some uninitialized string variables on FXS ports.
  
  configs/chan_dahdi.conf.sample
  *  Updated some documentation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 22:05:22 +00:00
Tilghman Lesher
71c102ce4b Merged revisions 146514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
(closes issue #14360)
Reported by: oej

........
  r146514 | russell | 2008-10-05 17:11:30 -0500 (Sun, 05 Oct 2008) | 2 lines
  
  Make this build on my mac.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 20:54:58 +00:00
Tilghman Lesher
0a418156f9 Merged revisions 172315 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172315 | tilghman | 2009-01-29 10:48:25 -0600 (Thu, 29 Jan 2009) | 2 lines
  
  Better document mode=multirow, based upon a conversation with Jared.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172317 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 16:50:05 +00:00