Commit Graph

16672 Commits

Author SHA1 Message Date
Tilghman Lesher
f53607a8b4 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.0@170838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-24 13:56:42 +00:00
Richard Mudgett
4348840980 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.0@170830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 23:52:12 +00:00
Russell Bryant
1809456ab1 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.0@170791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 22:59:03 +00:00
Mark Michelson
dab84b73bf 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.0@170721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:56:32 +00:00
Mark Michelson
29a89da943 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.0@170685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:24:18 +00:00
Joshua Colp
d59c77dc20 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.0@170659 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 20:19:37 +00:00
Tilghman Lesher
0698a4ee31 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.0@170636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 19:33:10 +00:00
Joshua Colp
d00bc0014d 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.0@170570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 19:10:00 +00:00
Joshua Colp
9382891b4e 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.0@170506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 18:10:41 +00:00
Michiel van Baak
a9bff352f9 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^Wa correct sentinel where needed
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@170503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 17:52:04 +00:00
Joshua Colp
a8294dfa4f 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.0@170499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 17:33:02 +00:00
Michiel van Baak
10f14fc12c 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.0@170461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 16:58:35 +00:00
Mark Michelson
d57e63c0f1 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.0@170394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-23 15:49:50 +00:00
Joshua Colp
ebdd169c19 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.0@170241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 20:05:24 +00:00
Tilghman Lesher
7455e58b3f 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.0@170172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 17:20:45 +00:00
Joshua Colp
cb0c483da0 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.0@170149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 16:53:12 +00:00
Joshua Colp
1f843fc79d 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.0@170052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 15:15:35 +00:00
Joshua Colp
7766df456f 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.0@170048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 15:03:56 +00:00
Tilghman Lesher
4deaa3d67f 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.0@169945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-22 00:45:38 +00:00
Joshua Colp
dbf61acd1f 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.0@169870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 23:27:19 +00:00
Michiel van Baak
9bcc0cbc44 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.0@169819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 22:21:16 +00:00
Mark Michelson
06b1a253d6 Merged revisions 169794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r169794 | mmichelson | 2009-01-21 16:10:02 -0600 (Wed, 21 Jan 2009) | 17 lines

Fix a crash when saying certain numbers in Chinese

This commit fixes a crash that was occurring when attempting to
say a number between 10000 and 100000 due to dividing by 0.

This also removes some places where a "zero" is spoken when it
should not be.


