Commit Graph

17070 Commits

Author SHA1 Message Date
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
Leif Madsen
01afbf9e6c Merged revisions 172271 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172271 | lmadsen | 2009-01-29 08:47:27 -0500 (Thu, 29 Jan 2009) | 5 lines
  
  The realtime_pgsql.sql script is missing a couple of fields.
  closes issue #14339)
  Reported by: fiddur
  Patches:
        realtime_pgsql.sql.diff uploaded by fiddur (license 678)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 13:50:52 +00:00
Olle Johansson
3c4e4a8355 Merged revisions 172234 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r172234 | oej | 2009-01-29 12:19:29 +0100 (Tor, 29 Jan 2009) | 7 lines

Make sure register= line supports both port and expiry at the same time.
(closes issue #14185)
Reported by: Nick_Lewis
Patches: 
      chan_sip.c-expiryrequest6.patch uploaded by Nick (license 657)
Tested by: Nick_Lewis

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 11:24:30 +00:00
Olle Johansson
815b9b5691 Merged revisions 172173 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r172173 | oej | 2009-01-29 10:18:01 +0100 (Tor, 29 Jan 2009) | 24 lines

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

........
r172169 | oej | 2009-01-29 09:48:18 +0100 (Tor, 29 Jan 2009) | 16 lines

Make sure that we always add the hangupcause headers. In some cases, the owner was disconnected before we checked for the cause.
This patch implements a temporary storage in the pvt and use that instead.

The code is based on ideas from code from Adomjan in issue #13385 (Add support for Reason: header)
Thanks to Klaus Darillion for testing!

(closes issue #14294)
related to issue #13385

Reported by: klaus3000 and adomjan
Patches: 
      bug14294b.diff uploaded by oej (license 306)
      Based on 20080829_chan_sip.c-q850reason_header.patch uploaded by adomjan (license 487)
Tested by: oej, klaus3000


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 10:36:28 +00:00
Olle Johansson
804fd4e470 Merged revisions 171880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r171880 | oej | 2009-01-28 14:26:31 +0100 (Ons, 28 Jan 2009) | 2 lines

Add some more notes about device matching.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-29 10:14:16 +00:00
Tilghman Lesher
41b24943e8 Merged revisions 172131 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r172131 | tilghman | 2009-01-28 16:48:01 -0600 (Wed, 28 Jan 2009) | 7 lines
  
  Fix how we skip fields (to avoid fields which don't exist) when doing an UPDATE.
  (closes issue #14205)
   Reported by: maxgo
   Patches: 
         20090128__bug14205__5.diff.txt uploaded by Corydon76 (license 14)
   Tested by: blitzrage
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 22:52:49 +00:00
Steve Murphy
dfb881fadf Merged revisions 172063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r172063 | murf | 2009-01-28 13:31:06 -0700 (Wed, 28 Jan 2009) | 52 lines
  
  Merged revisions 172030 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r172030 | murf | 2009-01-28 11:51:16 -0700 (Wed, 28 Jan 2009) | 46 lines
    
    This patch fixes h-exten running misbehavior in manager-redirected 
    situations.
    
    What it does:
    1. A new Flag value is defined in include/asterisk/channel.h,
     AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
     bridge hangup exten code not to run the h-exten there (nor
     publish the bridge cdr there). It will done at the pbx-loop
     level instead.
    2. In the manager Redirect code, I set this flag on the channel
     if the channel has a non-null pbx pointer. I did the same for the
     second (chan2) channel, which gets run if name2 is set...
     and the first succeeds.
    3. I restored the ending of the cdr for the pbx loop h-exten
     running code. Don't know why it was removed in the first place.
    4. The first attempt at the fix for this bug was to place code
       directly in the async_goto routine, which was called from a
       large number of places, and could affect a large number of
       cases, so I tested that fix against a fair number of transfer
       scenarios, both with and without the patch. In the process,
       I saw that putting the fix in async_goto seemed not to affect
       any of the blind or attended scenarios, but still, I was
       was highly concerned that some other scenarios I had not tested
       might be negatively impacted, so I refined the patch to 
       its current scope, and jmls tested both. In the process, tho,
       I saw that blind xfers in one situation, when the one-touch
       blind-xfer feature is used by the peer, we got strange 
       h-exten behavior.  So, I  inserted code to swap CDRs and
       to set the HANGUP_DONT field, to get uniform behavior.
    5. I added code to the bridge to obey the HANGUP_DONT flag,
       skipping both publishing the bridge CDR, and running
       the h-exten; they will be done at the pbx-loop (higher)
       level instead.
    6. I removed all the debug logs from the patch before committing.
    7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
       so it's only done if the h-exten is going to be run. A very
       minor performance improvement, but technically correct.
    
    
    (closes issue #14241)
    Reported by: jmls
    Patches:
          14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
    Tested by: murf, jmls
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 20:56:48 +00:00
Tilghman Lesher
8f279043a6 Merged revisions 171964 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r171964 | tilghman | 2009-01-28 11:27:40 -0600 (Wed, 28 Jan 2009) | 9 lines
  
  Merged revisions 171963 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r171963 | tilghman | 2009-01-28 11:25:18 -0600 (Wed, 28 Jan 2009) | 2 lines
    
    Clarify log message (suggested by manxpower on #asterisk-dev)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 17:29:26 +00:00
Olle Johansson
13436d893d Merged revisions 171838 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171838 | oej | 2009-01-28 14:11:44 +0100 (Ons, 28 Jan 2009) | 10 lines

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

........
r171837 | oej | 2009-01-28 14:07:27 +0100 (Ons, 28 Jan 2009) | 2 lines

Add a better explanation of the difference between the device namespace and the dialplan for newbies.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 13:21:20 +00:00
Mark Michelson
679a2c5e06 Blocked revisions 171797 via svnmerge
........
r171797 | mmichelson | 2009-01-27 18:17:55 -0600 (Tue, 27 Jan 2009) | 3 lines

Fix some signedness problems in func_aes.c


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 00:18:23 +00:00
David Vossel
8b98733d25 Blocked revisions 171757 via svnmerge
........
  r171757 | dvossel | 2009-01-27 16:43:36 -0600 (Tue, 27 Jan 2009) | 7 lines
  
  Adding AES_ENCRYPT and AES_DECRYPT dialplan functions.  
  
  (closes issue #14301)
  Reported by: amorsen
  
  review: http://reviewboard.digium.com/r/128/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 22:49:28 +00:00
Mark Michelson
52c30a3a9c Merged revisions 171691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171691 | mmichelson | 2009-01-27 15:58:39 -0600 (Tue, 27 Jan 2009) | 47 lines

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

........
r171689 | mmichelson | 2009-01-27 15:55:08 -0600 (Tue, 27 Jan 2009) | 39 lines

Fix devicestate problems for "always-on" agent channels

A revision to chan_agent attempted to "inherit" the device
state of the underlying channel in order to report the
device state of an agent channel more accurately.

The problem with the logic here is that it makes no sense to
use this for always-on agents. If the agent is logged in, then
to the underlying channel, the agent will always appear to be
"in use," no matter if the agent is on a call or not. The reason
is that to the underlying channel, the channel is currently in use
on a call to the AgentLogin application.

The most common cause that I found for this issue to occur was for
a SIP channel to be the underlying channel type for an Agent channel.
If the SIP phone re-registers, then the registration will cause the
device state core to query the device state of the SIP channel. Since the
SIP channel is in use, the Agent channel would also inherit this status.
Once the agent channel was set to "in use" there was no way that the device
state could change on that channel unless the agent logged out.

The solution for this problem is a bit different in 1.4 than it is in the
other branches. In 1.4, there will be a one-line fix to make sure that only
callback agents will inherit device state from their underlying channel type.
For the other branches of Asterisk, since callback support has been removed, there
is also no need for device state inheritance in chan_agent, so I will simply be
removing it from the code.

In addition, the 1.4 source is getting a new comment to help the next person who
edits chan_agent.c. I'm adding a comment that a agent_pvt's loginchan field may be
used to determine if the agent is a callback agent or not.

(closes issue #14173)
Reported by: nathan
Patches:
      14173.patch uploaded by putnopvut (license 60)
Tested by: nathan, aramirez


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 22:01:52 +00:00
Mark Michelson
1c23fc413a Merged revisions 171622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171622 | mmichelson | 2009-01-27 14:11:30 -0600 (Tue, 27 Jan 2009) | 26 lines

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

........
r171621 | mmichelson | 2009-01-27 14:06:01 -0600 (Tue, 27 Jan 2009) | 18 lines

Prevent a crash from occurring when a jitter buffer interpolated frame is
removed from a slinfactory

slinfactory used the "samples" field of an ast_frame in order to determine
the amount of data contained within the frame. In certain cases, such as
jitter buffer interpolated frames, the frame would have a non-zero value for
"samples" but have NULL "data"

This caused a problem when a memcpy call in ast_slinfactory_read would attempt
to access invalid memory. The solution in use here is to never feed frames into
the slinfactory if they have NULL "data"

(closes issue #13116)
Reported by: aragon
Patches:
      13116.diff uploaded by putnopvut (license 60)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 20:14:49 +00:00
Mark Michelson
2d42d6cc64 Merged revisions 171618 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r171618 | mmichelson | 2009-01-27 13:30:54 -0600 (Tue, 27 Jan 2009) | 24 lines

Fix queue crashes that would occur after the calling channel was masqueraded.

The data passed to the end_bridge_callback was assumed to be data which was
still stack'd. The problem was that with some call features, attended transfers
in particular, a new bridge thread is started once the feature completes, meaning
that when the end_bridge_callback is called, the end_bridge_callback_data was
invalid.

To fix this problem, there are two measures taken

1. Instead of pointing to stacked data, we now used heap-allocated data for
passing to the end_bridge_callback in app_queue
2. Since bridges can end multiple times on a single logical call, we wait until
the final bridge is broken to actually set any queue variables. This is accomplished
through reference-counting and the use of an end_bridge_callback_data_fixup function
in app_queue.c

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 19:43:22 +00:00
Olle Johansson
a68cd825fe Merged revisions 171528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171528 | oej | 2009-01-27 16:00:19 +0100 (Tis, 27 Jan 2009) | 23 lines

Solving the same issue, but a bit different in trunk...

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

........
r171527 | oej | 2009-01-27 15:33:20 +0100 (Tis, 27 Jan 2009) | 13 lines

Use the same branch tag in CANCEL as in INVITE

Originally putnopvut implemented some changes in revision 142079 that according to the bug report seemed to have worked then, but somehow fails now.
I guess code, as humans, get old and forget stuff. Anyway, this bug caused CANCEL not to work with picky systems. 

Thanks Fredrik for pointing out where the bug in the SIP messaging was.

(closes issue #14346)
Reported by: oej
Patches: 
      bug14346.diff uploaded by oej (license 306)
Tested by: oej

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-27 15:19:52 +00:00
Olle Johansson
7481ad589a Merged revisions 171326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r171326 | oej | 2009-01-26 14:44:40 +0100 (MÃ¥n, 26 Jan 2009) | 17 lines

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

........
r171264 | oej | 2009-01-26 13:51:53 +0100 (MÃ¥n, 26 Jan 2009) | 9 lines

Don't retransmit 401 on REGISTER requests when alwaysauthreject=yes

(closes issue #14284)
Reported by: klaus3000
Patches: 
      patch_chan_sip_unreliable_1.4.23_14284.txt uploaded by klaus3000 (license 65)
Tested by: klaus3000


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-26 14:58:04 +00:00
Tilghman Lesher
6295693719 Merged revisions 171188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r171188 | tilghman | 2009-01-25 17:58:00 -0600 (Sun, 25 Jan 2009) | 13 lines
  
  Merged revisions 171187 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r171187 | tilghman | 2009-01-25 17:44:01 -0600 (Sun, 25 Jan 2009) | 6 lines
    
    Correctly track the hookstate
    (closes issue #13686)
     Reported by: itiliti
     Patches: 
           20081013__bug13686.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-26 00:04:28 +00:00
Michiel van Baak
cc6aff6793 Blocked revisions 171081 via svnmerge
........
  r171081 | mvanbaak | 2009-01-25 17:50:53 +0100 (Sun, 25 Jan 2009) | 2 lines
  
  dont segfault when a MWI event occurs on a line without a registered device
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-25 16:56:16 +00:00
Michiel van Baak
0528afd5da Blocked revisions 171043 via svnmerge
........
  r171043 | mvanbaak | 2009-01-25 15:35:17 +0100 (Sun, 25 Jan 2009) | 7 lines
  
  Make the sample skinny.conf work
  
  (closes issue #14325)
  Reported by: DEA
  Patches:
        skinny.conf.sample-trunk.txt uploaded by DEA (license 3)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@171045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-25 14:38:07 +00:00
Sean Bright
3595adcf68 Merged revisions 170980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170980 | seanbright | 2009-01-25 08:35:48 -0500 (Sun, 25 Jan 2009) | 16 lines
  
  Merged revisions 170979 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170979 | seanbright | 2009-01-25 08:33:20 -0500 (Sun, 25 Jan 2009) | 9 lines
    
    Resolve a logic error that was causing Page() to crash when more than one
    channel was specified.
    
    (closes issue #14308)
    Reported by: bluefox
    Patches:
          20090124__bug14308.diff.txt uploaded by seanbright (license 71)
    Tested by: kc0bvu
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-25 13:40:52 +00:00
Russell Bryant
721a7fb565 Merged revisions 170943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r170943 | russell | 2009-01-24 20:49:30 -0600 (Sat, 24 Jan 2009) | 6 lines

Change ARRAY_LEN() to be more C++ safe.

When the second part of this macro is written as 0[a] instead of a[0], it will
force a failure if the macro is used on a C++ object that overloads the []
operator.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-25 02:52:32 +00:00
Russell Bryant
ba0697f054 Blocked revisions 170902 via svnmerge
........
r170902 | russell | 2009-01-24 13:33:15 -0600 (Sat, 24 Jan 2009) | 2 lines

Add a todo to finish the XML docs in this module

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-24 19:42:28 +00:00
Tilghman Lesher
c52665ffb4 Merged revisions 170837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170837 | tilghman | 2009-01-24 07:55:53 -0600 (Sat, 24 Jan 2009) | 9 lines
  
  Merged revisions 170836 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170836 | tilghman | 2009-01-24 07:55:02 -0600 (Sat, 24 Jan 2009) | 2 lines
    
    Remove superfluous implementation note (closes issue #14319)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170839 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-24 13:57:20 +00:00
Richard Mudgett
367a302e09 Merged revisions 170794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r170794 | rmudgett | 2009-01-23 17:10:34 -0600 (Fri, 23 Jan 2009) | 1 line
  
  Fix asterisk.pdf generation if branch name has an underscore in it.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 23:53:03 +00:00
Russell Bryant
03dd13fc44 Merged revisions 170790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r170790 | russell | 2009-01-23 16:58:37 -0600 (Fri, 23 Jan 2009) | 2 lines

Don't blow up if a branch name has an underscore in it

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 22:59:58 +00:00
Mark Michelson
2910a6be09 Merged revisions 170720 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r170720 | mmichelson | 2009-01-23 14:56:07 -0600 (Fri, 23 Jan 2009) | 16 lines

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

........
r170719 | mmichelson | 2009-01-23 14:55:26 -0600 (Fri, 23 Jan 2009) | 8 lines

Add notes to the idlecheck explanation in res_odbc.conf.sample

(closes issue #14319)
Reported by: klaus3000
Patches:
      patch_idlecheck_res_odbc.conf.sample.txt uploaded by klaus3000 (license 65)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:57:40 +00:00
Mark Michelson
0e124a435a Merged revisions 170677 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r170677 | mmichelson | 2009-01-23 14:23:00 -0600 (Fri, 23 Jan 2009) | 22 lines

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

........
r170671 | mmichelson | 2009-01-23 14:21:51 -0600 (Fri, 23 Jan 2009) | 14 lines

Update contrib/i18n.testsuite.conf to not use deprecated syntax

* Convert Wait,1 to Wait(1)
* Convert SetLanguage to Set(CHANNEL(language))
* Use 'n' for all priorities beyond the first

Also added test for Chinese numbers, too.

(closes issue #14320)
Reported by: dant
Patches:
      i18n.testsuite.conf.issue14320.v2.diff uploaded by dant (license 670)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:25:47 +00:00
Joshua Colp
c3711994a1 Merged revisions 170652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170652 | file | 2009-01-23 16:18:05 -0400 (Fri, 23 Jan 2009) | 11 lines
  
  Merged revisions 170648 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170648 | file | 2009-01-23 16:16:39 -0400 (Fri, 23 Jan 2009) | 4 lines
    
    When a channel is answered make sure any indications currently playing stop. Usually the phone would do this but if the channel was already answered then they are being generated by Asterisk and we darn well need to stop them.
    (closes issue #14249)
    Reported by: RadicAlish
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:20:38 +00:00
Tilghman Lesher
e0ee168b6b Merged revisions 170608 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170608 | tilghman | 2009-01-23 13:25:10 -0600 (Fri, 23 Jan 2009) | 9 lines
  
  Merged revisions 170588 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170588 | tilghman | 2009-01-23 13:20:44 -0600 (Fri, 23 Jan 2009) | 2 lines
    
    Additions to AST-2009-001
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 19:37:17 +00:00
Joshua Colp
692b93004e Merged revisions 170569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170569 | file | 2009-01-23 15:09:18 -0400 (Fri, 23 Jan 2009) | 11 lines
  
  Merged revisions 170568 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170568 | file | 2009-01-23 15:06:54 -0400 (Fri, 23 Jan 2009) | 4 lines
    
    When a call is forwarded stop any active indications. The new channel will provide an indication, if need be, itself.
    (closes issue #14310)
    Reported by: RadicAlish
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 19:10:43 +00:00
Joshua Colp
85f8608a8e Merged revisions 170505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170505 | file | 2009-01-23 14:09:45 -0400 (Fri, 23 Jan 2009) | 11 lines
  
  Merged revisions 170504 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170504 | file | 2009-01-23 14:04:08 -0400 (Fri, 23 Jan 2009) | 4 lines
    
    Use the on hold flag to see if the call is on hold or not. It is possible that our address for them will still be valid even though they are on hold.
    (closes issue #14295)
    Reported by: klaus3000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 18:11:35 +00:00
Michiel van Baak
17d6fa9568 Merged revisions 170501 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r170501 | mvanbaak | 2009-01-23 18:46:02 +0100 (Fri, 23 Jan 2009) | 1 line
  
  let's use SENTINEL where needed
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 17:49:55 +00:00
Joshua Colp
55cddf916c Blocked revisions 170498 via svnmerge
........
  r170498 | file | 2009-01-23 13:32:26 -0400 (Fri, 23 Jan 2009) | 4 lines
  
  Reset the ast_str used for escape substitution. We need to do this since it is a thread local variable that may contain the value of a previous substitution.
  (closes issue #14312)
  Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 17:33:34 +00:00
Michiel van Baak
f34cd5faf9 Blocked revisions 170460 via svnmerge
........
  r170460 | mvanbaak | 2009-01-23 17:57:07 +0100 (Fri, 23 Jan 2009) | 8 lines
  
  Dont clear the display of skinny phones when not needed.
  
  (closes issue #13182)
  Reported by: pj
  Patches:
        2009011901_dontcleardisplay.diff.txt uploaded by mvanbaak (license 7)
  Tested by: mvanbaak, pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 17:01:02 +00:00
Doug Bailey
f6c35c9c0f MWI messages included in CID spill was not being properly handled and prevented the call from being processed
(issue #14313)
Reported by: seandarcy
Tested by: dbailey



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 16:35:53 +00:00
Mark Michelson
94c4df06b0 Merged revisions 170393 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r170393 | mmichelson | 2009-01-23 09:44:27 -0600 (Fri, 23 Jan 2009) | 36 lines

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

........
r170392 | mmichelson | 2009-01-23 09:40:39 -0600 (Fri, 23 Jan 2009) | 28 lines

Fix broken call pickup

There was a subtle change in ast_do_masquerade which
resulted in failed attempts to pickup calls. The problem
was that the value of the AST_FLAG_OUTGOING flag was
copied from the clone to the original channel. In the case
of call pickup, this meant that the AST_FLAG_OUTGOING flag
ended up being cleared on the channel that was attempting
to execute the pickup.

Because this flag was not set, when ast_read came across
an answer frame, it ignored it. The result of this was that
the calling channel was never properly answered.

This fix changes the behavior in ast_do_masquerade to set
the flags on the original channel to the union of the flags
on the clone channel. This way, if the AST_FLAG_OUTGOING
flag is set on either of the two channels involved in the
masquerade, the resulting channel will have the flag set
as well.

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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 15:51:02 +00:00
Tilghman Lesher
fda0019026 Blocked revisions 170307 via svnmerge
........
  r170307 | tilghman | 2009-01-22 15:25:46 -0600 (Thu, 22 Jan 2009) | 6 lines
  
  Create logfile safely.
  (closes issue #14160)
   Reported by: tzafrir
   Patches: 
         20090104__bug14160.diff.txt uploaded by Corydon76 (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170308 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 21:26:41 +00:00
Joshua Colp
dd564351ca Merged revisions 170240 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170240 | file | 2009-01-22 16:04:39 -0400 (Thu, 22 Jan 2009) | 14 lines
  
  Merged revisions 170239 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170239 | file | 2009-01-22 16:02:35 -0400 (Thu, 22 Jan 2009) | 7 lines
    
    Don't crash if RTCP is not enabled on an RTP structure but statistics are output.
    (closes issue #14234)
    Reported by: jcovert
    Patches:
          rtp.c.patch-1.6.0.3 uploaded by jcovert (license 551)
          rtp.c.patch-svn-165599 uploaded by jcovert (license 551)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 20:06:07 +00:00
Tilghman Lesher
d19a193214 Merged revisions 170165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170165 | tilghman | 2009-01-22 11:19:28 -0600 (Thu, 22 Jan 2009) | 13 lines
  
  Merged revisions 170158 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170158 | tilghman | 2009-01-22 11:18:07 -0600 (Thu, 22 Jan 2009) | 6 lines
    
    Allow global variables after substitution to be as long as other variables.
    (closes issue #14263)
     Reported by: markd
     Patches: 
           20090120__bug14263.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 17:21:39 +00:00
Joshua Colp
97cae952ea Merged revisions 170148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170148 | file | 2009-01-22 12:52:21 -0400 (Thu, 22 Jan 2009) | 11 lines
  
  Merged revisions 170147 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170147 | file | 2009-01-22 12:50:54 -0400 (Thu, 22 Jan 2009) | 4 lines
    
    If we are unable to request a DAHDI pseudo channel and we are using the user introduction without review option make sure it gets unset so other code does not blindly assume a DAHDI pseudo channel exists.
    (closes issue #14282)
    Reported by: cheesegrits
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 16:54:45 +00:00
Joshua Colp
338ed4c623 Merged revisions 170051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r170051 | file | 2009-01-22 11:14:50 -0400 (Thu, 22 Jan 2009) | 13 lines
  
  Merged revisions 170050 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines
    
    Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness.
    (closes issue #14011)
    Reported by: dveiga
    Patches:
          pbx.c.patch uploaded by dveiga (license 665)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 15:16:12 +00:00
Joshua Colp
d5f88932f4 Merged revisions 170047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r170047 | file | 2009-01-22 11:01:54 -0400 (Thu, 22 Jan 2009) | 4 lines
  
  Clear the autoloop flag when parsing and setting the context/extension/priority to go back to. When the channel executes a PBX again we want it to start out at the point we explicitly say and at that point it will not yet be doing autoloop.
  (closes issue #14304)
  Reported by: jcovert
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@170049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 15:04:44 +00:00
Tilghman Lesher
be415faa4d Merged revisions 169944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169944 | tilghman | 2009-01-21 18:44:52 -0600 (Wed, 21 Jan 2009) | 16 lines
  
  Merged revisions 169943 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169943 | tilghman | 2009-01-21 18:43:31 -0600 (Wed, 21 Jan 2009) | 9 lines
    
    AST_RWLOCK_INIT_VALUE is always defined.  What we really wanted to ask is
    whether autoconf detected a static initializer value.  This fixes rwlocks
    on all such platforms (mainly, Mac OS X).
    (closes issue #13767)
     Reported by: jcovert
     Patches: 
           20090121__bug13767.diff.txt uploaded by Corydon76 (license 14)
     Tested by: jcovert, Corydon76
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 00:46:17 +00:00
Joshua Colp
03e3317439 Merged revisions 169869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169869 | file | 2009-01-21 19:25:27 -0400 (Wed, 21 Jan 2009) | 11 lines
  
  Merged revisions 169867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169867 | file | 2009-01-21 19:20:47 -0400 (Wed, 21 Jan 2009) | 4 lines
    
    Read lock the contexts to maintain the locking order when we are notified that the state of a device has changed.
    (closes issue #13839)
    Reported by: mcallist
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 23:28:11 +00:00
Michiel van Baak
30363ca893 Merged revisions 169793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r169793 | mvanbaak | 2009-01-21 23:04:16 +0100 (Wed, 21 Jan 2009) | 2 lines
  
  remove duplicated sentence.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 22:23:35 +00:00
Mark Michelson
8280571032 Blocked revisions 169798 via svnmerge
................
r169798 | mmichelson | 2009-01-21 16:15:16 -0600 (Wed, 21 Jan 2009) | 10 lines

Blocked revisions 169797 via svnmerge

........
r169797 | mmichelson | 2009-01-21 16:14:52 -0600 (Wed, 21 Jan 2009) | 3 lines

Adding revision 169794 to 1.4 since 1.4 is also affected by the issue


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@169799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 22:15:34 +00:00