Commit Graph

16537 Commits

Author SHA1 Message Date
Mark Michelson
b8b4ae6501 Merged revisions 167301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167301 | mmichelson | 2009-01-06 15:36:44 -0600 (Tue, 06 Jan 2009) | 16 lines

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

........
r167299 | mmichelson | 2009-01-06 15:35:57 -0600 (Tue, 06 Jan 2009) | 8 lines

Use the correct variable when creating the format string

(closes issue #14177)
Reported by: nic_bellamy
Patches:
      asterisk-trunk-svn-r167242-ast_db_gettree.patch uploaded by nic (license 299)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-06 21:38:19 +00:00
Tilghman Lesher
4e803082b3 Merged revisions 167265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r167265 | tilghman | 2009-01-06 15:02:33 -0600 (Tue, 06 Jan 2009) | 16 lines
  
  Merged revisions 167260 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r167260 | tilghman | 2009-01-06 14:48:05 -0600 (Tue, 06 Jan 2009) | 9 lines
    
    Merged revisions 167259 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r167259 | tilghman | 2009-01-06 14:44:03 -0600 (Tue, 06 Jan 2009) | 2 lines
      
      Security fix AST-2009-001.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-06 21:07:20 +00:00
Mark Michelson
bfbf5afa62 Merged revisions 167180 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r167180 | mmichelson | 2009-01-05 10:59:36 -0600 (Mon, 05 Jan 2009) | 49 lines

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

........
r167179 | mmichelson | 2009-01-05 10:51:59 -0600 (Mon, 05 Jan 2009) | 41 lines

A couple of changes to T.38 SDP attribute handling

There are some boolean attributes for T.38 such
as T38FaxFillBitRemoval, T38FaxTranscodingMMR, and
T38FaxTranscodingJBIG. By simply being present, we
should treat these as a "true" value. The current
code, however, was requiring a 1 or 0 as the value
of the attribute in order to parse it. This is due
to the fact that there are some T.38 endpoints and
gateways that also transmit this information
incorrectly. This patch follows the "be liberal in
what you accept and strict in what you send"
philosophy by accepting both the correctly- and 
incorrectly-formatted attributes, but only sending
information as it is supposed to be sent.

It was also discovered that a particular type of 
T.38 gateway sends some non-standard T.38 SDP
attributes. Instead of using T38FaxMaxDatagram
and T38MaxBitRate, it used T38MaxDatagram and
T38FaxMaxRate respectively. We now will properly
accept these attributes as well.

Note that there are a lot of patches cited in
the below commit message template. This is
because the person who submitted these patches is
an awesome person and wrote 1.4, 1.6.0, and 1.6.1
variants.

(closes issue #13976)
Reported by: linulin
Patches:
     chan_sip.c.1.4-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.0-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.1-update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.4-relaxedT38_update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.0-relaxedT38_update1.diff uploaded by arcivanov (license 648)
	 chan_sip.c.1.6.1-relaxedT38_update1.diff uploaded by arcivanov (license 648)
Tested by: arcivanov


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-05 17:04:23 +00:00
Tilghman Lesher
1687071eed Merged revisions 167176 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167176 | tilghman | 2009-01-05 10:44:47 -0600 (Mon, 05 Jan 2009) | 7 lines
  
  More clearly explain that quote marks are no longer necessary.
  (closes issue #13718)
   Reported by: davidw
   Patches: 
         20081020__bug13718.diff.txt uploaded by Corydon76 (license 14)
   Tested by: blitzrage
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-05 16:45:44 +00:00
Jeff Peeler
f37957c5b5 Blocked revisions 167125 via svnmerge
........
r167125 | jpeeler | 2009-01-03 14:29:54 -0600 (Sat, 03 Jan 2009) | 3 lines

When parsing environment variable ASTERISK_PROMPT, make sure to proceed to the next character when a non format specifier is used (no %). Otherwise, the while loop looking for the null byte will never exit.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-03 20:32:12 +00:00
Terry Wilson
228bf17ee7 Blocked revisions 167057 via svnmerge
........
  r167057 | twilson | 2008-12-31 16:53:55 -0600 (Wed, 31 Dec 2008) | 2 lines
  
  Don't forget to free typename
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 22:55:50 +00:00
Mark Michelson
dc2b180c27 Blocked revisions 167021 via svnmerge
........
r167021 | mmichelson | 2008-12-31 15:52:02 -0600 (Wed, 31 Dec 2008) | 4 lines

Change some incorrect syntax for pri set debug and correct
an off-by-one error in ss7 set debug command


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@167022 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 21:53:40 +00:00
Tilghman Lesher
ac3a15778a Merged revisions 166954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r166954 | tilghman | 2008-12-31 13:34:28 -0600 (Wed, 31 Dec 2008) | 12 lines
  
  Merged revisions 166953 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r166953 | tilghman | 2008-12-31 13:20:35 -0600 (Wed, 31 Dec 2008) | 5 lines
    
    Also inherit the musiconhold class.
    (Closes #14153)
    Reported by: Jerry Geis, via the users list.
    Patch by: me (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-31 19:37:03 +00:00
Terry Wilson
f43bfb0ace Merged revisions 166908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r166908 | twilson | 2008-12-30 14:50:05 -0600 (Tue, 30 Dec 2008) | 2 lines
  
  Fix some svn:keywords
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-30 20:55:05 +00:00
Mark Michelson
788f3a8fa5 Merged revisions 166861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166861 | mmichelson | 2008-12-29 12:04:52 -0600 (Mon, 29 Dec 2008) | 14 lines

Update app_queue to deal with the removal of AST_PBX_KEEPALIVE

When placing a call to a queue which ran a gosub on the member's
channel, Asterisk would crash every time, stemming from the fact
that the member's channel was being hung up unexpectedly when the
Gosub completed. The necessary change was pretty much copied and
pasted from app_dial's similar changes made last week.

I also took the opportunity to change a LOG_DEBUG message in
app_dial to use ast_debug. I am guessing this was due to a direct
merge from 1.4 that was not corrected to use trunk's preferred
syntax.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-29 18:15:22 +00:00
Eliel C. Sardanons
9c28554fb1 Blocked revisions 166823 via svnmerge
........
  r166823 | eliel | 2008-12-28 10:36:25 -0500 (Sun, 28 Dec 2008) | 3 lines
  
  Fix a typo in the XML documentation of the AUDIOHOOK_INHERIT dialplan function.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-28 15:44:09 +00:00
Russell Bryant
a80d937882 Merged revisions 166773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r166773 | russell | 2008-12-28 09:15:14 -0600 (Sun, 28 Dec 2008) | 12 lines

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

........
r166772 | russell | 2008-12-28 09:13:48 -0600 (Sun, 28 Dec 2008) | 4 lines

Use strncat() instead of an sprintf() in which source and target buffers overlap

http://lists.digium.com/pipermail/asterisk-dev/2008-December/035919.html

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-28 15:15:46 +00:00
Terry Wilson
ba8c827dd3 Blocked revisions 166731 via svnmerge
........
  r166731 | twilson | 2008-12-24 09:10:42 -0600 (Wed, 24 Dec 2008) | 10 lines
  
  There is no section 22.2.2 in rfc 3261.  I believe 26.2.2 is what was meant:
  
        Note that in the SIPS URI scheme, transport is independent of TLS,
        and thus "sips:alice@atlanta.com;transport=tcp" and
        "sips:alice@atlanta.com;transport=sctp" are both valid (although
        note that UDP is not a valid transport for SIPS).  The use of
        "transport=tls" has consequently been deprecated, partly because
        it was specific to a single hop of the request.  This is a change
        since RFC 2543.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-24 15:18:38 +00:00
Steve Murphy
5d34e0df03 Merged revisions 166665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

Due to non-symmetrical updating, I had some fairly
interesting conflicts to straighten out in this
release. The changes were such that I was compelled
to run thru all the same tests as trunk, which turned
up some problems, which I fixed. 

................
  r166665 | murf | 2008-12-23 11:13:49 -0700 (Tue, 23 Dec 2008) | 153 lines
  
  Merged revisions 166093 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  In order to merge this 1.4 patch into trunk,
  I had to resolve some conflicts and wait for
  Russell to make some changes to res_agi.
  I re-ran all the tests; 39 calls in all, and
  made fairly careful notes and comparisons: I
  don't want this to blow up some aspect of 
  asterisk; I completely removed the KEEPALIVE
  from the pbx.h decls. The first 3 scenarios
  involving feature park; feature xfer to 700;
  hookflash park to Park() app call all behave
  the same, don't appear to leave hung channels,
  and no crashes.
  
  ........
    r166093 | murf | 2008-12-19 15:30:32 -0700 (Fri, 19 Dec 2008) | 131 lines
    
    This merges the masqpark branch into 1.4
    
    These changes eliminate the need for (and use of)
    the KEEPALIVE return code in res_features.c;
    There are other places that use this result code
    for similar purposes at a higher level, these appear
    to be left alone in 1.4, but attacked in trunk.
    
    The reason these changes are being made in 1.4, is
    that parking ends a channel's life, in some situations,
    and the code in the bridge (and some other places),
    was not checking the result code properly, and dereferencing
    the channel pointer, which could lead to memory corruption
    and crashes.
    
    Calling the masq_park function eliminates this danger 
    in higher levels.
    
    A series of previous commits have replaced some parking calls
    with masq_park, but this patch puts them ALL to rest,
    (except one, purposely left alone because a masquerade
    is done anyway), and gets rid of the code that tests
    the KEEPALIVE result, and the NOHANGUP_PEER result codes.
    
    While bug 13820 inspired this work, this patch does
    not solve all the problems mentioned there.
    
    I have tested this patch (again) to make sure I have
    not introduced regressions. 
    
    Crashes that occurred when a parked party hung up
    while the parking party was listening to the numbers
    of the parking stall being assigned, is eliminated.
    
    These are the cases where parking code may be activated:
    
    1. Feature one touch (eg. *3)
    2. Feature blind xfer to parking lot (eg ##700)
    3. Run Park() app from dialplan (eg sip xfer to 700)
       (eg. dahdi hookflash xfer to 700)
    4. Run Park via manager.
    
    The interesting testing cases for parking are:
    I. A calls B, A parks B
        a. B hangs up while A is getting the numbers announced.
        b. B hangs up after A gets the announcement, but 
           before the parking time expires
        c. B waits, time expires, A is redialed,
           A answers, B and A are connected, after
           which, B hangs up.
        d. C picks up B while still in parking lot.
    
    II. A calls B, B parks A
        a. A hangs up while B is getting the numbers announced.
        b. A hangs up after B gets the announcement, but 
           before the parking time expires
        c. A waits, time expires, B is redialed,
           B answers, A and B are connected, after
           which, A hangs up.
        d. C picks up A while still in parking lot.
    
    Testing this throroughly involves acting all the permutations
    of I and II, in situations 1,2,3, and 4.
    
    Since I added a few more changes (ALL references to KEEPALIVE in the bridge
    code eliimated (I missed one earlier), I retested
    most of the above cases, and no crashes.
    
    H-extension weirdness.
    
    Current h-extension execution is not completely
    correct for several of the cases.
    
    For the case where A calls B, and A parks B, the
    'h' exten is run on A's channel as soon as the park
    is accomplished. This is expected behavior.
    
    But when A calls B, and B parks A, this will be
    current behavior:
    
    After B parks A, B is hung up by the system, and
    the 'h' (hangup) exten gets run, but the channel
    mentioned will be a derivative of A's...
    
    Thus, if A is DAHDI/1, and B is DAHDI/2,
    the h-extension will be run on channel
    Parked/DAHDI/1-1<ZOMBIE>, and the 
    start/answer/end info will be those 
    relating to Channel A.
    
    And, in the case where A is reconnected to
    B after the park time expires, when both parties
    hang up after the joyful reunion, no h-exten
    will be run at all.
    
    In the case where C picks up A from the 
    parking lot, when either A or C hang up,
    the h-exten will be run for the C channel.
    
    CDR's are a separate issue, and not addressed
    here.
    
    As to WHY this strange behavior occurs, 
    the answer lies in the procedure followed
    to accomplish handing over the channel
    to the parking manager thread. This procedure
    is called masquerading. In the process,
    a duplicate copy of the channel is created,
    and most of the active data is given to the
    new copy. The original channel gets its name
    changed to XXX<ZOMBIE> and keeps the PBX
    information for the sake of the original
    thread (preserving its role as a call 
    originator, if it had this role to begin
    with), while the new channel is without
    this info and becomes a call target (a
    "peer").
    
    In this case, the parking lot manager
    thread is handed the new (masqueraded)
    channel. It will not run an h-exten
    on the channel if it hangs up while
    in the parking lot. The h exten will
    be run on the original channel instead,
    in the original thread, after the bridge
    completes.
    
    See bug 13820 for our intentions as
    to how to clean up the h exten behavior.
  
  Review: http://reviewboard.digium.com/r/29/
  
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-24 00:52:12 +00:00
Tilghman Lesher
6964b59097 Merged revisions 166696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r166696 | tilghman | 2008-12-23 14:47:08 -0600 (Tue, 23 Dec 2008) | 7 lines
  
  Allow semicolons and extended characters in user-specified SIP headers.
  (closes issue #14110)
   Reported by: gork
   Patches: 
         20081222__bug14110__2.diff.txt uploaded by Corydon76 (license 14)
   Tested by: gork, putnopvut
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-23 20:52:19 +00:00
Mark Michelson
4e5fd8376c Merged revisions 166569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r166569 | mmichelson | 2008-12-23 09:17:54 -0600 (Tue, 23 Dec 2008) | 20 lines

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

........
r166568 | mmichelson | 2008-12-23 09:16:26 -0600 (Tue, 23 Dec 2008) | 12 lines

Fix a crash resulting from a datastore with inheritance but no duplicate callback

The fix for this is to simply set the newly created datastore's data pointer
to NULL if it is inherited but has no duplicate callback.

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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-23 15:18:43 +00:00
Tilghman Lesher
b6244cfc7b Merged revisions 166533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r166533 | tilghman | 2008-12-22 22:32:15 -0600 (Mon, 22 Dec 2008) | 11 lines
  
  Merged revisions 166509 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r166509 | tilghman | 2008-12-22 22:05:25 -0600 (Mon, 22 Dec 2008) | 4 lines
    
    Use the integer form of condition for integer comparisons.
    (closes issue #14127)
     Reported by: andrew
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-23 04:33:37 +00:00
Mark Michelson
cc9fa36fbc Merged revisions 166470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166470 | mmichelson | 2008-12-22 17:25:34 -0600 (Mon, 22 Dec 2008) | 11 lines

Always use the value of the AGISIGHUP when running an AGI.

Prior to this patch, the value of AGISIGUP was not always
honored when set on a channel.

(closes issue #13711)
Reported by: fmueller
Patches:
      13711.patch uploaded by putnopvut (license 60)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 23:27:03 +00:00
Mark Michelson
61bf090dbb Merged revisions 166382 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r166382 | mmichelson | 2008-12-22 15:08:03 -0600 (Mon, 22 Dec 2008) | 44 lines

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

........
r166380 | mmichelson | 2008-12-22 14:56:29 -0600 (Mon, 22 Dec 2008) | 36 lines

Fix a deadlock relating to channel locks and autoservice

It has been discovered that if a channel is locked prior
to a call to ast_autoservice_stop, then it is likely that
a deadlock will occur. The reason is that the call to 
ast_autoservice_stop has a check built into it to be sure
that the thread running autoservice is not currently trying
to manipulate the channel we are about to pull out of 
autoservice.

The autoservice thread, however, cannot advance beyond where
it currently is, though, because it is trying to acquire
the lock of the channel for which autoservice is attempting
to be stopped.

The gist of all this is that a channel MUST NOT be locked
when attempting to stop autoservice on the channel.

In this particular case, the channel was locked by a call
to ast_read. A call to ast_exists_extension led to autoservice
being started and stopped due to the existence of dialplan
switches.

It may be that there are future commits which handle the same
symptoms but in a different location, but based on my looks through
the code, it is very rare to see a construct such as this one.

(closes issue #14057)
Reported by: rtrauntvein
Patches:
      14057v3.patch uploaded by putnopvut (license 60)
Tested by: rtrauntvein

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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 21:55:59 +00:00
Russell Bryant
3bd710a626 Merged revisions 166436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166436 | russell | 2008-12-22 15:45:28 -0600 (Mon, 22 Dec 2008) | 2 lines

Cosmetic change - don't mix struct initializer styles.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 21:46:24 +00:00
Russell Bryant
d34c6ad79d Merged revisions 166377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166377 | russell | 2008-12-22 14:26:48 -0600 (Mon, 22 Dec 2008) | 2 lines

Fix a bad typo.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 20:27:59 +00:00
Russell Bryant
0b4abe2273 Merged revisions 166317 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r166317 | russell | 2008-12-22 11:29:10 -0600 (Mon, 22 Dec 2008) | 10 lines

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

........
r166297 | russell | 2008-12-22 11:22:56 -0600 (Mon, 22 Dec 2008) | 2 lines

Fix up timeout handling in ast_carefulwrite().

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 17:30:05 +00:00
Russell Bryant
70416419ce Merged revisions 166282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166282 | russell | 2008-12-22 11:09:36 -0600 (Mon, 22 Dec 2008) | 12 lines

Introduce ast_careful_fwrite() and use in AMI to prevent partial writes.

This patch introduces a function to do careful writes on a file stream which
will handle timeouts and partial writes.  It is currently used in AMI to
address the issue that has been reported.  However, there are probably a few
other places where this could be used.

(closes issue #13546)
Reported by: srt
Tested by: russell
http://reviewboard.digium.com/r/104/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 17:14:18 +00:00
Mark Michelson
2e8b3deab5 When merging the fix for issue #14118, I found that
the issue didn't affect 1.6.0, but in this case that's
not an especially good thing, because it means that
the fix for issue #13496 was not merged into 1.6.0 in
the first place. This commit kills two birds with one
stone by putting both fixes in the 1.6.0 branch



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 16:30:25 +00:00
Russell Bryant
b19363ed78 Merged revisions 166273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166273 | russell | 2008-12-22 10:10:40 -0600 (Mon, 22 Dec 2008) | 7 lines

Re-work ref count handling of MoH classes using astobj2 to resolve crashes.

(closes issue #13566)
Reported by: igorcarneiro
Tested by: russell
Review: http://reviewboard.digium.com/r/106/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 16:17:57 +00:00
Mark Michelson
c01f7c0af8 Back these changes out for now. The initial refcounting
for filestreams didn't get merged into 1.6.0. I'll have
to get that in first and then put this change in



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 16:12:34 +00:00
Mark Michelson
3eb9bd8e4e Merged revisions 166267 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166267 | mmichelson | 2008-12-22 10:07:59 -0600 (Mon, 22 Dec 2008) | 17 lines

Fix a file playback crash and explicitly initialize values in func_timeout.c

A crash was brought up on the bugtracker. The first run through valgrind
was full of legitimate complaints of uninitialized values in func_timeout when
setting a response timeout. These were fixed but the crash persisted.

A second run through showed the real problem. The reference counting used
for filestreams was incorrect because there were some missing increments
when a frame was read from a format module.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 16:10:14 +00:00
Joshua Colp
e6a7286d11 Blocked revisions 166268 via svnmerge
........
  r166268 | file | 2008-12-22 12:08:13 -0400 (Mon, 22 Dec 2008) | 7 lines
  
  Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.
  (closes issue #13628)
  Reported by: pananix
  Patches:
        bug13628.patch uploaded by jpeeler (license 325)
  Tested by: file, blitzrage
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 16:09:36 +00:00
Russell Bryant
589ebf8421 Merged revisions 166258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166258 | russell | 2008-12-22 08:16:54 -0600 (Mon, 22 Dec 2008) | 26 lines

Remove AST_PBX_KEEPALIVE usage from res_agi.

This patch removes the usage of AST_PBX_KEEPALIVE from res_agi.  The only usage
was for the AGI command, "asyncagi break".  This patch removes this feature.
Normally, a feature would not be removed like this.  However, this code is
broken and usage of it will result in a memory leak.

Usage of this feature will make the AGI code return a result of 
AST_PBX_KEEPALIVE.  The PBX handler assumes that another thread has assumed
ownership of the channel.  The channel thread will exit without destroying the
channel.  Unfortunately, _no_ thread has ownership of the channel at this
point.  There are a couple of serious problems here:

1) The only way to recover the caller is to issue a channel redirect.  This
   will work, but this will be done with a masquerade, and the old ast_channel
   structure will be lost.

2) Until the channel redirect happens, there is no code servicing the channel.
   That means nothing is reading audio or handling events coming from the
   channel.  This is very bad.

The recommended way to get this same "break" functionality is to issue the
redirect while the channel is still being handled by the AGI code.  That way,
there will be no memory leak, and there will be no period of time that the
channel is not being serviced.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-22 14:18:08 +00:00
Mark Michelson
bd050e9fae Merged revisions 166162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166162 | mmichelson | 2008-12-19 17:45:00 -0600 (Fri, 19 Dec 2008) | 6 lines

Get rid of an extra space.

I don't know how this crept back in when I had already
fixed it earlier


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:45:26 +00:00
Mark Michelson
15ec36e3aa Adding missing file func_audiohookinherit.c
I don't know why this wasn't added to begin with. It's
here now though :)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:41:09 +00:00
Mark Michelson
eec3edde9f Merged revisions 166092,166095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r166092 | mmichelson | 2008-12-19 16:26:16 -0600 (Fri, 19 Dec 2008) | 28 lines

Adding a new dialplan function AUDIOHOOK_INHERIT

This function is being added as a method to allow for
an audiohook to move to a new channel during a channel
masquerade. The most obvious use for such a facility is
for MixMonitor when a transfer is performed. Prior to
the addition of this functionality, if a channel 
running MixMonitor was transferred by another party, then
the recording would stop once the transfer had completed.
By using AUDIOHOOK_INHERIT, you can make MixMonitor 
continue recording the call even after the transfer
has completed.

It has also been determined that since this is seen
by most as a bug fix and is not an invasive change,
this functionality will also be backported to 1.4 and
merged into the 1.6.0 branches, even though they are
feature-frozen.

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

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


........
r166095 | mmichelson | 2008-12-19 16:40:57 -0600 (Fri, 19 Dec 2008) | 5 lines

Remove the verbatim tag from the author line

I could have sworn I already did that before, though...


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@166097 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 23:04:07 +00:00
Eliel C. Sardanons
fccf7383df Blocked revisions 165954 via svnmerge
........
  r165954 | eliel | 2008-12-19 16:20:46 -0200 (Fri, 19 Dec 2008) | 4 lines
  
  Fix the XML documentation for Record().
  <value> tags inside <variable> elements must have CDATA and no
  another XML node.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 18:23:47 +00:00
Russell Bryant
21012610d2 Merged revisions 165890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r165890 | russell | 2008-12-19 09:05:09 -0600 (Fri, 19 Dec 2008) | 17 lines

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

........
r165889 | russell | 2008-12-19 09:03:02 -0600 (Fri, 19 Dec 2008) | 9 lines

Ensure that the chanspy datastore is fully initialized.

This patch resolved some random crash issues observed by a user on a BSD system

(closes issue #14111)
Reported by: ys
Patches:
      app_chanspy.c.diff uploaded by ys (license 281)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 15:08:00 +00:00
Russell Bryant
202b8352ef Blocked revisions 165886 via svnmerge
........
r165886 | russell | 2008-12-19 08:48:35 -0600 (Fri, 19 Dec 2008) | 2 lines

Disable some automatic links generated by doxygen.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165887 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 14:48:51 +00:00
Russell Bryant
3c9aebde62 Blocked revisions 165883 via svnmerge
........
r165883 | russell | 2008-12-19 08:42:51 -0600 (Fri, 19 Dec 2008) | 8 lines

Introduce commit message formatting guidelines.

This documents the recommended outline to use for commit message.  It also
covers information on special tags that can be used in commit messages, as well
as the template functionality that is available on bugs.digium.com.

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165884 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 14:43:13 +00:00
Tilghman Lesher
8c22d38f3a Merged revisions 165797 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r165797 | tilghman | 2008-12-18 15:41:02 -0600 (Thu, 18 Dec 2008) | 15 lines
  
  Merged revisions 165767 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r165767 | tilghman | 2008-12-18 15:14:47 -0600 (Thu, 18 Dec 2008) | 8 lines
    
    Add mutexes around accesses to the IMAP library interface.  This prevents
    certain crashes, especially when shared mailboxes are used.
    (closes issue #13653)
     Reported by: howardwilkinson
     Patches: 
           asterisk-1.4.21.2-appvoicemail-sharedimap-lock.patch uploaded by howardwilkinson (license 590)
     Tested by: jpeeler
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 21:56:27 +00:00
Russell Bryant
4dcb02958e Merged revisions 165801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r165801 | russell | 2008-12-18 15:44:47 -0600 (Thu, 18 Dec 2008) | 19 lines

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

........
r165796 | russell | 2008-12-18 15:39:25 -0600 (Thu, 18 Dec 2008) | 11 lines

Make ast_carefulwrite() be more careful.

This patch handles some additional cases that could result in partial writes
to the file description.  This was done to address complaints about partial
writes on AMI.

(issue #13546) (more changes needed to address potential problems in 1.6)
Reported by: srt
Tested by: russell
Review: http://reviewboard.digium.com/r/99/

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 21:45:38 +00:00
Jeff Peeler
c3662a64c7 Blocked revisions 165798 via svnmerge
........
r165798 | jpeeler | 2008-12-18 15:43:17 -0600 (Thu, 18 Dec 2008) | 6 lines

(closes issue #13993)
Reported by: mika

Add ActionID response to ping if sent with request.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 21:44:05 +00:00
Joshua Colp
3bde2f6f89 Blocked revisions 165792 via svnmerge
........
  r165792 | file | 2008-12-18 17:21:44 -0400 (Thu, 18 Dec 2008) | 6 lines
  
  Numerous documentation updates.
  (closes issue #13970)
  Reported by: pkempgen
  Patches:
        __20081217_cli_usage_fixes.patch.txt uploaded by blitzrage (license 10)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 21:22:29 +00:00
Russell Bryant
ca1c37e47c Merged revisions 165723 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r165723 | russell | 2008-12-18 13:33:42 -0600 (Thu, 18 Dec 2008) | 14 lines

Remove the need for AST_PBX_KEEPALIVE with the GoSub option from Dial.

This is part of an effort to completely remove AST_PBX_KEEPALIVE and other
similar return codes from the source.  While this usage was perfectly safe,
there are others that are problematic.  Since we know ahead of time that
we do not want to PBX to destroy the channel, the PBX API has been changed
so that information can be provided as an argument, instead, thus removing
the need for the KEEPALIVE return value.

Further changes to get rid of KEEPALIVE and related code is being done by
murf.  There is a patch up for that on review 29.

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 19:40:14 +00:00
Russell Bryant
9ca178a9be Merged revisions 165662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r165662 | russell | 2008-12-18 12:54:47 -0600 (Thu, 18 Dec 2008) | 15 lines

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

........
r165661 | russell | 2008-12-18 12:52:18 -0600 (Thu, 18 Dec 2008) | 7 lines

Set the process group ID on the MOH process so that all children will get killed

(closes issue #14099)
Reported by: caspy
Patches:
      res_musiconhold.c.patch.killpg.try2 uploaded by caspy (license 645)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 18:56:32 +00:00
Tilghman Lesher
90d0e13f44 Merged revisions 165658 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r165658 | tilghman | 2008-12-18 12:36:48 -0600 (Thu, 18 Dec 2008) | 2 lines
  
  Fix 2 resource leaks and fix another pipe-to-comma conversion
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 18:46:23 +00:00
Joshua Colp
7333579bf9 Merged revisions 165599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r165599 | file | 2008-12-18 13:13:32 -0400 (Thu, 18 Dec 2008) | 11 lines
  
  Merged revisions 165591 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r165591 | file | 2008-12-18 13:11:42 -0400 (Thu, 18 Dec 2008) | 4 lines
    
    Only care about a compatible codec for early bridging if we are actually bridging to another channel. If we are not we actually want to bring the audio back to us.
    (closes issue #13545)
    Reported by: davidw
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165603 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 17:14:27 +00:00
Joshua Colp
4e3184c908 Blocked revisions 165538 via svnmerge
................
  r165538 | file | 2008-12-18 12:11:08 -0400 (Thu, 18 Dec 2008) | 12 lines
  
  Blocked revisions 165537 via svnmerge
  
  ........
    r165537 | file | 2008-12-18 12:07:37 -0400 (Thu, 18 Dec 2008) | 6 lines
    
    Do not crash if we are not passed in a followme id.
    (closes issue #14106)
    Reported by: ys
    Patches:
          app_followme.c.2.diff uploaded by ys (license 281)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 16:11:49 +00:00
Eliel C. Sardanons
900e6b19b8 Blocked revisions 165502 via svnmerge
........
  r165502 | eliel | 2008-12-18 13:25:15 -0200 (Thu, 18 Dec 2008) | 9 lines
  
  Remove duplicate code from the ast_str API. We now use __AST_STR_* to
  access 'struct ast_str' members, but this must only be used inside the API implementation.
  
  (closes issue #14098)
  Reported by: eliel
  Patches:
        ast_str.patch uploaded by eliel (license 64)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 15:28:41 +00:00
Russell Bryant
dbfd0a3928 Blocked revisions 165433 via svnmerge
........
r165433 | russell | 2008-12-18 07:33:34 -0600 (Thu, 18 Dec 2008) | 9 lines

Add a new application, Originate.

(closes issue #14075)
Reported by: rcasas
Patches:
      app_originate.c uploaded by rcasas (license 641), heavily modified by me
Tested by: russell
Review: http://reviewboard.digium.com/r/95/

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-18 13:34:02 +00:00
Mark Michelson
f4760ab030 Blocked revisions 165330 via svnmerge
........
r165330 | mmichelson | 2008-12-17 15:46:19 -0600 (Wed, 17 Dec 2008) | 3 lines

Fix a refcount leak in res_odbc


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-17 21:48:00 +00:00
Tilghman Lesher
c4fc79c5c7 Oops, broke 1.6.0
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-17 21:29:32 +00:00
Mark Michelson
f9e08bac6d Merged revisions 165318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r165318 | mmichelson | 2008-12-17 15:17:20 -0600 (Wed, 17 Dec 2008) | 15 lines

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

........
r165255 | mmichelson | 2008-12-17 14:51:38 -0600 (Wed, 17 Dec 2008) | 7 lines

Fix some memory leaks found while looking at how realtime
configs are handled.

Also cleaned up some coding guidelines violations in app_realtime.c,
mostly related to spacing


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-17 21:22:10 +00:00