Commit Graph

16249 Commits

Author SHA1 Message Date
Steve Murphy
8ad055b83e Merged revisions 144563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144563 | murf | 2008-09-25 15:54:11 -0600 (Thu, 25 Sep 2008) | 7 lines

(closes issue #13559)
Reported by: mnicholson
Patches:
      pbx_lua8.diff uploaded by mnicholson (license 96)



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-25 21:56:30 +00:00
Steve Murphy
660e02982e Merged revisions 144523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144523 | murf | 2008-09-25 15:18:12 -0600 (Thu, 25 Sep 2008) | 13 lines

I added a little verbage to hashtab for the hashtab_destroy func.
It was pretty sparsely documented.

This update fleshes out the pbx_lua module, to 
add the switch statements to the extensions in the
extensions.lua file, as well as removing them when
the module is unloaded.

Many thanks to Matt Nicholson for his fine
contribution!



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-25 21:21:33 +00:00
Steve Murphy
49a9883dc5 Merged revisions 144482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144482 | murf | 2008-09-25 11:51:11 -0600 (Thu, 25 Sep 2008) | 14 lines

(closes issue #13558)
Reported by: mnicholson

Considering that the example extensions.lua used nothing but ["12345"] notation,
and that the resulting error message: 

[Sep 24 17:01:16] ERROR[12393]: pbx_lua.c:1204 exec: Error executing lua extension: attempt to call a nil value

is not very informative as to the nature of the problem, I think this bug
fix is a big win!




........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-25 17:55:08 +00:00
Tilghman Lesher
91e2b5bee0 Blocked revisions 144199 via svnmerge
........
r144199 | tilghman | 2008-09-24 01:43:05 -0500 (Wed, 24 Sep 2008) | 4 lines

Create a 'hashcompat' option that permits the results of a CURL() able to be
passed directly into the HASH() function.  Requested via the -users list, and
committed at Astricon in the Code Zone.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-24 06:44:50 +00:00
Mark Michelson
9c4ebba68a Blocked revisions 144149 via svnmerge
........
r144149 | mmichelson | 2008-09-23 18:33:33 -0500 (Tue, 23 Sep 2008) | 3 lines

Fix a conflict in flag values


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-23 23:34:57 +00:00
Steve Murphy
f1421805ed Merged revisions 144067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r144067 | murf | 2008-09-23 10:52:32 -0600 (Tue, 23 Sep 2008) | 37 lines

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

........
r144066 | murf | 2008-09-23 10:41:49 -0600 (Tue, 23 Sep 2008) | 29 lines

(closes issue #13489)
Reported by: DougUDI
Tested by: murf

(closes issue #13490)
Reported by: seanbright
Tested by: murf

(closes issue #13467)
Reported by: edantie
Tested by: murf, edantie, DougUDI


This crash happens because we are unsafely handling old pointers.
The channel whose cdr is being handled, has been hung up and 
destroyed already. I reorganized the code a bit, and tried not
to lose the fork-cdr-chain concepts of the previous code.
I now verify that the 'previous' channel (the channel we
had when the bridge was started), still exists, by looking it up
by name in the channel list. I also do not try to reset the
CDR's of channels involved in bridges. 

Testing shows it solves the crash problem, and should not
negatively impact previous fixes involving CDR's generated
during/after blind transfers. (The reason we need to reset
the CDR's on the "beginning" channels in the first place).



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-23 16:57:56 +00:00
Mark Michelson
3919045ee6 Merged revisions 144025 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144025 | mmichelson | 2008-09-23 10:37:00 -0500 (Tue, 23 Sep 2008) | 16 lines

When a promiscuous redirect contained both a user and
host portion in the Contact URI and specifies a 
transport, the parsing done in parse_moved_contact
resulted in a malformed URI.

This commit fixes the parsing so that a proper
Dial string may be formed when the forwarded
call is placed.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@144026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-23 15:38:06 +00:00
Sean Bright
3758e4813a Merged revisions 143904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r143904 | seanbright | 2008-09-22 18:50:07 -0400 (Mon, 22 Sep 2008) | 16 lines

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

........
r143903 | seanbright | 2008-09-22 18:49:00 -0400 (Mon, 22 Sep 2008) | 8 lines

Use the advertised header size in .au files instead of just assuming they
are 24 bytes (the minimum).

(closes issue #13450)
Reported by: jamessan
Patches:
      pcm-header.diff uploaded by jamessan (license 246)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-22 22:50:55 +00:00
Michiel van Baak
790baaec02 Merged revisions 143843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143843 | mvanbaak | 2008-09-21 11:53:01 +0200 (Sun, 21 Sep 2008) | 3 lines
  
  fix privacymanager example so it shows how to use the
  PRIVACYMRGSTATUS variable
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-21 09:55:28 +00:00
Michiel van Baak
4e8bf25213 Blocked revisions 143840 via svnmerge
........
  r143840 | mvanbaak | 2008-09-21 11:31:54 +0200 (Sun, 21 Sep 2008) | 3 lines
  
  document the new context argument for privacymanager
  so people can do pattern matching on the input
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-21 09:33:12 +00:00
Michiel van Baak
99f6718460 Merged revisions 143837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143837 | mvanbaak | 2008-09-21 11:27:08 +0200 (Sun, 21 Sep 2008) | 2 lines
  
  fix privacy documentation. We no longer do priority jumping +101
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-21 09:28:25 +00:00
Michiel van Baak
18012993f4 Blocked revisions 143799 via svnmerge
........
  r143799 | mvanbaak | 2008-09-20 12:39:20 +0200 (Sat, 20 Sep 2008) | 8 lines
  
  make 'module unload chan_skinny.so' actually work.
  
  (closes issue #13524)
  Reported by: wedhorn
  Patches:
        unload.diff uploaded by wedhorn (license 30)
  	  With small tweak by me to prevent a crash
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-20 10:40:50 +00:00
Sean Bright
3bbb6b6d61 Merged revisions 143737 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r143737 | seanbright | 2008-09-19 20:52:20 -0400 (Fri, 19 Sep 2008) | 17 lines

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

........
r143736 | seanbright | 2008-09-19 20:50:10 -0400 (Fri, 19 Sep 2008) | 9 lines

Make vmail.cgi work with mailboxes defined in users.conf, too.

(closes issue #13187)
Reported by: netvoice
Patches:
      20080911__bug13187.diff.txt uploaded by Corydon76 (license 14)
      (Slightly modified to take alchamist's comments on mantis into account)
Tested by: msales, alchamist, seanbright

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-20 00:54:15 +00:00
Sean Bright
dc216d98f0 ast_event_unsubscribe in 1.6.0 returns void, not NULL.
Pointed out by Stefan Gofferje on the asterisk-users mailing list.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-20 00:38:51 +00:00
Mark Michelson
f6376d0130 Merged revisions 143609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r143609 | mmichelson | 2008-09-19 10:43:28 -0500 (Fri, 19 Sep 2008) | 11 lines

We should only unsubscribe to the device state event
subscription if we have previously subscribed. Otherwise
a segfault will occur.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-19 15:48:37 +00:00
Steve Murphy
9f74603219 Merged revisions 143559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r143559 | murf | 2008-09-18 17:41:33 -0600 (Thu, 18 Sep 2008) | 9 lines

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

........
r143534 | murf | 2008-09-18 16:11:51 -0600 (Thu, 18 Sep 2008) | 1 line

A micro-fix, in sip_park_thread, where d is freed before the func is done using it.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-18 23:50:25 +00:00
Tilghman Lesher
73e498b461 Merged revisions 143405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r143405 | tilghman | 2008-09-17 15:57:58 -0500 (Wed, 17 Sep 2008) | 13 lines
  
  Merged revisions 143404 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r143404 | tilghman | 2008-09-17 15:55:47 -0500 (Wed, 17 Sep 2008) | 6 lines
    
    When callerid is blank, we want to use "unknown caller" in those cases, too.
    (closes issue #13486)
     Reported by: tomo1657
     Patches: 
           20080917__bug13486.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-17 20:58:54 +00:00
Mark Michelson
bd9c3357c3 Blocked revisions 143400 via svnmerge
........
r143400 | mmichelson | 2008-09-17 15:25:40 -0500 (Wed, 17 Sep 2008) | 16 lines

If attempting to free a NULL pointer when MALLOC_DEBUG
is set, don't bother searching for a region to free, just
immediately exit.

This has the dual benefit of suppressing a warning message
about freeing memory at (nil) and of optimizing the free()
replacement by not having to do any futile searching for
the proper region to free.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-17 20:26:27 +00:00
Mark Michelson
e9e8dd2efd Blocked revisions 143340 via svnmerge
................
r143340 | mmichelson | 2008-09-17 13:26:35 -0500 (Wed, 17 Sep 2008) | 14 lines

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

........
r143337 | mmichelson | 2008-09-17 13:24:15 -0500 (Wed, 17 Sep 2008) | 6 lines

Allow for "G.729" if offered in an SDP even though
it is not RFC 3551 compliant. Some Cisco switches
will send this in an SDP, and it doesn't hurt to
be able to accept this.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-17 18:29:12 +00:00
Tilghman Lesher
e4a1181251 Merged revisions 143141 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r143141 | tilghman | 2008-09-15 16:31:36 -0500 (Mon, 15 Sep 2008) | 13 lines
  
  Merged revisions 143140 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r143140 | tilghman | 2008-09-15 16:29:32 -0500 (Mon, 15 Sep 2008) | 6 lines
    
    Set the raw formats at the same time as the other formats.
    (closes issue #13240)
     Reported by: jvandal
     Patches: 
           20080813__bug13240.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-15 21:32:29 +00:00
Michiel van Baak
4097442bdb Merged revisions 143082 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143082 | mvanbaak | 2008-09-15 00:16:34 +0200 (Mon, 15 Sep 2008) | 11 lines
  
  plug a couple of memleaks in chan_skinny.
  
  (closes issue #13452)
  Reported by: pj
  Patches:
        memleak5.diff uploaded by wedhorn (license 30)
  Tested by: wedhorn, pj, mvanbaak
  
  (closes issue #13294)
  Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-14 22:22:48 +00:00
Sean Bright
6e52004f8b Blocked revisions 143034 via svnmerge
........
r143034 | seanbright | 2008-09-13 10:15:08 -0400 (Sat, 13 Sep 2008) | 1 line

Everytime a compile fails, a puppy dies.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-13 14:16:10 +00:00
Tilghman Lesher
5302fa36b8 Recorded merge of revisions 143031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143031 | tilghman | 2008-09-13 08:54:15 -0500 (Sat, 13 Sep 2008) | 8 lines
  
  Repair IAXVAR implementation so that it works again (regression?)
  (closes issue #13354)
   Reported by: adomjan
   Patches: 
         20080828__bug13354.diff.txt uploaded by Corydon76 (license 14)
         20080829__bug13354__1.6.0.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, adomjan
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@143032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-13 13:57:05 +00:00
Tilghman Lesher
1421b14291 Blocked revisions 142992 via svnmerge
........
  r142992 | tilghman | 2008-09-12 18:30:03 -0500 (Fri, 12 Sep 2008) | 27 lines
  
  Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating
  when a file is invalid from when a file is missing.  This is most important when
  we have two configuration files.  Consider the following example:
  
  Old system:
  sip.conf     users.conf     Old result               New result
  ========     ==========     ==========               ==========
  Missing      Missing        SIP doesn't load         SIP doesn't load
  Missing      OK             SIP doesn't load         SIP doesn't load
  Missing      Invalid        SIP doesn't load         SIP doesn't load
  OK           Missing        SIP loads                SIP loads
  OK           OK             SIP loads                SIP loads
  OK           Invalid        SIP loads incompletely   SIP doesn't load
  Invalid      Missing        SIP doesn't load         SIP doesn't load
  Invalid      OK             SIP doesn't load         SIP doesn't load
  Invalid      Invalid        SIP doesn't load         SIP doesn't load
  
  So in the case when users.conf doesn't load because there's a typo that
  disrupts the syntax, we may only partially load users, instead of failing with
  an error, which may cause some calls not to get processed.  Worse yet, the old
  system would do this with no indication that anything was even wrong.
  
  (closes issue #10690)
   Reported by: dtyoo
   Patches: 
         20080716__bug10690.diff.txt uploaded by Corydon76 (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 23:32:12 +00:00
Jeff Peeler
9629a4a0a1 Merged revisions 142929 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142929 | jpeeler | 2008-09-12 17:24:13 -0500 (Fri, 12 Sep 2008) | 14 lines

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

........
r142927 | jpeeler | 2008-09-12 17:22:28 -0500 (Fri, 12 Sep 2008) | 6 lines

(closes issue #12965)
Reported by: rlsutton2

Prevents local channels from playing MOH at each other which was causing ast_generic_bridge to loop much faster.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 22:25:21 +00:00
Tilghman Lesher
86598fd373 Merged revisions 142866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r142866 | tilghman | 2008-09-12 15:49:46 -0500 (Fri, 12 Sep 2008) | 18 lines
  
  Merged revisions 142865 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r142865 | tilghman | 2008-09-12 15:37:18 -0500 (Fri, 12 Sep 2008) | 11 lines
    
    Create rules for disallowing contacts at certain addresses, which may
    improve the security of various installations.  As this does not change
    any default behavior, it is not classified as a direct security fix for
    anything within Asterisk, but may help PBX admins better secure their
    SIP servers.
    (closes issue #11776)
     Reported by: ibc
     Patches: 
           20080829__bug11776.diff.txt uploaded by Corydon76 (license 14)
     Tested by: Corydon76, blitzrage
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 20:51:26 +00:00
Tilghman Lesher
79ecae6614 Merged revisions 142748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r142748 | tilghman | 2008-09-12 11:54:44 -0500 (Fri, 12 Sep 2008) | 3 lines

When checking for an encoded character, make sure the string isn't blank, first.
(Closes issue #13470)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 16:56:49 +00:00
Tilghman Lesher
1b94ff5b0e Merged revisions 142745 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142745 | tilghman | 2008-09-12 11:38:55 -0500 (Fri, 12 Sep 2008) | 12 lines

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

........
r142744 | tilghman | 2008-09-12 11:38:02 -0500 (Fri, 12 Sep 2008) | 4 lines

Missing merge from 1.2 fixes errant exit on DTMF, only when language is Italian
(cf commit 34242)
(Closes issue #7353)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 16:39:37 +00:00
Tilghman Lesher
6c55eda169 Merged revisions 142741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142741 | tilghman | 2008-09-12 11:29:01 -0500 (Fri, 12 Sep 2008) | 12 lines

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

........
r142740 | tilghman | 2008-09-12 11:27:32 -0500 (Fri, 12 Sep 2008) | 4 lines

Don't return a free'd pointer, when a file cannot be opened.
(closes issue #13462)
 Reported by: wackysalut

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 16:30:07 +00:00
Steve Murphy
3c1c24500b Merged revisions 142676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142676 | murf | 2008-09-11 22:50:48 -0600 (Thu, 11 Sep 2008) | 40 lines

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

........
r142675 | murf | 2008-09-11 22:29:34 -0600 (Thu, 11 Sep 2008) | 29 lines

Tested by: sergee, murf, chris-mac, andrew, KNK

This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from 
the ground up!

This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.

Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.

While I dearly hope that this patch overcomes all problems, and 
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.

** trunk note: some code to suppress the h exten being run 
from app_queue was added; for the 'continue' option available
only in trunk/1.6.x.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142677 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:58:38 +00:00
Sean Bright
7d5e83a34f Blocked revisions 142635 via svnmerge
........
r142635 | seanbright | 2008-09-11 20:49:31 -0400 (Thu, 11 Sep 2008) | 1 line

Build under dev-mode
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 00:50:42 +00:00
Steve Murphy
d1723e6ae5 Merged revisions 142576 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142576 | murf | 2008-09-11 17:12:53 -0600 (Thu, 11 Sep 2008) | 28 lines

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

........
r142575 | murf | 2008-09-11 16:55:49 -0600 (Thu, 11 Sep 2008) | 20 lines

(closes issue #13364)
Reported by: mdu113

Well, fundamentally, the problems revealed in 13364 are
because of the ForkCDR call that is done before the dial. 
When the bridge is in place, it's dealing with the first
(and wrong) cdr in the list.

So, I wrote a little func to zip down to the first non-locked
cdr in the chain, and thru-out the ast_bridge_call, these
results are used instead of raw chan->cdr and peer->cdr pointers.
This shouldn't affect anyone who isn't forking cdrs before a
dial, and should correct the cdr's of those that do.

So, this change ends up correcting the dstchannel
and userfield; the disposition was fixed by a previous
patch, it was OK coming into this problem.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-11 23:49:00 +00:00
Tilghman Lesher
cdd49ae465 Blocked revisions 142536 via svnmerge
........
r142536 | tilghman | 2008-09-11 16:45:07 -0500 (Thu, 11 Sep 2008) | 4 lines

Add usegmtime, as per the recent -users list discussion, and also add my
explanation to the file, since that additional text helps people understand
the concept.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-11 21:45:50 +00:00
Steve Murphy
2116207025 Merged revisions 142475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142475 | murf | 2008-09-10 16:11:27 -0600 (Wed, 10 Sep 2008) | 38 lines

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

........
r142474 | murf | 2008-09-10 15:58:17 -0600 (Wed, 10 Sep 2008) | 30 lines

(closes issue #12318)
Reported by: krtorio

I made a small change to the code that handles local channel situations.
In that code, I copy the answer time from the peer cdr, to the bridge_cdr,
but I wasn't also copying the disposition from the peer cdr.

So, Now I copy the disposition, and I've tested against 
these cases:

1. phone 1 never answers the phone; no cdr is generated at all.
   this should show up as a manager command failure or something.

2. phone 2 never answers. CDR is generated, says NO ANSWER

3. phone 2 is busy. CDR is generated, says BUSY

4. phone 2 answers: CDR is generated, times are correct; disposition
   is ANSWERED, which is correct. The start time is the time that
   the manager dialed the first phone. The answer time is the time
   the second phone picks up.

I purposely left the cid and src fields blank; since this call really
originates from the manager, there is no 'easy' data to put in these
fields. If you feel strongly that these fields should be filled in,
re-open this bug and I'll dig further.




........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10 22:14:41 +00:00
Sean Bright
c4f7728d7c Merged revisions 142417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142417 | seanbright | 2008-09-10 15:09:03 -0400 (Wed, 10 Sep 2008) | 17 lines

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

........
r142416 | seanbright | 2008-09-10 15:05:46 -0400 (Wed, 10 Sep 2008) | 9 lines

Fix detection of PWLIB and OpenH323 version when spacing in the headers
isn't consistent.

(closes issue #13426)
Reported by: bamby
Patches:
      detect_openh323.diff uploaded by bamby (license 430)
      (Modified by me to use sed instead of tr)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142418 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10 19:12:16 +00:00
Tilghman Lesher
a97d655a8d Merged revisions 142359 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142359 | tilghman | 2008-09-10 11:55:31 -0500 (Wed, 10 Sep 2008) | 10 lines

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

........
r142358 | tilghman | 2008-09-10 11:54:29 -0500 (Wed, 10 Sep 2008) | 2 lines

Publish new extra sounds version.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10 16:57:05 +00:00
Russell Bryant
e6f7951a95 Merged revisions 142355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142355 | russell | 2008-09-10 11:41:55 -0500 (Wed, 10 Sep 2008) | 15 lines

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

........
r142354 | russell | 2008-09-10 11:39:53 -0500 (Wed, 10 Sep 2008) | 7 lines

It is a normal situation that a task gets put in the scheduler that should run
as soon as possible.  Accept "0" as an acceptable time to run, and also treat
negative as "run now", and don't print a debug message about it.

(inspired by a message asking about the "request to schedule in the past"
 debug message on the -dev list)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-10 16:42:32 +00:00
Philippe Sultan
52826a8645 Merged revisions 142280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r142280 | phsultan | 2008-09-10 00:08:56 +0200 (Wed, 10 Sep 2008) | 6 lines

Disable autoprune by default.
(closes issue #13411)
Reported by: caio1982
Patches:
      res_jabber_autoprune1.diff uploaded by caio1982 (license 22)
Tested by: caio1982
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 22:14:40 +00:00
Mark Michelson
a520ba2e48 Blocked revisions 142219 via svnmerge
................
r142219 | mmichelson | 2008-09-09 14:16:30 -0500 (Tue, 09 Sep 2008) | 22 lines

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

........
r142218 | mmichelson | 2008-09-09 14:15:28 -0500 (Tue, 09 Sep 2008) | 14 lines

Make sure that the branch sent in CANCEL requests
matches the branch of the INVITE it is cancelling.

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

(closes issue #13198)
Reported by: rickead2000
Tested by: rickead2000


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 19:17:49 +00:00
Mark Michelson
a4c74eccbd Blocked revisions 142146 via svnmerge
........
r142146 | mmichelson | 2008-09-09 12:15:29 -0500 (Tue, 09 Sep 2008) | 21 lines

This is the trunk version of the patch to close
issue 12979. The difference between this and the
1.6.0 and 1.6.1 versions is that this is a much more
invasive change. With this, we completely get rid
of the interfaces list, along with all its helper
functions.

Let me take a moment to say that this change personally
excites me since it may mean huge steps forward regarding
proper lock order in app_queue without having to strew
seemingly unnecessary locks all over the place. It also
results in a huge reduction in lines of code and complexity.
Way to go Brett!

(closes issue #12979)
Reported by: sigxcpu
Patches:
      20080710_issue12979_queue_custom_state_interface_trunk_2.diff uploaded by bbryant (license 36)
Tested by: sigxcpu, putnopvut


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 17:16:33 +00:00
Mark Michelson
fac93e8478 Fix app_queue's device state callback so that it
can correctly parse custom device states (and any
other device which does not contain a '/').

1.6.1 will be getting this patch as well, but trunk
is going to get a much more massive patch by bbryant
which does some very nice overhauling of some
structures in app_queue.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 16:26:56 +00:00
Mark Michelson
b12820f102 Blocked revisions 142080 via svnmerge
................
r142080 | mmichelson | 2008-09-09 11:20:41 -0500 (Tue, 09 Sep 2008) | 29 lines

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

........
r142079 | mmichelson | 2008-09-09 11:19:17 -0500 (Tue, 09 Sep 2008) | 21 lines

When determining if codecs used by SIP peers allow
the media to be natively bridged, use the jointcapability
instead of the peercapability.

It seems that the intent of using the peercapability was to
expand the choice of codecs for the call to increase the
chances of being able to native bridge the channels. The 
problem is that if a codec were settled on for the native
bridge and that wasn't a codec that was configured to be used
by Asterisk for that peer, then Asterisk would send a 
REINVITE with no codecs in the SDP which is a bug no matter
how you slice it.


(closes issue #13076)
Reported by: ramonpeek
Patches:
      13076.patch uploaded by putnopvut (license 60)
Tested by: tbelder


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 16:21:31 +00:00
Russell Bryant
f573a4785e Merged revisions 142064 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142064 | russell | 2008-09-09 10:44:10 -0500 (Tue, 09 Sep 2008) | 13 lines

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

........
r142063 | russell | 2008-09-09 10:40:24 -0500 (Tue, 09 Sep 2008) | 5 lines

Ensure that the stored CDR reference is still valid after the bridge before
poking at it.  Also, keep the channel locked while messing with this CDR.

(fixes crashes reported in issue #13409)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 15:44:43 +00:00
Bradley Latus
9e68d473d9 Blocked revisions 142000 via svnmerge
........
r142000 | snuffy | 2008-09-09 22:34:32 +1000 (Tue, 09 Sep 2008) | 2 lines

Minor fix to doco

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@142010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 13:31:24 +00:00
Mark Michelson
46503ce8aa Blocked revisions 141998 via svnmerge
........
r141998 | mmichelson | 2008-09-09 07:32:38 -0500 (Tue, 09 Sep 2008) | 7 lines

Use ast_debug for debug messages. I was wondering why debug
messages weren't showing up when I had set the debug level
high for just app_queue.c. It's because we were only checking
the global option_debug variable instead of using the awesome
macro which checks both the global and file-specific value


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 12:34:10 +00:00
Mark Michelson
6a4a774f00 Merged revisions 141995 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r141995 | mmichelson | 2008-09-09 05:20:58 -0500 (Tue, 09 Sep 2008) | 8 lines

Fix a memory leak in chan_oss

(closes issue #13311)
Reported by: eliel
Patches:
      chan_oss.c.patch uploaded by eliel (license 64)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 10:24:32 +00:00
Russell Bryant
449cf2d24a Merged revisions 141949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r141949 | russell | 2008-09-08 20:47:56 -0500 (Mon, 08 Sep 2008) | 9 lines

Modify ast_answer() to not hold the channel lock while calling ast_safe_sleep()
or when calling ast_waitfor().  These are inappropriate times to hold the channel
lock.  This is what has caused "could not get the channel lock" messages from
chan_sip and has likely caused a negative impact on performance results of SIP
in Asterisk 1.6.  Thanks to file for pointing out this section of code.

(closes issue #13287)
(closes issue #13115)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 01:49:25 +00:00
Mark Michelson
1be1e4b5e4 Blocked revisions 141906 via svnmerge
........
r141906 | mmichelson | 2008-09-08 18:00:06 -0500 (Mon, 08 Sep 2008) | 9 lines

Optimization: The only reason we should check member
status is if the queue has a joinempty or a leavewhenempty
setting which could cause the caller to not join the queue
or exit the queue. Prior to this patch, we could potentially
traverse the entire queue's member list for no reason since
even if the members are currently not available in some way
we're going to let the caller join the queue anyway.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08 23:00:38 +00:00
Mark Michelson
93cfeebd50 Blocked revisions 141868 via svnmerge
........
r141868 | mmichelson | 2008-09-08 17:14:40 -0500 (Mon, 08 Sep 2008) | 4 lines

Um, apparently I didn't actually finish merging before committing.
Bad bad bad


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08 22:15:03 +00:00
Mark Michelson
bc5e961370 Blocked revisions 141810 via svnmerge
................
r141810 | mmichelson | 2008-09-08 16:18:49 -0500 (Mon, 08 Sep 2008) | 22 lines

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

........
r141809 | mmichelson | 2008-09-08 16:10:10 -0500 (Mon, 08 Sep 2008) | 14 lines

Fix pedantic mode of chan_sip to only check the
remote tag of an endpoint once a dialog has
been confirmed. Up until that point, it is possible
and legal for the far-end to send provisional
responses with a different To: tag each time. With
this patch applied, these provisional messages
will not cause a matching problem.

(closes issue #11536)
Reported by: ibc
Patches:
      11536v2.patch uploaded by putnopvut (license 60)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-08 21:19:23 +00:00