Commit Graph

16827 Commits

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

................
r162266 | mmichelson | 2008-12-09 14:30:07 -0600 (Tue, 09 Dec 2008) | 14 lines

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

........
r162265 | mmichelson | 2008-12-09 14:28:44 -0600 (Tue, 09 Dec 2008) | 6 lines

If we fail to start a thread for the pbx to run in, we need to
be sure to decrease the number of active calls on the system.

This fix may relate to ABE-1713, but it is not certain yet.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 20:31:51 +00:00
Joshua Colp
8e796b4658 Merged revisions 162205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162205 | file | 2008-12-09 15:48:35 -0400 (Tue, 09 Dec 2008) | 14 lines
  
  Merged revisions 162204 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162204 | file | 2008-12-09 15:47:07 -0400 (Tue, 09 Dec 2008) | 7 lines
    
    Make sure that the timestamp for DTMF is not the same as the previous voice frame and do not send audio when transmitting DTMF as this confuses some equipment.
    (closes issue #13209)
    Reported by: ip-rob
    Patches:
          13209.diff uploaded by file (license 11)
    Tested by: ip-rob, bujones
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 19:52:45 +00:00
Joshua Colp
085cfe48cf Merged revisions 162197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162197 | file | 2008-12-09 15:08:39 -0400 (Tue, 09 Dec 2008) | 11 lines
  
  Merged revisions 162188 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162188 | file | 2008-12-09 15:06:14 -0400 (Tue, 09 Dec 2008) | 4 lines
    
    Take video into account when early bridging RTP.
    (closes issue #13535)
    Reported by: davidw
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 19:10:33 +00:00
Steve Murphy
b331a9e331 Merged revisions 162140 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r162140 | murf | 2008-12-09 11:35:35 -0700 (Tue, 09 Dec 2008) | 9 lines

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

........
r162136 | murf | 2008-12-09 11:13:39 -0700 (Tue, 09 Dec 2008) | 1 line

Previous fix used ast_malloc and ast_copy_string and messed up the standalone stuff. Fixed.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 18:49:03 +00:00
Steve Murphy
6ceb1dd7c0 Merged revisions 162079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r162079 | murf | 2008-12-09 10:18:03 -0700 (Tue, 09 Dec 2008) | 53 lines

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

........
r162013 | murf | 2008-12-09 09:31:55 -0700 (Tue, 09 Dec 2008) | 45 lines

(closes issue #14019)
Reported by: ckjohnsonme
Patches:
      14019.diff uploaded by murf (license 17)
Tested by: ckjohnsonme, murf

This crash was the result of a few small errors that
would combine in 64-bit land to result in a crash.

32-bit land might have seen these combine to mysteriously
drop the args to an application call, in certain
circumstances.

Also, in trying to find this bug, I spotted
a situation in the flex input, where, in passing
back a 'word' to the parser, it would allocate
a buffer larger than necessary. I changed the
usage in such situations, so that strdup was
not used, but rather, an ast_malloc, followed
by ast_copy_string.

I removed a field from the pval struct, in
u2, that was never getting used, and set in
one spot in the code. I believe it was an
artifact of a previous fix to make switch
cases work invisibly with extens.

And, for goto's I removed a '!' from
before a strcmp, that has been there
since the initial merging of AEL2, that
might prevent the proper target of a 
goto from being found. This was pretty
harmless on its own, as it would just
louse up a consistency check for users.

Many thanks to ckjohnsonme for providing
a simplified and complete set of information
about the bug, that helped considerably in
finding and fixing the problem.

Now, to get aelparse up and running again
in trunk, and out of its "horribly broken" state,
so I can run the regression suite!


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 17:32:49 +00:00
Russell Bryant
20aed1b254 Merged revisions 162016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r162016 | russell | 2008-12-09 10:47:39 -0600 (Tue, 09 Dec 2008) | 13 lines

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

........
r162014 | russell | 2008-12-09 10:46:53 -0600 (Tue, 09 Dec 2008) | 5 lines

Allow DISA to handle extensions that start with #.

(closes issue #13330)
Reported by: jcovert

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 16:50:04 +00:00
Eliel C. Sardanons
3fdbe5d8eb Blocked revisions 161947 via svnmerge
........
  r161947 | eliel | 2008-12-09 12:49:30 -0200 (Tue, 09 Dec 2008) | 8 lines
  
  Avoid allocating memory for a thread that don't need it. Also, this memory was not being freed until the
  main thread ends. (That is never).
  
  (closes issue #14040)
  Reported by: eliel
  Patches:
        func_odbc.c.patch uploaded by eliel (license 64)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 16:46:56 +00:00
Russell Bryant
4dae38f1b9 Merged revisions 161951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r161951 | russell | 2008-12-09 08:57:39 -0600 (Tue, 09 Dec 2008) | 23 lines

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

........
r161948 | russell | 2008-12-09 08:52:25 -0600 (Tue, 09 Dec 2008) | 15 lines

Fix a problem with GROUP() settings on a masquerade.

The previous code carried over group settings from the old channel to the new
one.  However, it did nothing with the group settings that were already on the
new channel.  This patch removes all group settings that already existed on the
new channel.

I have a more complicated version of this patch which addresses only the most
blatant problem with this, which is that a channel can end up with multiple
group settings in the same category.  However, I could not think of a use case
for keeping any of the group settings from the old channel, so I went this route
for now.

(closes AST-152)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-09 15:07:03 +00:00
Joshua Colp
11c75cc454 Blocked revisions 161869 via svnmerge
........
  r161869 | file | 2008-12-08 17:41:50 -0400 (Mon, 08 Dec 2008) | 6 lines
  
  Add alw as a valid file extension for alaw and ulw as a valid file extension for ulaw.
  (closes issue #14001)
  Reported by: henrikw
  Patches:
        alw.diff uploaded by henrikw (license 627)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 21:42:49 +00:00
Joshua Colp
2f51870263 Merged revisions 161830 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161830 | file | 2008-12-08 16:53:50 -0400 (Mon, 08 Dec 2008) | 2 lines
  
  Update autosupport script with a few changes.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 20:55:54 +00:00
Tilghman Lesher
5e7155ec1f Merged revisions 161790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161790 | tilghman | 2008-12-08 12:49:50 -0600 (Mon, 08 Dec 2008) | 6 lines
  
  Allocate enough space initially for the message.
  (closes issue #14027)
   Reported by: junky
   Patches: 
         M14027.diff uploaded by junky (license 177)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 18:52:35 +00:00
Joshua Colp
f1a71be36b Merged revisions 161787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161787 | file | 2008-12-08 14:47:32 -0400 (Mon, 08 Dec 2008) | 6 lines
  
  Fix a regression introduced when the PBX timeouts were converted to milliseconds. collect_digits now gets milliseconds fed to it, not seconds.
  (closes issue #14012)
  Reported by: dveiga
  Patches:
        14012.patch uploaded by bkruse (license 132)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 18:49:47 +00:00
Joshua Colp
f99abb26d6 Merged revisions 161726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r161726 | file | 2008-12-08 13:53:32 -0400 (Mon, 08 Dec 2008) | 13 lines
  
  Merged revisions 161725 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r161725 | file | 2008-12-08 13:52:10 -0400 (Mon, 08 Dec 2008) | 6 lines
    
    Make the usereqphone option work again.
    (closes issue #13474)
    Reported by: mmaguire
    Patches:
          20080912_bug13474.diff uploaded by mmaguire (license 571)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 17:55:45 +00:00
Matthew Nicholson
cebc3198bc Merged revisions 161721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161721 | mnicholson | 2008-12-08 11:23:41 -0600 (Mon, 08 Dec 2008) | 7 lines
  
  Fix a crash that can occur on a transfer in chan_sip when attempting to collect
  rtp stats.
  
  (closes issue #13956)
  Reported by: chris-mac
  Tested by: chris-mac
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 17:24:32 +00:00
Eliel C. Sardanons
7382e257db Blocked revisions 161637 via svnmerge
........
  r161637 | eliel | 2008-12-08 02:23:50 -0200 (Mon, 08 Dec 2008) | 4 lines
  
  - Fix a leak while printing an argument description.
  - Avoid printing the name of an argument in the [Arguments] tag if there is no description
    for that argument.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 04:26:58 +00:00
Eliel C. Sardanons
01b9fec51e Blocked revisions 161604 via svnmerge
........
  r161604 | eliel | 2008-12-08 01:35:55 -0200 (Mon, 08 Dec 2008) | 10 lines
  
  Add voicemail related applications and functions XML documentation:
      applications:
        - VoiceMail()
        - VoiceMailMain()
        - MailboxExists()
        - VMAuthenticate()
      functions:
        - MAILBOX_EXISTS()
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-08 03:38:30 +00:00
Eliel C. Sardanons
0de3401852 Blocked revisions 161571 via svnmerge
........
  r161571 | eliel | 2008-12-07 20:43:46 -0200 (Sun, 07 Dec 2008) | 2 lines
  
  Introduce SMS() application XML documentation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-07 22:45:44 +00:00
Eliel C. Sardanons
64f9d1473b Blocked revisions 161536 via svnmerge
........
  r161536 | eliel | 2008-12-06 19:18:51 -0200 (Sat, 06 Dec 2008) | 2 lines
  
  Move Speech* applications and functions documentation to XML.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-06 21:23:40 +00:00
Mark Michelson
d6359889b9 Merged revisions 161493 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r161493 | mmichelson | 2008-12-05 17:24:38 -0600 (Fri, 05 Dec 2008) | 8 lines

If the autoloop flag is set on a channel, then we need to 
add 1 to the priority when checking if the extension exists. Otherwise,
gosubs will fail.

This was discovered when investigating an asterisk-users mailing list post
made by Gary Hawkins.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 23:29:48 +00:00
Sean Bright
fc975ab998 Merged revisions 161427 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r161427 | seanbright | 2008-12-05 16:08:43 -0500 (Fri, 05 Dec 2008) | 22 lines
  
  Merged revisions 161426 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r161426 | seanbright | 2008-12-05 16:02:20 -0500 (Fri, 05 Dec 2008) | 15 lines
    
    Merged revisions 161421 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r161421 | seanbright | 2008-12-05 15:50:23 -0500 (Fri, 05 Dec 2008) | 8 lines
      
      Fix build errors on FreeBSD (uint -> unsigned int).
      
      (closes issue #14006)
      Reported by: alphaque
      Patches:
            astobj2.h-patch uploaded by alphaque (license 259)
            (Slightly modified by seanbright)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 21:16:15 +00:00
Sean Bright
28e93c7288 Merged revisions 161349-161350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161349 | seanbright | 2008-12-05 10:56:15 -0500 (Fri, 05 Dec 2008) | 5 lines
  
  When using IMAP_STORAGE, it's important to convert bare newlines (\n) in
  emailbody and pagerbody to CR-LF so that the IMAP server doesn't spit out an
  error.  This was informally reported on #asterisk-dev a few weeks ago.  Reviewed
  by Mark M. on IRC.
........
  r161350 | seanbright | 2008-12-05 11:04:36 -0500 (Fri, 05 Dec 2008) | 2 lines
  
  Use ast_free() instead of free(), pointed out by eliel on IRC.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 16:18:52 +00:00
Russell Bryant
96e176f2a0 Merged revisions 161288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r161288 | russell | 2008-12-05 08:16:24 -0600 (Fri, 05 Dec 2008) | 10 lines

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

........
r161287 | russell | 2008-12-05 08:12:14 -0600 (Fri, 05 Dec 2008) | 2 lines

Fix a NULL format string warning found by buildbot.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 14:18:39 +00:00
Russell Bryant
74e171a47c Merged revisions 161252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r161252 | russell | 2008-12-05 07:46:01 -0600 (Fri, 05 Dec 2008) | 2 lines

Resolve a compiler warning from buildbot about a NULL format string.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 14:03:32 +00:00
Eliel C. Sardanons
3303f66e07 Blocked revisions 161218 via svnmerge
........
  r161218 | eliel | 2008-12-05 08:31:25 -0200 (Fri, 05 Dec 2008) | 8 lines
  
  Janitor, use ARRAY_LEN() when possible.
  
  (closes issue #13990)
  Reported by: eliel
  Patches:
        array_len.diff uploaded by eliel (license 64)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 10:35:30 +00:00
Tilghman Lesher
69924a14f1 Merged revisions 161181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161181 | tilghman | 2008-12-04 23:41:41 -0600 (Thu, 04 Dec 2008) | 11 lines
  
  The first file should have a blank config filename in the structure, so that
  when a save occurs to a different filename, everything goes to the alternate
  filename, instead of appending to the original.  This is important for the
  AMI command UpdateConfig.
  (closes issue #13301)
   Reported by: trevo
   Patches: 
         20081113__bug13301.diff.txt uploaded by Corydon76 (license 14)
         20081113__bug13301__1.6.0.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, blitzrage
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 05:42:29 +00:00
Sean Bright
7a09b4b153 Merged revisions 161147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r161147 | seanbright | 2008-12-04 21:47:54 -0500 (Thu, 04 Dec 2008) | 3 lines
  
  Check the return value of fread/fwrite so the compiler doesn't complain.  Only a
  problem when IMAP_STORAGE is enabled.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-05 02:52:37 +00:00
Eliel C. Sardanons
bc84991351 Blocked revisions 161077 via svnmerge
........
  r161077 | eliel | 2008-12-04 17:31:48 -0200 (Thu, 04 Dec 2008) | 2 lines
  
  Fix minor coding guidelines introduced with CLI permissions.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 19:34:02 +00:00
Jeff Peeler
69b97df472 Merged revisions 161014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r161014 | jpeeler | 2008-12-04 12:32:20 -0600 (Thu, 04 Dec 2008) | 17 lines

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

........
r161013 | jpeeler | 2008-12-04 12:30:41 -0600 (Thu, 04 Dec 2008) | 9 lines

(closes issue #13835)
Reported by: matt_b
Tested by: jpeeler

This mirrors a check that was present in ast_rtp_read to also be in ast_rtp_raw_write to not schedule sending the receiver report if the remote RTCP endpoint address isn't present in the RTCP structure.

Closes AST-142.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 18:37:08 +00:00
Mark Michelson
1f2f7df7f3 Merged revisions 160945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r160945 | mmichelson | 2008-12-04 10:45:06 -0600 (Thu, 04 Dec 2008) | 23 lines

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

........
r160943 | mmichelson | 2008-12-04 10:44:18 -0600 (Thu, 04 Dec 2008) | 15 lines

Fix a callerid parsing issue. If someone formatted callerid like the
following: "name <number>" (including the quotation marks), then the parts
would be parsed as 

name: "name
number: number

This is because the closing quotation mark was not discovered since the number
and everything after was parsed out of the string earlier. Now, there is a check
to see if the closing quote occurs after the number, so that we can know if we
should strip off the opening quote on the name.

Closes AST-158


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 16:48:24 +00:00
Michiel van Baak
7796772a49 Blocked revisions 160938 via svnmerge
........
  r160938 | mvanbaak | 2008-12-04 17:37:13 +0100 (Thu, 04 Dec 2008) | 9 lines
  
  Add debug flag so skinny debug will show information about packets.
  We dont want to scare users with this, so we added a devmode compile flag
  
  (closes issue #13952)
  Reported by: wedhorn
  Patches:
        packetdebug3.diff uploaded by wedhorn (license 30)
  Tested by: mvanbaak, wedhorn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 16:43:21 +00:00
Eliel C. Sardanons
c38a345a82 Blocked revisions 160896 via svnmerge
........
  r160896 | eliel | 2008-12-04 11:45:32 -0200 (Thu, 04 Dec 2008) | 7 lines
  
  Added XML documentation for the following AGI commands:
          - get option
          - get variable
          - hangup
          - noop
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 13:48:52 +00:00
Richard Mudgett
b15c4758ae Merged revisions 160856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160856 | rmudgett | 2008-12-03 19:36:39 -0600 (Wed, 03 Dec 2008) | 1 line
  
  Jcolp pointed out that num will also match number
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 01:41:25 +00:00
Richard Mudgett
2688e5ff67 Merged revisions 160854 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160854 | rmudgett | 2008-12-03 19:14:22 -0600 (Wed, 03 Dec 2008) | 4 lines
  
  *  Found a couple more places where num/number needed to be done
  so 1.4 upgraders will not have problems.
  *  Added curly braces and minor tweaks.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-04 01:40:51 +00:00
Tilghman Lesher
a8bc1d2476 Merged revisions 160791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160791 | tilghman | 2008-12-03 15:58:21 -0600 (Wed, 03 Dec 2008) | 9 lines
  
  Merged revisions 160770 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160770 | tilghman | 2008-12-03 15:54:07 -0600 (Wed, 03 Dec 2008) | 2 lines
    
    Some compilers warn on null format strings; some don't (caught by buildbot)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 22:02:28 +00:00
Steve Murphy
26a9bc380a Merged revisions 160760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r160760 | murf | 2008-12-03 14:09:15 -0700 (Wed, 03 Dec 2008) | 23 lines

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

........
r160703 | murf | 2008-12-03 13:41:42 -0700 (Wed, 03 Dec 2008) | 11 lines

(closes issue #13597)
Reported by: john8675309
Patches:
      patch.13597 uploaded by murf (license 17)
Tested by: murf, john8675309

This patch causes the setcid func to update the CDR
clid after setting the channel field.

I also notice that in trunk, the num/number of 1.4 is
left out; I decided to include the option to use
either in trunk, so as not to have 1.4 upgraders
not to have problems.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 21:40:29 +00:00
Jason Parker
089fa9bb54 Merged revisions 160699-160700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160699 | qwell | 2008-12-03 14:32:20 -0600 (Wed, 03 Dec 2008) | 7 lines
  
  Fix typo when ListCategories returns none.
  
  (closes issue #13994)
  Reported by: mika
  Patches:
        ListCategoriesActionPatch.diff uploaded by mika (license 624)
........
  r160700 | qwell | 2008-12-03 14:35:36 -0600 (Wed, 03 Dec 2008) | 1 line
  
  Another place this is missing
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 20:36:48 +00:00
Eliel C. Sardanons
daab1d56da Merged revisions 160663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r160663 | eliel | 2008-12-03 17:25:30 -0200 (Wed, 03 Dec 2008) | 13 lines
  
  - iax2-provision was not freeing iax_templates structure when unloading the chan_iax2.so module.
  - Move the code to start using the LIST macros.
  
  Review: http://reviewboard.digium.com/r/72
  
  (closes issue #13232)
  Reported by: eliel
  Patches:
        iax2-provision.patch.txt uploaded by eliel (license 64)
        (with minor changes pointed by Mark Michelson on review board)
  Tested by: eliel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 19:49:36 +00:00
Mark Michelson
ec71774eae Merged revisions 160626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160626 | mmichelson | 2008-12-03 12:37:46 -0600 (Wed, 03 Dec 2008) | 16 lines

Add some safety measures when using gosub, especially when using the options
for app_dial and app_queue to run a gosub when the call is answered.

* Check for the existence of the gosub target in gosub_exec. If it is nonexistent,
  then this will cause errors when we attempt to actually run the gosub, including
  a definite memory leak and potential crashes. Return an error in this situation
* Check the return value of pbx_exec in app_dial and app_queue before attempting
  to actually run the gosub routine. If there was an error, we should not attempt
  to run the gosub.
* Change a '|' to a ',' in app_queue.
* Add some extra curly braces where they had been missing previously.

(closes issue #13548)
Reported by: fiddur


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 18:42:01 +00:00
Tilghman Lesher
ea199b7a22 Blocked revisions 160585 via svnmerge
................
  r160585 | tilghman | 2008-12-03 11:59:36 -0600 (Wed, 03 Dec 2008) | 11 lines
  
  Blocked revisions 160570 via svnmerge
  
  ........
    r160570 | tilghman | 2008-12-03 11:55:12 -0600 (Wed, 03 Dec 2008) | 5 lines
    
    During bridge code, the channel bridge may return a retry code, if a transfer
    was initiated but not yet completed.  If the bridge is immediately retried,
    then we may send a storm of TXREQ packets, even though the first set is sent
    reliably (retransmitted).  Fixes AST-137.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 18:02:51 +00:00
Eliel C. Sardanons
9bf6187917 Blocked revisions 160562 via svnmerge
........
  r160562 | eliel | 2008-12-03 15:48:47 -0200 (Wed, 03 Dec 2008) | 4 lines
  
  - Add <variable /> tags when naming a channel variable.
  - Add <filename /> tags when naming a filename.
  - Simplify the xml formatting putting some enters.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:57:01 +00:00
Tilghman Lesher
559c2e122d Merged revisions 160559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160559 | tilghman | 2008-12-03 11:38:59 -0600 (Wed, 03 Dec 2008) | 14 lines
  
  Merged revisions 160558 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160558 | tilghman | 2008-12-03 11:34:34 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    If an entry is added to the directory during a scan when another entry expires,
    then that new entry will not be processed promptly, but must wait for either a
    future entry to start or a current entry's retry to occur.  If no other entries
    exist in the directory (other than the new entries) when a bunch expire, then
    the new entries must wait until another new entry is added to be processed.
    This was a rather weird race condition, really.  Fixes AST-147.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:41:56 +00:00
Mark Michelson
96792dba18 Merged revisions 160555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160555 | mmichelson | 2008-12-03 11:07:09 -0600 (Wed, 03 Dec 2008) | 11 lines

When investigating issue #13548, I found that gosub
handling in app_queue was just completely wrong, mostly
because the channel operations being performed were being
done on the incorrect channel.

With this set of changes, a gosub will correctly run on
the answering queue member's channel. There are still crash
issues which occur if there are dialplan syntax errors, so
I cannot yet close the referenced issue.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:10:04 +00:00
Tilghman Lesher
1ae9921551 Merged revisions 160552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160552 | tilghman | 2008-12-03 11:01:03 -0600 (Wed, 03 Dec 2008) | 11 lines
  
  Merged revisions 160551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160551 | tilghman | 2008-12-03 10:58:34 -0600 (Wed, 03 Dec 2008) | 4 lines
    
    Don't start scanning the directory until all modules are loaded, because some
    required modules (channels, apps, functions) may not yet be in memory yet.
    Fixes AST-149.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:02:19 +00:00
Tilghman Lesher
af7f07ac17 Merged revisions 160481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160481 | tilghman | 2008-12-03 08:11:53 -0600 (Wed, 03 Dec 2008) | 14 lines
  
  Merged revisions 160480 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160480 | tilghman | 2008-12-03 08:09:35 -0600 (Wed, 03 Dec 2008) | 7 lines
    
    Jon Bonilla (Manwe) pointed out on the -dev list:
    "I guess that having only ip-phones in mind is not a good approach. Since it is
    possible to have a sip proxy connected to asterisk we could receive a 407
    (unauthorized) or 483 (too many hops) as response and dialog ending would not be
    a good behavior."
    So modified.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 14:14:13 +00:00
Eliel C. Sardanons
8ee098a13b Blocked revisions 160447 via svnmerge
........
  r160447 | eliel | 2008-12-03 09:01:23 -0200 (Wed, 03 Dec 2008) | 4 lines
  
  - Avoid setting .synopsis and .syntax if we are using XML documentation (or the
  xml documentation wont be loaded).
  - Use <variable></variable> to refer to a dialplan variable.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 11:02:32 +00:00
Tilghman Lesher
ccdcc9caa1 Blocked revisions 160346 via svnmerge
........
  r160346 | tilghman | 2008-12-02 12:48:51 -0600 (Tue, 02 Dec 2008) | 2 lines
  
  Info on LOCAL_PEEK function.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 18:49:25 +00:00
Tilghman Lesher
f8070989f1 Blocked revisions 160344 via svnmerge
........
  r160344 | tilghman | 2008-12-02 12:39:12 -0600 (Tue, 02 Dec 2008) | 2 lines
  
  Add LOCAL_PEEK function, as requested by lmadsen.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 18:39:58 +00:00
Jeff Peeler
622c9bc7f0 Merged revisions 160333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160333 | jpeeler | 2008-12-02 12:04:51 -0600 (Tue, 02 Dec 2008) | 1 line

remove duplicate comment that I accidentally merged
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 18:05:51 +00:00
Jeff Peeler
224f8d1b86 Merged revisions 160319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r160319 | jpeeler | 2008-12-02 12:00:24 -0600 (Tue, 02 Dec 2008) | 7 lines

(closes issue #13786)
Reported by: tzafrir

Readding DAHDI_CHECK_HOOKSTATE define that was removed in r134260 which fixes not being able to make outgoing calls on some FXO adapters:
http://lists.digium.com/pipermail/asterisk-users/2008-November/thread.html#221553


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 18:04:08 +00:00
Tilghman Lesher
a99affdaf8 Merged revisions 160308 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r160308 | tilghman | 2008-12-02 11:56:24 -0600 (Tue, 02 Dec 2008) | 17 lines
  
  Merged revisions 160297 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r160297 | tilghman | 2008-12-02 11:42:09 -0600 (Tue, 02 Dec 2008) | 10 lines
    
    When the text does not match exactly (e.g. RTP/SAVP), then the %n conversion
    fails, and the resulting integer is garbage.  Thus, we must initialize the
    integer and check it afterwards for success.
    (closes issue #14000)
     Reported by: folke
     Patches: 
           asterisk-sipbg-sscanf-1.4.22.diff uploaded by folke (license 626)
           asterisk-sipbg-sscanf-1.6.0.1.diff uploaded by folke (license 626)
           asterisk-sipbg-sscanf-trunk-r159896.diff uploaded by folke (license 626)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 18:03:01 +00:00