Commit Graph

16324 Commits

Author SHA1 Message Date
Mark Michelson
0ecfb8e29e I don't care what anyone says, this change is going into 1.6.0.
Otherwise, the simple act of logging an agent in spams the CLI
with warning messages about failed reads of the alertpipe.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 22:28:48 +00:00
Tilghman Lesher
1c6382e638 Merged revisions 159247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r159247 | tilghman | 2008-11-25 15:42:42 -0600 (Tue, 25 Nov 2008) | 21 lines
  
  Merged revisions 159246 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r159246 | tilghman | 2008-11-25 15:40:28 -0600 (Tue, 25 Nov 2008) | 14 lines
    
    Merged revisions 159245 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r159245 | tilghman | 2008-11-25 15:37:06 -0600 (Tue, 25 Nov 2008) | 7 lines
      
      Regression fix for last security fix.  Set the iseqno correctly.
      (closes issue #13918)
       Reported by: ffloimair
       Patches: 
             20081119__bug13918.diff.txt uploaded by Corydon76 (license 14)
       Tested by: ffloimair
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 21:43:27 +00:00
Terry Wilson
fbcd6b9595 Merged revisions 159093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r159093 | twilson | 2008-11-25 10:18:53 -0600 (Tue, 25 Nov 2008) | 2 lines
  
  Add missing variable declaration for PPC code
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 16:21:25 +00:00
Terry Wilson
8855a46d6e Merged revisions 158992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158992 | twilson | 2008-11-24 21:49:30 -0600 (Mon, 24 Nov 2008) | 2 lines
  
  Make chan_usbradio compile under dev mode
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@159024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-25 04:05:31 +00:00
Steve Murphy
3661324455 Merged revisions 158484 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r158484 | murf | 2008-11-21 14:47:16 -0700 (Fri, 21 Nov 2008) | 19 lines

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

........
r158483 | murf | 2008-11-21 14:19:47 -0700 (Fri, 21 Nov 2008) | 11 lines

(closes issue #13871)
Reported by: mdu113

This one is totally my fault. The code doesn't even
create a bridge CDR if the channel CDR has POST_DISABLED.
I didn't check for that at the end of the bridge.
Fixed with a few small insertions. Tested. Looks
good. No cdr generated, no crash, no unnecc. data
objects created either.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 22:40:28 +00:00
Russell Bryant
c74fff5ebc Merged revisions 158540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r158540 | russell | 2008-11-21 16:12:37 -0600 (Fri, 21 Nov 2008) | 10 lines

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

........
r158539 | russell | 2008-11-21 16:05:55 -0600 (Fri, 21 Nov 2008) | 2 lines

When compiling with DEBUG_THREADS, report the real file/func/line for ao2_lock/ao2_unlock

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 22:13:42 +00:00
Kevin P. Fleming
15c881c098 Merged revisions 158449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158449 | kpfleming | 2008-11-21 14:42:37 -0600 (Fri, 21 Nov 2008) | 3 lines
  
  as suggested by jtodd, document the purposes of the CHANGES and UPGRADE files
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 20:44:23 +00:00
Terry Wilson
ae40f9a6c9 Merged revisions 158374 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158374 | twilson | 2008-11-21 11:08:16 -0600 (Fri, 21 Nov 2008) | 8 lines
  
  Reloading the config and having no changes still initialized some settings to 0. Initialize settings after doing all of the cfg checks.
  
  (closes issue #13942)
  Reported by: davidw
  Patches: 
        cdr_diff.txt uploaded by otherwiseguy (license 396)
  Tested by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 17:12:27 +00:00
Mark Michelson
44203a91d2 Merged revisions 158265-158266 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r158265 | mmichelson | 2008-11-20 19:14:20 -0600 (Thu, 20 Nov 2008) | 4 lines

Use some magic constants to get the right size
for this sscanf statement. Thanks Richard!


........
r158266 | mmichelson | 2008-11-20 19:22:18 -0600 (Thu, 20 Nov 2008) | 3 lines

Use a more expressive constant for a 64-bit scanned int


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 01:23:18 +00:00
Mark Michelson
28cf66edb8 Merged revisions 158262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r158262 | mmichelson | 2008-11-20 18:59:23 -0600 (Thu, 20 Nov 2008) | 6 lines

Fix the build for 32-bit systems. %lu is only 32-bits
on 32-bit systems, so we need to use %llu instead. Of course
%llu is 128-bits on 64-bit systems, so we have to cast to
unsigned long long. No harm, but it's sure annoying.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-21 01:00:24 +00:00
Mark Michelson
e2a40b6475 Merged revisions 158230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r158230 | mmichelson | 2008-11-20 17:12:50 -0600 (Thu, 20 Nov 2008) | 20 lines

Change the remote user agent session version variable
from an int to a uint64_t. This prevents potential comparison
problems from happening if the version string exceeds
INT_MAX. This was an apparent problem for one user who could
not properly place a call on hold since the version in the
SDP of the re-INVITE to place the call on hold greatly 
exceeded INT_MAX.

This also aligns with RFC 2327 better since it recommends
using an NTP timestamp for the version (which is a 
64-bit number).


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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 23:13:33 +00:00
Sean Bright
8bd5236b2f Merged revisions 158188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r158188 | seanbright | 2008-11-20 14:41:23 -0500 (Thu, 20 Nov 2008) | 10 lines
  
  Fix one case where the application argument was not converted from a pipe to
  a comma.  This was causing problems with switch statements with empty expressions.
  
  (closes issue #13901)
  Reported by: smurfix
  Patches:
        20081118_bug13901.diff uploaded by seanbright (license 71)
  Tested by: seanbright
  Reviewed by: murf
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 19:42:31 +00:00
Jason Parker
da39da3e8d Blocked revisions 158061 via svnmerge
........
  r158061 | qwell | 2008-11-20 11:37:05 -0600 (Thu, 20 Nov 2008) | 1 line
  
  Whitespace fix
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 17:38:01 +00:00
Kevin P. Fleming
ae3b28aa19 Merged revisions 157974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r157974 | kpfleming | 2008-11-19 18:08:12 -0600 (Wed, 19 Nov 2008) | 13 lines
  
  Merged revisions 157859 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r157859 | kpfleming | 2008-11-19 15:34:47 -0600 (Wed, 19 Nov 2008) | 7 lines
    
    the gcc optimizer frequently finds broken code (use of uninitalized variables, unreachable code, etc.), which is good. however, developers usually compile with the optimizer turned off, because if they need to debug the resulting code, optimized code makes that process very difficult. this means that we get code changes committed that weren't adequately checked over for these sorts of problems.
    
    with this build system change, if (and only if) --enable-dev-mode was used and DONT_OPTIMIZE is turned on, when a source file is compiled it will actually be preprocessed (into a .i or .ii file), then compiled once with optimization (with the result sent to /dev/null) and again without optimization (but only if the first compile succeeded, of course).
    
    while making these changes, i did some cleanup work in Makefile.rules to move commonly-used combinations of flag variables into their own variables, to make the file easier to read and maintain
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-20 00:12:32 +00:00
Kevin P. Fleming
a13f64ef20 Merged revisions 157743 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157743 | kpfleming | 2008-11-19 07:45:48 -0600 (Wed, 19 Nov 2008) | 1 line
  
  correct small bug introduced during API conversion
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-19 13:48:47 +00:00
Kevin P. Fleming
ac0c9bbc4d Merged revisions 157706 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157706 | kpfleming | 2008-11-19 06:42:19 -0600 (Wed, 19 Nov 2008) | 5 lines
  
  make some corrections to the ast_agi_register_multiple(), ast_agi_unregister_multiple() and ast_agi_fdprintf() API calls to be consistent with API guidelines
  
  also, move UPGRADE.txt to UPGRADE-1.6.txt and make the new UPGRADE.txt contain information about upgrading between Asterisk 1.6 releases
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-19 13:19:49 +00:00
Sean Bright
d974fbe6f7 Merged revisions 157600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157600 | seanbright | 2008-11-18 19:27:45 -0500 (Tue, 18 Nov 2008) | 10 lines
  
  Fix a few build problems on Solaris (and check for an md5 utility in
  configure instead of the icky loop I was doing before).
  
  (closes issue #13842)
  Reported by: snuffy
  Patches:
        bug13842_20081106.diff uploaded by snuffy (license 35)
        13842.diff uploaded by seanbright (license 71)
  Tested by: snuffy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-19 00:33:27 +00:00
Mark Michelson
46ac71b8b4 Merged revisions 157512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r157512 | mmichelson | 2008-11-18 16:54:08 -0600 (Tue, 18 Nov 2008) | 21 lines

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

........
r157503 | mmichelson | 2008-11-18 16:47:57 -0600 (Tue, 18 Nov 2008) | 13 lines

Add some missing invite state changes necessary in the sip_write
function. Not setting the invite state correctly on the call was
resulting in the Record application leaving empty files. I also
have updated the doxygen comment next to the declaration of the
INV_EARLY_MEDIA constant to reflect that we also use this state
when we *send* a 18X response to an INVITE.

(closes issue #13878)
Reported by: nahuelgreco
Patches:
      sip-early-media-recording-1.4.22.patch uploaded by nahuelgreco (license 162)
	  Tested by: putnopvut

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 22:59:59 +00:00
Mark Michelson
e402952070 Once again, Russell to the rescue. Use the builtin astobj1 lock
of the sip_peer and sip_user instead of adding a new one



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 22:15:31 +00:00
Mark Michelson
35ac1ad736 Merged revisions 157496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r157496 | mmichelson | 2008-11-18 15:59:24 -0600 (Tue, 18 Nov 2008) | 6 lines

Based on Russell's advice on the asterisk-dev list, I have
changed from using a global lock in update_call_counter to
using the locks within the sip_pvt and sip_peer structures
instead.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 22:11:11 +00:00
Mark Michelson
ddbacb4d33 Merged revisions 157427 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r157427 | mmichelson | 2008-11-18 14:23:58 -0600 (Tue, 18 Nov 2008) | 13 lines

* Add a lock to be used in the update_call_counter function.
* Revert logic to mirror 1.4's in the sense that it will not allow
  the call counter to dip below 0.

These two measures prevent potential races that could cause a SIP peer
to appear to be busy forever.

(closes issue #13668)
Reported by: mjc
Patches:
      hintfix_trunk_rev152649.patch uploaded by wolfelectronic (license 586)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 20:29:18 +00:00
Mark Michelson
35a7e1deca Merged revisions 157306 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r157306 | mmichelson | 2008-11-18 12:31:08 -0600 (Tue, 18 Nov 2008) | 20 lines

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

........
r157305 | mmichelson | 2008-11-18 12:25:55 -0600 (Tue, 18 Nov 2008) | 12 lines

Fix a crash in the end_bridge_callback of app_dial and
app_followme which would occur at the end of an attended
transfer. The error occurred because we initially stored
a pointer to an ast_channel which then was hung up due
to a masquerade.

This commit adds a "fixup" callback to the bridge_config
structure to allow for end_bridge_callback_data to be
changed in the case that a new channel pointer is needed
for the end_bridge_callback.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 18:32:18 +00:00
Steve Murphy
a3d874c414 Merged revisions 157302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r157302 | murf | 2008-11-18 11:07:55 -0700 (Tue, 18 Nov 2008) | 18 lines

(closes issue #13420)
Reported by: alex70
Patches:
      13420.13539.patch uploaded by murf (license 17)
Tested by: murf, awk

This fixes two problems: a spurious linefeed insertion
probably left over from pre-precomment times. Only
generated when category had no previous comments.

The other problem: Insertions could get the line-numbering
out of whack and generate negative line numbers, causing 
chunks of line numbers to be emitted, on the scale of the
number of lines up to that point in the file. In such cases,
abort the looping, and all is well.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-18 18:10:34 +00:00
Kevin P. Fleming
c1143180c2 Merged revisions 157164 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r157164 | kpfleming | 2008-11-15 20:45:19 +0100 (Sat, 15 Nov 2008) | 13 lines
  
  Merged revisions 157162-157163 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r157162 | kpfleming | 2008-11-15 20:24:24 +0100 (Sat, 15 Nov 2008) | 1 line
    
    dist-clean should remove dependency information files as well
  ........
    r157163 | kpfleming | 2008-11-15 20:31:03 +0100 (Sat, 15 Nov 2008) | 1 line
    
    when an individual directory dist-clean is run, run clean in that directory first, and when running top-level dist-clean, do not run subdirectory clean operations twice
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-15 19:47:36 +00:00
Kevin P. Fleming
ef2a405c4a Merged revisions 157105 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157105 | kpfleming | 2008-11-15 19:00:32 +0100 (Sat, 15 Nov 2008) | 13 lines
  
  major update to doxygen configuration file:
  
  1) update to doxygen 1.5.x style file, as used in trunk
  
  2) tell doxygen where are header files are, so include-file processing can be done
  
  3) make all macros that are used to define variables/functions be expanded, so that doxygen will properly document the resulting variable/function
  
  4) make all macros that are used to provide the contents of a variable (structure) be expanded, so that doxygen will be able to document the resulting fields
  
  5) suppress compiler attributes (__attribute__(xxx)) from being seen by doxygen, so it will properly match up function definition and usage (for an example of th effect of this, look at the doxygen docs for ast_log() from before and afte this commit)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@157107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-15 18:39:42 +00:00
Tilghman Lesher
ed02eca8fa Merged revisions 156911 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r156911 | tilghman | 2008-11-14 11:02:00 -0600 (Fri, 14 Nov 2008) | 4 lines
  
  Ping is missing the standard double-newline after the event.
  (closes issue #13903)
   Reported by: kebl0155
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 17:03:26 +00:00
Mark Michelson
4fbe80cc63 This is the 1.6.0 version of revision 156883 of trunk.
This is different in that it preserves the case-sensitiveness
of processing queues from configuration.

closes issue #13703



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 16:55:53 +00:00
Mark Michelson
bd31630ab0 Merged revisions 156817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156817 | mmichelson | 2008-11-14 09:20:03 -0600 (Fri, 14 Nov 2008) | 18 lines

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

........
r156816 | mmichelson | 2008-11-14 09:18:59 -0600 (Fri, 14 Nov 2008) | 10 lines

If the prompt to reenter a voicemail password timed out, it
resulted in the password not being saved, even if the input matched
what you gave when first prompted to enter a new password. This is
because the return value of ast_readstring was checked, but not checked
properly.

This bug was discovered by Jared Smith during an Asterisk training course.
Thanks for reporting it!


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-14 15:22:06 +00:00
Brandon Kruse
dbc2ed5e21 Update to Coding Guidelines
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-13 19:26:21 +00:00
Brandon Kruse
f077cc197d Merged revisions 156017 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r156017 | pari | 2008-11-11 17:02:43 -0600 (Tue, 11 Nov 2008) | 5 lines


 Patch by Ryan Brindley -- Make sure that manager refuses any duplicate 'new category' requests in updateconfig

(closes issue #13539)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-13 19:23:37 +00:00
Steve Murphy
6db3b2ff26 Merged revisions 156299 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156299 | murf | 2008-11-12 12:47:29 -0700 (Wed, 12 Nov 2008) | 26 lines

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

........
r156297 | murf | 2008-11-12 12:36:16 -0700 (Wed, 12 Nov 2008) | 18 lines

It turns out that the 0x0XX00 codes being returned for
N, X, and Z are off by one, as per conversation with
jsmith on #asterisk-dev;  he was teaching a class
and disconcerted that this published rule was not
being followed, with patterns _NXX, _[1-8]22 and
_[2-9]22... and NXX was winning, but [1-8] should
have been. 

This change, tested on these 3 patterns now 
picks the proper one.

However, this change may surprise users who
set up dialplans based on previous behavior,
which has been there for what, 2 and half 
years or so now.



........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 19:56:34 +00:00
Tilghman Lesher
71cc37f431 Merged revisions 156243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r156243 | tilghman | 2008-11-12 12:55:18 -0600 (Wed, 12 Nov 2008) | 18 lines
  
  Merged revisions 156229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156229 | tilghman | 2008-11-12 12:39:21 -0600 (Wed, 12 Nov 2008) | 11 lines
    
    Revert revision 132506, since it occasionally caused IAX2 HANGUP packets not
    to be sent, and instead, schedule a task to destroy the iax2 pvt structure
    10 seconds later.  This allows the IAX2 HANGUP packet to be queued,
    transmitted, and ACKed before the pvt is destroyed.
    (closes issue #13645)
     Reported by: dzajro
     Patches: 
           20081111__bug13645__3.diff.txt uploaded by Corydon76 (license 14)
     Tested by: vazir
     Reviewed: http://reviewboard.digium.com/r/51/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 18:57:06 +00:00
Mark Michelson
221444dd9c Merged revisions 156169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r156169 | mmichelson | 2008-11-12 11:41:56 -0600 (Wed, 12 Nov 2008) | 15 lines

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

........
r156167 | mmichelson | 2008-11-12 11:38:33 -0600 (Wed, 12 Nov 2008) | 7 lines

When doing some tests, I was having a crash at the end of every call
if an attended transfer occurred during the call. I traced the cause to
the CDR on one of the channels being NULL. murf suggested a check in
the end bridge callback to be sure the CDR is non-NULL before proceeding,
so that's what I'm adding.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-12 17:47:55 +00:00
Russell Bryant
62eefbec73 Don't blow up if we get NULL when trying to parse out the full name field
(fixed for Jared in the training room)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-11 21:28:57 +00:00
Michiel van Baak
1611c5af38 remove prop that shouldn't be here
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-11 20:04:32 +00:00
Tilghman Lesher
3e62b69b3c Merged revisions 155862 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r155862 | tilghman | 2008-11-10 15:12:28 -0600 (Mon, 10 Nov 2008) | 5 lines
  
  Make documentation of update method match documentation and update update2
  method to match.
  Reported by: atis, via -dev mailing list.
  Fixed by: me
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@156004 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-11 19:49:56 +00:00
Tilghman Lesher
57421957b6 Merged revisions 155804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r155803 | tilghman | 2008-11-10 14:49:59 -0600 (Mon, 10 Nov 2008) | 1 line
  
  I got tired of saying this in every single bugnote referring to this file.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-10 20:54:15 +00:00
Sean Bright
0591cc3029 Merged revisions 155554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r155554 | seanbright | 2008-11-08 20:27:00 -0500 (Sat, 08 Nov 2008) | 14 lines

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

........
r155553 | seanbright | 2008-11-08 20:08:07 -0500 (Sat, 08 Nov 2008) | 6 lines

Use static functions here instead of nested ones.  This requires a small
change to the ast_bridge_config struct as well.  To understand the reason
for this change, see the following post:

    http://gcc.gnu.org/ml/gcc-help/2008-11/msg00049.html

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-09 01:34:59 +00:00
Mark Michelson
ac9e7f492a Merged revisions 155467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r155467 | mmichelson | 2008-11-07 17:41:44 -0600 (Fri, 07 Nov 2008) | 12 lines

Set the invite state to INV_CANCELLED in a place that
makes more sense. Where it was set before, it was impossible
to actually delay sending a CANCEL if we had not yet received
a provisional response to an INVITE.

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-07 23:42:16 +00:00
Mark Michelson
e69fb8b298 Merged revisions 155360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r155360 | mmichelson | 2008-11-07 15:14:49 -0600 (Fri, 07 Nov 2008) | 8 lines

Remove one more instance of the sample configuration
lying about what's possible. The tz cannot be set in a
context like this. It can only be set in the general
section or per-mailbox.

Thanks to sasargen on #asterisk-dev for pointing this out


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-07 21:15:37 +00:00
Kevin P. Fleming
3577a3c7ca Merged revisions 155121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r155121 | kpfleming | 2008-11-06 16:49:19 -0600 (Thu, 06 Nov 2008) | 3 lines
  
  don't blindly assume that Darwin and Cygwin need GLOB_ABORTED defined; only define it if it is not already defined
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-06 22:50:27 +00:00
Mark Michelson
d5e144b150 Merged revisions 155012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r155012 | mmichelson | 2008-11-06 13:46:53 -0600 (Thu, 06 Nov 2008) | 16 lines

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

........
r155011 | mmichelson | 2008-11-06 13:45:52 -0600 (Thu, 06 Nov 2008) | 8 lines

The documentation listed the ability to set 'maxmsg' per
context. The truth is that you can only set this in the general section
or per mailbox. Thus I am updating the sample config file to be more
accurate.

Thanks to sasargen on IRC for bringing up this issue.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@155013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-06 19:47:45 +00:00
Tilghman Lesher
975b8d582e Recorded merge of revisions 154072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r154072 | tilghman | 2008-11-03 16:28:12 -0600 (Mon, 03 Nov 2008) | 12 lines
  
  Merged revisions 154066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154066 | tilghman | 2008-11-03 16:27:10 -0600 (Mon, 03 Nov 2008) | 5 lines
    
    Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk.
    (Closes issue #13829)
    Reported by: jaroth
    Patch by: me (modified jaroth's patch)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@154081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 22:30:13 +00:00
Tilghman Lesher
c8ebf2045a Merged revisions 154060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r154060 | tilghman | 2008-11-03 15:48:21 -0600 (Mon, 03 Nov 2008) | 3 lines
  
  Remove the potential for a division by zero error.
  (Closes issue #13810)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@154062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 22:04:01 +00:00
Kevin P. Fleming
090cd16d68 record revisions that were manually merged
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153746 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:53:10 +00:00
Kevin P. Fleming
ede179faec Merge revision 153709 from trunk
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines

instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.


------------------------------------------------------------------------



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:52:05 +00:00
Kevin P. Fleming
fa635ea4b0 port gcc 4.3.x warning fixes from trunk to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153743 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:39:04 +00:00
Terry Wilson
e23be17786 Merged revisions 153181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines
  
  Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten.  Added a callback function to handle setting variables, etc. from w/in the bridging code.  Calls back into a nested function within the function calling ast_bridge_call
  
  (closes issue #13793)
  Reported by: greenfieldtech
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@153265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 21:49:23 +00:00
Sean Bright
798db6fe3b Merged revisions 152993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152993 | seanbright | 2008-10-30 16:59:17 -0400 (Thu, 30 Oct 2008) | 10 lines

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

........
r152992 | seanbright | 2008-10-30 16:58:24 -0400 (Thu, 30 Oct 2008) | 2 lines

The -I argument to aclocal needs a space before the include directory name.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@152994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 21:00:13 +00:00
Kevin P. Fleming
3a6940fe60 Merged revisions 152812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152812 | kpfleming | 2008-10-30 11:54:29 -0500 (Thu, 30 Oct 2008) | 9 lines
  
  Merged revisions 152811 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152811 | kpfleming | 2008-10-30 11:53:48 -0500 (Thu, 30 Oct 2008) | 3 lines
    
    instead of comparing the string pointer to 0, let's compare the value that was actually parsed out of the string (found by sparse)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@152813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-30 16:54:54 +00:00