(closes issue #14291)
Reported by: dant
Patches:
      say.c-14291.diff uploaded by dant (license 670)
Tested by: dant



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 22:11:11 +00:00
Tilghman Lesher
69e39ce8e9 Merged revisions 169723 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169723 | tilghman | 2009-01-21 15:03:40 -0600 (Wed, 21 Jan 2009) | 15 lines
  
  Merged revisions 169722 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169722 | tilghman | 2009-01-21 15:02:32 -0600 (Wed, 21 Jan 2009) | 8 lines
    
    Extra NULLs in the output cause some terminal types to abort in the middle of
    a color code, causing terminal weirdness.
    (closes issue #14130)
     Reported by: coolmig
     Patches: 
           20090121__bug14130.diff.txt uploaded by Corydon76 (license 14)
     Tested by: Corydon76, coolmig
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 21:04:24 +00:00
Steve Murphy
11675088b5 Blocked revisions 169673 via svnmerge
........
  r169673 | murf | 2009-01-21 10:21:40 -0700 (Wed, 21 Jan 2009) | 14 lines
  
  This patch corrects a segfault reported in 14289,
  due to a null ptr being refd.
  
  Yes, seanbright is right in the bug comments, that is the fix.
  Sorry for this oversight; I guess my personal
  usage didn't have this happen!
  
  murf
  
  (closes issue #14289)
  Reported by: jamesgolovich
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 17:43:54 +00:00
Russell Bryant
d213783bd5 Blocked revisions 169620 via svnmerge
........
r169620 | russell | 2009-01-21 04:26:07 -0600 (Wed, 21 Jan 2009) | 10 lines

Fix a regression in TCP support.

This patch fixes a problem that caused chan_sip to think that every open TCP session
was to a remote address of 0.0.0.0:0.

(closes issue #14287)
Reported by: jamesgolovich
Patches:
      bug-14287.diff.txt uploaded by jamesgolovich (license 176)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 10:26:58 +00:00
Mark Michelson
827aab8b29 Merged revisions 169611 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r169611 | mmichelson | 2009-01-20 18:33:32 -0600 (Tue, 20 Jan 2009) | 22 lines

Fix device state parsing issues for channel names with multiple slashes

The fix being applied is a bit different for trunk and the 1.6.X branches.
For trunk, we only wish to strip off the characters beyond the second slash
if the channel is a Local channel (i.e. we are removing the /n from the device
name). Other channel technologies with multiple slashes (e.g. DAHDI) need the
information after the second slash in order to get the proper device state
information.

In addition to this fix, the 1.6.X branches are receiving a much more important
fix as well. The problem in 1.6.X is that the member's device name was being directly
changed instead of having a copy changed. This meant that we would strip off the
second slash and trailing characters and then leave the member's device name like
that permanently thereafter.

(closes issue #14014)
Reported by: kebl0155
Patches:
      14014_number2.patch uploaded by putnopvut (license 60)
Tested by: kebl0155


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-21 00:35:05 +00:00
Terry Wilson
7cdc49f51d We don't support ~expiry in 1.6.0 register statements
This must have inadvertantly got merged in sometime as the code doesn't handle
this option, and configs/sip.conf.sample doesn't mention it as available. So
just remove it from the WARNING message


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-20 20:13:18 +00:00
Terry Wilson
cc34381691 Merged revisions 169510 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r169510 | twilson | 2009-01-20 13:22:24 -0600 (Tue, 20 Jan 2009) | 7 lines
  
  Make a proper builtin attended transfer to parking work
  
  This is an ugly hack from 1.4 that allows the timeout callback from a parked
  call to use the right channel name for the callback when the park is done with
  a builtin attended transfer (that isn't completed early).  This hasn't ever
  worked in trunk and no one has complained yet, so eh.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-20 19:29:24 +00:00
Terry Wilson
5c9043b90b Merged revisions 169486 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169486 | twilson | 2009-01-20 12:48:14 -0600 (Tue, 20 Jan 2009) | 13 lines
  
  Merged revisions 169485 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169485 | twilson | 2009-01-20 12:40:56 -0600 (Tue, 20 Jan 2009) | 6 lines
    
    Don't play audio to the channel if we've masqueraded
    
    (closes issue #14066)
    Reported by: bluefox
    Tested by: otherwiseguy, bluefox
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-20 18:58:34 +00:00
Tilghman Lesher
0a108b6c1c Merged revisions 169365 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r169365 | tilghman | 2009-01-19 14:05:52 -0600 (Mon, 19 Jan 2009) | 11 lines
  
  Merged revisions 169364 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r169364 | tilghman | 2009-01-19 13:49:25 -0600 (Mon, 19 Jan 2009) | 4 lines
    
    Truncate userevents at the end of a line, when the command exceeds the buffer.
    (closes issue #14278)
     Reported by: fnordian
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-19 20:08:06 +00:00
Mark Michelson
a6789c917a Merged revisions 169211 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r169211 | mmichelson | 2009-01-19 09:54:06 -0600 (Mon, 19 Jan 2009) | 21 lines

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

........
r169210 | mmichelson | 2009-01-19 09:52:15 -0600 (Mon, 19 Jan 2009) | 13 lines

Prevent a crash in chan_local due to a potential NULL pointer dereference

Move the check for if both channels on a local_pvt have generators to below
where p->chan is checked for NULLity (NULLness?). This prevents a crash from
occurring if p->chan is NULL.

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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-19 15:55:00 +00:00
Terry Wilson
5fef15d7e7 Blocked revisions 169080 via svnmerge
........
  r169080 | twilson | 2009-01-16 19:56:36 -0600 (Fri, 16 Jan 2009) | 8 lines
  
  Fix qualify for TCP peer
  
  (closes issue #14192)
  Reported by: pabelanger
  Patches: 
        asterisk-bug14192.diff.txt uploaded by jamesgolovich (license 176)
  Tested by: jamesgolovich
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-17 01:57:40 +00:00
Terry Wilson
82e5da8bc4 Merged revisions 169044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r169044 | twilson | 2009-01-16 18:03:39 -0600 (Fri, 16 Jan 2009) | 8 lines
  
  Fix port :0 added to SIP INVITE URI when outboundproxy used
  
  (closes issue #14233)
  Reported by: chris-mac
  Patches: 
        asterisk-bug14233.diff.txt uploaded by jamesgolovich (license 176)
  Tested by: jamesgolovich, chris-mac, otherwiseguy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@169078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-17 00:29:43 +00:00
Terry Wilson
d996191010 Merged revisions 168941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168941 | twilson | 2009-01-16 16:16:23 -0600 (Fri, 16 Jan 2009) | 19 lines
  
  Merged revisions 168716 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168716 | twilson | 2009-01-15 12:22:49 -0600 (Thu, 15 Jan 2009) | 12 lines
    
    Convert call to park_call_full to masq_park_call_announce
    
    Since we removed the AST_PBX_KEEPALIVE return value, we need to use masqueraded
    parking, otherwise we will try to call ast_hangup() in __pbx_run() and in
    do_parking_thread() and then promptly crash.
    (closes issue #14215)
    	Reported by: waverly360	
    	Tested by: otherwiseguy
    (closes issue #14228)
    	Reported by: kobaz
    	Tested by: otherwiseguy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-16 22:52:03 +00:00
Mark Michelson
63c3ccd9b0 Merged revisions 168976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168976 | mmichelson | 2009-01-16 16:43:09 -0600 (Fri, 16 Jan 2009) | 26 lines

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

........
r168975 | mmichelson | 2009-01-16 16:42:13 -0600 (Fri, 16 Jan 2009) | 18 lines

Account for possible NULL pointer when we receive a 408 in response to a REGISTER

It may be that by the time we receive a reply to a REGISTER request, the attempt has
timed out and thus the registry structure pointed to by the corresponding sip_pvt has
gone away. This situation was handled properly for a 200 OK response, but the 408
case assumed that the sip_registry struct was non-NULL, thus potentially causing a crash

This commit fixes this assumption and prints out a message to the console if we should
receive a late 408 response to a REGISTER


(closes issue #14211)
Reported by: aborghi
Patches:
      14211.diff uploaded by putnopvut (license 60)
Tested by: aborghi


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-16 22:46:11 +00:00
Tilghman Lesher
b669fac978 Merged revisions 168832 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168832 | tilghman | 2009-01-16 12:49:09 -0600 (Fri, 16 Jan 2009) | 13 lines
  
  Merged revisions 168828 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168828 | tilghman | 2009-01-16 12:41:35 -0600 (Fri, 16 Jan 2009) | 6 lines
    
    Fix the conjugation of Russian and Ukrainian languages.
    (related to issue #12475)
     Reported by: chappell
     Patches: 
           vm_multilang.patch uploaded by chappell (license 8)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-16 18:53:48 +00:00
Steve Murphy
166ff7e96b Merged revisions 168746 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168746 | murf | 2009-01-15 17:34:31 -0700 (Thu, 15 Jan 2009) | 20 lines
  
  Merged revisions 168745 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168745 | murf | 2009-01-15 17:19:12 -0700 (Thu, 15 Jan 2009) | 14 lines
    
    This patch fixes a problem where a goto (or jump, in this case)
    fails a consistency check because it can't find a matching 
    extension. The problem was a missing instruction to end
    the range notation in the code where it converts the pattern
    into a regex and uses the regex code to determine the match.
    
    I tested using the AEL code the user supplied, and now,
    the consistency check passes.
    
    
    (closes issue #14141)
    Reported by: dimas
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-16 00:38:36 +00:00
Steve Murphy
5c80480c83 Merged revisions 168737 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168737 | murf | 2009-01-15 13:54:59 -0700 (Thu, 15 Jan 2009) | 16 lines
  
  This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.
  
  If the user says count=ENUMLOOKUP(${EXTEN},ALL,c,,enum.mydomain.tld);
  
  then it won't complain about the empty arg (c,,...) and fabled's patch
  won't let it swap the commas for pipes.
  
  Ran it thru my dialplan and no complaints.
  
  
  (closes issue #14169)
  Reported by: fabled
  Patches:
        function-argument-separator-fix.diff uploaded by fabled (license 448)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 21:14:31 +00:00
Kevin P. Fleming
e192b455f8 Blocked revisions 168734 via svnmerge
........
  r168734 | kpfleming | 2009-01-15 14:18:53 -0600 (Thu, 15 Jan 2009) | 5 lines
  
  remove the PBX_ODBC logic from the configure script, and add GENERIC_ODCB logic that includes copying the relevant LIB and INCLUDE data from either UnixODBC or iODBC, based on which was found; if both were found, prefer UnixODBC
  
  this stops modules from being linked against both sets of libraries on systems that have both installed
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 20:20:45 +00:00
Olle Johansson
2414c56148 Merged revisions 168722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168722 | oej | 2009-01-15 19:47:14 +0100 (Tor, 15 Jan 2009) | 10 lines

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

........
r168721 | oej | 2009-01-15 19:43:43 +0100 (Tor, 15 Jan 2009) | 2 lines

Meetme actually has realtime but wasn't documented

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 18:52:54 +00:00
Olle Johansson
51dc13cfb2 Merged revisions 168711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168711 | oej | 2009-01-15 18:55:53 +0100 (Tor, 15 Jan 2009) | 4 lines

Clarify some misunderstandings and make it even more clear that you can refer to a peer
in the register= line.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 18:23:14 +00:00
Olle Johansson
8633f3884f Merged revisions 168712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r168712 | oej | 2009-01-15 19:08:59 +0100 (Tor, 15 Jan 2009) | 3 lines

Make sure that we have the same terminology in sip.conf.sample and the source code warning.
Thanks Nick Lewis for pointing this out in the bug tracker.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 18:14:20 +00:00
Sean Bright
bd1a0134d6 Merged revisions 168705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r168705 | seanbright | 2009-01-15 10:33:18 -0500 (Thu, 15 Jan 2009) | 11 lines
  
  Add a missing unlock and properly handle the 'maxusers' setting on MeetMe
  conferences.  We were using the 'user number' field to compare against the
  maximum allowed users, which works assuming users with lower user numbers
  didn't leave the conference.
  
  (closes issue #14117)
  Reported by: sergedevorop
  Patches:
        20090114__bug14117-2.diff.txt uploaded by seanbright (license 71)
  Tested by: sergedevorop
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 15:34:35 +00:00
Mark Michelson
b40ebef036 Merged revisions 168629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r168629 | mmichelson | 2009-01-14 18:14:17 -0600 (Wed, 14 Jan 2009) | 24 lines

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

........
r168628 | mmichelson | 2009-01-14 18:11:01 -0600 (Wed, 14 Jan 2009) | 16 lines

Fix some crashes from bad datastore handling in app_queue.c

* The queue_transfer_fixup function was searching for and removing
  the datastore from the incorrect channel, so this was fixed.

* Most datastore operations regarding the queue_transfer datastore
  were being done without the channel locked, so proper channel locking
  was added, too.

(closes issue #14086)
Reported by: ZX81
Patches:
      14086v2.patch uploaded by putnopvut (license 60)
Tested by: ZX81, festr


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-15 00:14:48 +00:00
Richard Mudgett
d572518549 Merged revisions 168623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168623 | rmudgett | 2009-01-14 15:51:06 -0600 (Wed, 14 Jan 2009) | 11 lines
  
  Merged revisions 168622 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168622 | rmudgett | 2009-01-14 15:48:22 -0600 (Wed, 14 Jan 2009) | 4 lines
    
    *  Fixed create_process() allocation of process ID values.
    The allocated process IDs could overflow their respective
    NT and TE fields.  Affects outgoing calls.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 21:54:31 +00:00
Steve Murphy
240cd8d0be Merged revisions 168613 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168613 | murf | 2009-01-14 13:51:26 -0700 (Wed, 14 Jan 2009) | 9 lines
  
  Merged revisions 168608 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168608 | murf | 2009-01-14 12:34:35 -0700 (Wed, 14 Jan 2009) | 1 line
    
    app_page was failing to compile in dev-mode on my gcc-4.2.4 system. This change gets rid of the warning.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 21:21:58 +00:00
Sean Bright
eb079909bc Merged revisions 168615 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168615 | seanbright | 2009-01-14 15:58:26 -0500 (Wed, 14 Jan 2009) | 16 lines
  
  Merged revisions 168614 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168614 | seanbright | 2009-01-14 15:52:00 -0500 (Wed, 14 Jan 2009) | 9 lines
    
    Update autosupport script to supply info for both Zaptel and DAHDI in 1.4 and
    be sure to run dahdi_test in 1.6.x and trunk instead of zttest.
    
    (closes issue #14132)
    Reported by: dsedivec
    Patches:
          asterisk-1.4-autosupport.patch uploaded by dsedivec (license 638)
          asterisk-trunk-autosupport.patch uploaded by dsedivec (license 638)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 20:59:33 +00:00
Richard Mudgett
5d29635bc5 Fix merge error caused by merging -r132883 and -r121770 from
https://origsvn.digium.com/svn/asterisk/trunk out of order.

(closes issue #13788)
Reported by: IgorG

(closes issue #13491)
Reported by: avalentin


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 19:20:29 +00:00
Tilghman Lesher
ca54c11b79 Merged revisions 168604 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168604 | tilghman | 2009-01-14 13:11:14 -0600 (Wed, 14 Jan 2009) | 14 lines
  
  Merged revisions 168603 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168603 | tilghman | 2009-01-14 13:02:55 -0600 (Wed, 14 Jan 2009) | 7 lines
    
    Don't read into a buffer without first checking if a value is beyond the end.
    (closes issue #13600)
     Reported by: atis
     Patches: 
           20090106__bug13600.diff.txt uploaded by Corydon76 (license 14)
     Tested by: atis
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 19:11:56 +00:00
Terry Wilson
cee2699a5d Merged revisions 168594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r168594 | twilson | 2009-01-13 20:00:40 -0600 (Tue, 13 Jan 2009) | 27 lines
  
  Merged revisions 168593 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168593 | twilson | 2009-01-13 19:27:18 -0600 (Tue, 13 Jan 2009) | 20 lines
    
    Don't overflow when paging more than 128 extensions
    
    The number of available slots for calls in app_page was hardcoded to 128.
    Proper bounds checking was not in place to enforce this limit, so if more than
    128 extensions were passed to the Page() app, Asterisk would crash.  This patch
    instead dynamically allocates memory for the ast_dial structures and removes
    the (non-functional) arbitrary limit.
    
    This issue would have special importance to anyone who is dynamically creating
    the argument passed to the Page application and allowing more than 128
    extensions to be added by an outside user via some external interface.
    
    The patch posted by a_villacis was slightly modified for some coding guidelines
    and other cleanups.  Thanks, a_villacis!
    (closes issue #14217)
    Reported by: a_villacis
    Patches: 
          20080912-asterisk-app_page-fix-buffer-overflow.patch uploaded by a (license 660)
    Tested by: otherwiseguy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 02:06:19 +00:00