Commit Graph

3171 Commits

Author SHA1 Message Date
Joshua Colp
7080914d21 Merged revisions 192430 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192430 | file | 2009-05-05 14:46:51 -0300 (Tue, 05 May 2009) | 12 lines
  
  Merged revisions 192429 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192429 | file | 2009-05-05 14:43:30 -0300 (Tue, 05 May 2009) | 5 lines
    
    Fix a bug where the followme application would continue trying numbers after the caller hung up.
    
    (closes issue #13624)
    Reported by: sgenyuk
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192431 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-05 17:48:41 +00:00
Leif Madsen
cd1b968ec1 Commit the changes from rev 192094 in the 1.6.1 branch to the 1.6.0 branch.
Since the documentation system is different between <= 1.6.1 and >= 1.6.2
the changes to the documentation I made for issue 14801, I'm merging these
changes in manually. Additional changes will then be put into trunk and
merged down to 1.6.2 as those two versions share a similar documentation
system (XML).

(issue #14801)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-04 17:39:30 +00:00
Sean Bright
c87521c295 Fix a crash in app_queue with very long member lists.
A user reported via #asterisk that with very long lists of members, a crash
occurs in ast_strdupa, so just use a single buffer and ast_copy_string instead
of stack allocating copys of each interface name.

(Related to revision 191041 in branches/1.4)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@191424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-01 15:58:40 +00:00
Russell Bryant
e2b2d16176 Revert revision 190576 after out of band discussion with transnexus.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-29 07:37:04 +00:00
Mark Michelson
d8775d20f2 Merged revisions 190622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r190622 | mmichelson | 2009-04-27 11:26:14 -0500 (Mon, 27 Apr 2009) | 3 lines
  
  Update warning message to not have pipes and contain all options.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-27 16:27:09 +00:00
TransNexus OSP Development
ab344908be 1. Fixed the issue caused by network ID.
2. Fixed the issue caused by without certificate files.
3. Fixed the issue caused by number portability parameters in user part of RURI.
4. Updated for OSP Toolkit 3.5.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-27 06:14:17 +00:00
Terry Wilson
207333f4fd Merged revisions 189516 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189516 | twilson | 2009-04-20 16:29:29 -0500 (Mon, 20 Apr 2009) | 9 lines
  
  Merged revisions 189465 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189465 | twilson | 2009-04-20 16:10:27 -0500 (Mon, 20 Apr 2009) | 2 lines
    
    Update CDR appropriately when AST_CAUSE_NO_ANSWER is set
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-20 21:35:33 +00:00
Terry Wilson
4d71e7a511 Merged revisions 189495 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189495 | twilson | 2009-04-20 16:24:34 -0500 (Mon, 20 Apr 2009) | 9 lines
  
  Merged revisions 189463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r189463 | twilson | 2009-04-20 16:00:52 -0500 (Mon, 20 Apr 2009) | 2 lines
    
    Don't treat a NOANSWER like a CHANUNAVAIL
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-20 21:32:38 +00:00
Tilghman Lesher
5fad34cd42 Merged revisions 188774 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r188774 | tilghman | 2009-04-16 16:03:31 -0500 (Thu, 16 Apr 2009) | 11 lines
  
  Merged revisions 188773 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188773 | tilghman | 2009-04-16 16:02:29 -0500 (Thu, 16 Apr 2009) | 4 lines
    
    Umask should not be exported into global namespace.
    (closes issue #14912)
     Reported by: jcapp
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-16 21:04:53 +00:00
Mark Michelson
0e5b39e00c Merged revisions 188470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188470 | mmichelson | 2009-04-14 18:28:13 -0500 (Tue, 14 Apr 2009) | 3 lines
  
  Fix a couple of queue member reference leaks.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-14 23:28:39 +00:00
Mark Michelson
c8e4eab26d Merged revisions 188032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188032 | mmichelson | 2009-04-13 09:17:56 -0500 (Mon, 13 Apr 2009) | 6 lines
  
  Set all queue variables on both the caller and member channels.
  
  This allows for the variables to be accessed if a member macro is run.
  Thanks to Grigoriy Puzankin for bringing this up on the -dev list.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-13 14:20:14 +00:00
Tilghman Lesher
92b4eb8d40 Merged revisions 187363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r187363 | tilghman | 2009-04-09 11:39:43 -0500 (Thu, 09 Apr 2009) | 10 lines
  
  Merged revisions 187362 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r187362 | tilghman | 2009-04-09 11:38:37 -0500 (Thu, 09 Apr 2009) | 3 lines
    
    Permit zero-length text messages in SIP.
    (Related to an issue posted to the -users list, subject "AEL2, BASE64_DECODE and hexadecimal")
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-09 16:40:29 +00:00
Tilghman Lesher
cfe5f3e0fc Merged revisions 186799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186799 | tilghman | 2009-04-07 17:23:46 -0500 (Tue, 07 Apr 2009) | 10 lines
  
  Merged revisions 186775 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186775 | tilghman | 2009-04-07 17:16:50 -0500 (Tue, 07 Apr 2009) | 3 lines
    
    Fix Macro documentation to match current (and intended) behavior.
    (See -dev mailing list)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-07 22:30:27 +00:00
Tilghman Lesher
89c6baed8c Merged revisions 186444 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186444 | tilghman | 2009-04-03 14:30:34 -0500 (Fri, 03 Apr 2009) | 14 lines
  
  Merged revisions 186415 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186415 | tilghman | 2009-04-03 14:06:58 -0500 (Fri, 03 Apr 2009) | 7 lines
    
    Distinguish in a sent email between simple sends and forwards.
    (closes issue #11678)
     Reported by: jamessan
     Patches: 
           20090330__bug11678.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman, lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-03 19:58:21 +00:00
Mark Michelson
968ae201df Merged revisions 186286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186286 | mmichelson | 2009-04-03 09:32:05 -0500 (Fri, 03 Apr 2009) | 20 lines
  
  Fix the ability to retrieve voicemail messages from IMAP.
  
  A recent change made interactive vm_states no longer get
  added to the list of vm_states and instead get stored in
  thread-local storage.
  
  In trunk and all the 1.6.X branches, the problem is that
  when we search for messages in a voicemail box, we would
  attempt to update the appropriate vm_state struct by directly
  searching in the list of vm_states instead of using the
  get_vm_state_by_imap_user function. This meant we could not
  find the interactive vm_state that we wanted.
  
  (closes issue #14685)
  Reported by: BlargMaN
  Patches:
        14685.patch uploaded by mmichelson (license 60)
  Tested by: BlargMaN, qualleyiv, mmichelson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-03 14:32:37 +00:00
Mark Michelson
a64e0f70ea Merged revisions 185600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r185600 | mmichelson | 2009-03-31 17:02:48 -0500 (Tue, 31 Mar 2009) | 12 lines
  
  Merged revisions 185599 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r185599 | mmichelson | 2009-03-31 17:00:01 -0500 (Tue, 31 Mar 2009) | 6 lines
    
    Fix crash that would occur if an empty member was specified in queues.conf.
    
    (closes issue #14796)
    Reported by: pida
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@185601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-31 22:03:55 +00:00
Mark Michelson
a89b373c43 Merged revisions 185469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r185469 | mmichelson | 2009-03-31 14:46:18 -0500 (Tue, 31 Mar 2009) | 14 lines
  
  Merged revisions 185468 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r185468 | mmichelson | 2009-03-31 14:45:30 -0500 (Tue, 31 Mar 2009) | 8 lines
    
    Fix Russian voicemail intro to say the word "messages" properly.
    
    (closes issue #14736)
    Reported by: chappell
    Patches:
          voicemail_no_messages.diff uploaded by chappell (license 8)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@185470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-31 19:46:52 +00:00
Russell Bryant
cd84ad1fc0 Merged revisions 185261 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r185261 | russell | 2009-03-31 09:53:45 -0500 (Tue, 31 Mar 2009) | 5 lines

Don't free() an astobj2 object.

(closes issue #14672)
Reported by: makoto

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@185262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-31 14:56:27 +00:00
Mark Michelson
6ee6d5edac Merged revisions 185072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r185072 | mmichelson | 2009-03-30 11:26:48 -0500 (Mon, 30 Mar 2009) | 45 lines
  
  Merged revisions 185031 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r185031 | mmichelson | 2009-03-30 11:17:35 -0500 (Mon, 30 Mar 2009) | 39 lines
    
    Fix queue weight behavior so that calls in low-weight queues are not inappropriately blocked.
    
    (This is copied and pasted from the review request I made for this patch)
    
    Asterisk has some odd behavior when queue weights are used. The current logic used when
    potentially calling a queue member is:
    
    If the member we are going to call is part of another queue and _that other queue has any 
    callers in it_ and has a higher weight than the queue we are calling from, then don't try 
    to contact that member. The issue here is what I have marked with underscores. If the 
    higher-weighted queue has any callers in it at all, then the queue member will be unreachable 
    from the lower-weighted queue. This has the potential to be really really bad if using a 
    queue strategy, such as leastrecent or fewestcalls, with the potential to call the same 
    member repeatedly.
    
    The fix proposed by garychen on issue 13220 is very simple and, as far as I can see, works 
    well for this situation. With this set of changes, the logic used becomes:
    
    If the member we are going to call is part of another queue, the other queue has a higher 
    weight than the queue we are calling from, and the higher weight queue has at least as many 
    callers as available members, then do not try to contact the queue member. If the higher 
    weighted queue has fewer callers than available members, then there is no reason to deny 
    the call to this member since the other queue can afford to spare a member.
    
    Since the fix involved writing a generic function for determining the number of available 
    members in the queue, I also modified the is_our_turn function to make use of the new 
    num_available_members function to determine if it is our turn to try calling a member. There 
    is one small behavior change. Before writing this patch, if you had autofill disabled, then 
    if you were the head caller in a queue, you would automatically be told that it was your 
    turn to try calling a member. This did not take into account whether there were actually any 
    queue members available to take the call. Now we actually make sure there is at least one 
    member available to take the call if autofill is disabled.
    
    (closes issue #13220)
    Reported by: garychen
    
    Review: http://reviewboard.digium.com/r/202/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@185087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-30 16:40:26 +00:00
Russell Bryant
2b719265a4 Merged revisions 184843 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r184843 | russell | 2009-03-29 00:52:20 -0500 (Sun, 29 Mar 2009) | 13 lines

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

........
r184842 | russell | 2009-03-29 00:51:55 -0500 (Sun, 29 Mar 2009) | 5 lines

Ensure targs variable is fully initialized.

(closes issue #14758)
Reported by: tim_ringenbach

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-29 05:52:42 +00:00
Russell Bryant
73096f42bc Merged revisions 184726 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r184726 | russell | 2009-03-27 13:04:43 -0500 (Fri, 27 Mar 2009) | 2 lines

Use ast_random() instead of rand() to ensure we use the best RNG available.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-27 18:06:20 +00:00
David Vossel
56961c9df1 Merged revisions 184389 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184389 | dvossel | 2009-03-26 16:09:37 -0500 (Thu, 26 Mar 2009) | 14 lines
  
  Merged revisions 184388 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r184388 | dvossel | 2009-03-26 16:07:32 -0500 (Thu, 26 Mar 2009) | 8 lines
    
    pri loop TestClient/TestServer fails: server SEND DTMF 8
    
    app_test was failing when sending the last DTMF digit, 8, because of the 100ms pause issued after DTMF is sent.  During this pause the other side would hang up causing the test to look like it failed. Now the other side waits a second before hanging up.
    
    (closes issue #12442)
    Reported by: tzafrir
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-26 21:17:44 +00:00
Mark Michelson
ff9f868d0f Merged revisions 184079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184079 | mmichelson | 2009-03-24 17:40:39 -0500 (Tue, 24 Mar 2009) | 15 lines
  
  Merged revisions 184078 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r184078 | mmichelson | 2009-03-24 17:34:45 -0500 (Tue, 24 Mar 2009) | 9 lines
    
    Change NULL pointer check to be ast_strlen_zero.
    
    The 'digit' variable is guaranteed to be non-NULL, so the if
    statement could never evaluate true. Changing to ast_strlen_zero
    makes the logic correct.
    
    This was found while reviewing ast_channel_ao2 code review.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-24 22:41:37 +00:00
David Vossel
90b97eddc4 Merged revisions 183436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r183436 | dvossel | 2009-03-19 15:30:39 -0500 (Thu, 19 Mar 2009) | 13 lines
  
  Merged revisions 183386 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183386 | dvossel | 2009-03-19 14:40:07 -0500 (Thu, 19 Mar 2009) | 6 lines
    
    Cleaning up a few things in detect disconnect patch
    
    Initialized ast_call_feature in detect_disconnect to avoid accessing uninitialized memory.  Cleaned up /param tags in features.h.  No longer send dynamic features in ast_feature_detect. 
    
    issue #11583
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 20:32:20 +00:00
Mark Michelson
bce77e2674 Merged revisions 183244 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r183244 | mmichelson | 2009-03-19 13:10:34 -0500 (Thu, 19 Mar 2009) | 16 lines
  
  Fix a memory leak associated with queues.
  
  For every attempt that app_queue made to place an outbound call to a queue member,
  we would allocate a queue_end_bridge structure. When the bridge for the call had
  completed, we would free the structure. Unfortunately not all call attempts actually
  end up bridged to a member, so we need to be more selective of when to allocate
  the structure. With this change, the allocation occurs in an area where we can
  guarantee that the call will be bridged.
  
  (closes issue #14680)
  Reported by: caspy
  Patches:
        14680.patch uploaded by mmichelson (license 60)
  Tested by: caspy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 18:11:16 +00:00
David Vossel
9628d62ffa Merged revisions 183172 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r183172 | dvossel | 2009-03-19 11:28:33 -0500 (Thu, 19 Mar 2009) | 20 lines
  
  Merged revisions 183126 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183126 | dvossel | 2009-03-19 11:15:16 -0500 (Thu, 19 Mar 2009) | 17 lines
    
    Allow disconnect feature before a call is bridged
    
    feature.conf has a disconnect option.  By default this option is set to '*', but it could be anything.  If a user wishes to disconnect a call before the other side answers, only '*' will work, regardless if the disconnect option is set to something else.  This is because features are unavailable until bridging takes place.  The default disconnect option, '*', was hardcoded in app_dial, which doesn't make any sense from a user perspective since they may expect it to be something different.  This patch allows features to be detected from outside of the bridge, but not operated on.  In this case, the disconnect feature can be detected before briding and handled outside of features.c.
    
    (closes issue #11583)
    Reported by: sobomax
    Patches:
    	patch-apps__app_dial.c uploaded by sobomax (license 359)
    	11583.latest-patch uploaded by murf (license 17)
    	detect_disconnect.diff uploaded by dvossel (license 671)
    Tested by: sobomax, dvossel
    Review: http://reviewboard.digium.com/r/195/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 17:10:09 +00:00
Russell Bryant
e047ec4d72 Merged revisions 182847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r182847 | russell | 2009-03-17 21:28:55 -0500 (Tue, 17 Mar 2009) | 52 lines

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

........
r182810 | russell | 2009-03-17 21:09:13 -0500 (Tue, 17 Mar 2009) | 44 lines

Fix cases where the internal poll() was not being used when it needed to be.

We have seen a number of problems caused by poll() not working properly on 
Mac OSX.  If you search around, you'll find a number of references to using 
select() instead of poll() to work around these issues.  In Asterisk, we've 
had poll.c which implements poll() using select() internally.  However, we 
were still getting reports of problems.

vadim investigated a bit and realized that at least on his system, even 
though we were compiling in poll.o, the system poll() was still being used.  
So, the primary purpose of this patch is to ensure that we're using the 
internal poll() when we want it to be used.

The changes are:

1) Remove logic for when internal poll should be used from the Makefile.  
   Instead, put it in the configure script.  The logic in the configure 
   script is the same as it was in the Makefile.  Ideally, we would have 
   a functionality test for the problem, but that's not actually possible, 
   since we would have to be able to run an application on the _target_ 
   system to test poll() behavior.

2) Always include poll.o in the build, but it will be empty if AST_POLL_COMPAT
   is not defined.

3) Change uses of poll() throughout the source tree to ast_poll().  I feel 
   that it is good practice to give the API call a new name when we are 
   changing its behavior and not using the system version directly in all cases.
   So, normally, ast_poll() is just redefined to poll().  On systems where 
   AST_POLL_COMPAT is defined, ast_poll() is redefined to ast_internal_poll().

4) Change poll() in main/poll.c to be ast_internal_poll().

It's worth noting that any code that still uses poll() directly will work fine 
(if they worked fine before).  So, for example, out of tree modules that are 
using poll() will not stop working or anything.  However, for modules to work 
properly on Mac OSX, ast_poll() needs to be used.

(closes issue #13404)
Reported by: agalbraith
Tested by: russell, vadim

http://reviewboard.digium.com/r/198/

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@182945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-18 14:24:27 +00:00
Mark Michelson
00cfcfaa62 Merged revisions 182121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182121 | mmichelson | 2009-03-13 16:26:20 -0500 (Fri, 13 Mar 2009) | 6 lines
  
  Change faulty comparison used when announcing average hold minutes and seconds
  
  (closes issue #14227)
  Reported by: caspy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@182122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-13 21:26:47 +00:00
Mark Michelson
82d3dc386d Merged revisions 181846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181846 | mmichelson | 2009-03-12 16:43:51 -0500 (Thu, 12 Mar 2009) | 3 lines
  
  Run the macro on the queue member's channel when he answers, not the caller's channel.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-12 21:44:57 +00:00
Joshua Colp
41f3b9eb4a Merged revisions 181612 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181612 | file | 2009-03-12 10:24:12 -0300 (Thu, 12 Mar 2009) | 5 lines
  
  Fix crash when sleep and retries argument was not given to RetryDial application.
  
  (closes issue #14647)
  Reported by: sherpya
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-12 13:27:36 +00:00
Mark Michelson
a2985ff7c3 Merged revisions 180579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180579 | mmichelson | 2009-03-06 12:25:44 -0600 (Fri, 06 Mar 2009) | 9 lines
  
  Merged revisions 180567 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180567 | mmichelson | 2009-03-06 12:23:09 -0600 (Fri, 06 Mar 2009) | 2 lines
    
    Make compilation succeed in dev-mode when IMAP storage is enabled.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-06 18:26:28 +00:00
Mark Michelson
5d055cb8b2 Merged revisions 180465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180465 | mmichelson | 2009-03-05 17:26:58 -0600 (Thu, 05 Mar 2009) | 22 lines
  
  Merged revisions 180464 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180464 | mmichelson | 2009-03-05 17:26:11 -0600 (Thu, 05 Mar 2009) | 16 lines
    
    [IMAP] Fix message retrieval issues when identical mailbox names were defined in separate contexts.
    
    There was a fix put in a while back so that an X-Asterisk-VM-Context message header was
    added to stored IMAP voicemails. This would allow for us to differentiate if the same
    mailbox name was used in multiple contexts. The problem still left was that not all places
    where messages were retrieved actually attempted to use this header for information when
    retrieving messages. This commit fixes that so that MWI and message retrieval from VoiceMailMain
    work as expected.
    
    (closes issue #13853)
    Reported by: vicks1
    Patches:
          13853_v2.patch uploaded by mmichelson (license 60)
    Tested by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-05 23:28:01 +00:00
Mark Michelson
7810bed6b8 Merged revisions 180383 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180383 | mmichelson | 2009-03-05 13:14:14 -0600 (Thu, 05 Mar 2009) | 31 lines
  
  Merged revisions 180380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180380 | mmichelson | 2009-03-05 12:58:48 -0600 (Thu, 05 Mar 2009) | 25 lines
    
    Fix broken mailbox parsing when searchcontexts option is enabled.
    
    When using the searchcontexts option in voicemail.conf, the code
    made the assumption that all mailbox names defined were unique across
    all contexts. However, the code did nothing to actually enforce this
    assumption, nor did it do anything to alert a user that he may have
    created an ambiguity in his voicemail.conf file by defining the same
    mailbox name in multiple contexts.
    
    With this change, we now will issue a nice long warning if searchcontexts
    is on and we encounter the same mailbox name in multiple contexts and ignore
    any duplicates after the first box. Whether searchcontexts is enabled or not,
    if we come across a duplicate mailbox in the same context, then we will issue
    a warning and ignore the duplicated mailbox. I have also added a small note
    to voicemail.conf.sample in the explanation for searchcontexts explaining
    that you cannot define the same mailbox in multiple contexts if you have
    enabled the option.
    
    (closes issue #14599)
    Reported by: lmadsen
    Patches:
          14599.patch uploaded by mmichelson (license 60) (with slight modification)
    Tested by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-05 19:21:23 +00:00
Joshua Colp
0c8d1667b9 Merged revisions 180120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r180120 | file | 2009-03-04 10:39:28 -0400 (Wed, 04 Mar 2009) | 7 lines
  
  Remove duplicate 'k' and 'K' Dial options.
  
  (closes issue #14601)
  Reported by: alecdavis
  Patches:
        app_dial.optionk.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-04 14:40:12 +00:00
David Vossel
9cad0b7e22 Merged revisions 180032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r180032 | dvossel | 2009-03-03 17:21:18 -0600 (Tue, 03 Mar 2009) | 14 lines
  
  app_read does not break from prompt loop with user terminated empty string
  
  In app.c, ast_app_getdata is called to stream the prompts and receive DTMF input.  If ast_app_getdata() receives an empty string caused by the user inputing the end of string character, in this case '#', it should break from the prompt loop and return to app_read, but instead it cycles through all the prompts.  I've added a return value for this special case in ast_readstring() which uses an enum I've delcared in apps.h.  This enum is now used as a return value for ast_app_getdata().
  
  (closes issue #14279)
  Reported by: Marquis
  Patches:
  	fix_app_read.patch uploaded by Marquis (license 32)
  	read-ampersanmd.patch2 uploaded by dvossel (license 671)
  Tested by: Marquis, dvossel
  Review: http://reviewboard.digium.com/r/177/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-03 23:35:18 +00:00
Mark Michelson
d24e3e05bc Merged revisions 180007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180007 | mmichelson | 2009-03-03 16:49:07 -0600 (Tue, 03 Mar 2009) | 22 lines
  
  Merged revisions 180006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180006 | mmichelson | 2009-03-03 16:48:18 -0600 (Tue, 03 Mar 2009) | 17 lines
    
    Clarify some documentation of queues.conf.sample
    
    It had always been possible to explicitly specify a "blank"
    value for a sound file in queues.conf and have no sound played
    back. The problem with this is that it would result in some ugly
    CLI warnings from file.c.
    
    This commit introduces a check when playing a file in app_queue
    to see if the name of the file is zero-length and return early if
    that is the case. Also, the ability to specify the blank sound
    files in queues.conf is now mentioned more clearly in queues.conf.sample
    
    (closes issue #14227)
    Reported by: caspy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-03 22:49:32 +00:00
Mark Michelson
3cb51f0127 Fix a memory leak when updating a realtime member field.
This was discovered while looking at issue #14353



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-03 21:43:09 +00:00
Russell Bryant
49d2383e12 Merged revisions 179533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r179533 | russell | 2009-03-02 17:36:38 -0600 (Mon, 02 Mar 2009) | 48 lines

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

........
r179532 | russell | 2009-03-02 17:34:13 -0600 (Mon, 02 Mar 2009) | 40 lines

Move ast_waitfor() down to avoid the results of the API call becoming stale.

This call to ast_waitfor() was being done way too soon in this section of code.
Specifically, there was code in between the call to waitfor and the code that
uses the result that puts the channel in autoservice.  By putting the channel
in autoservice, the previous results of ast_waitfor() become meaningless,
as the autoservice thread will do it's own ast_waitfor() and ast_read()
on the channel.

So, when we came back out of autoservice and eventually hit the block of code
that calls ast_read() on the channel, there may not actually be any input on
the channel available.  Even though the previous call to ast_waitfor() in
app_meetme said there was input, the autoservice thread has since serviced
the channel for some period of time.

This bug manifested itself while dvossel was doing some testing of MeetMe in
Asterisk trunk.  He was using the timerfd timing module.  When the code hit
ast_read() erroneously, it determined that it must have been called because of
input on the timer fd, as chan->fdno was set to AST_TIMING_FD, since that was 
the cause of the last legitimate call to ast_read() done by autoservice.  

In this test, an IAX2 channel was calling into the MeetMe conference.  It was
_much_ more likely to be seen with an IAX2 channel because of the way audio
is handled.  Every audio frame that comes in results in a call to
ast_queue_frame(), which then uses ast_timer_enable_continuous() to notify
the channel thread that a frame is waiting to be handled.  So, the chances
of ast_waitfor() indicating that a channel needs servicing due to a timer
event on an IAX2 event is very high.

Finally, it is interesting to note that if a different timing interface was
being used, this bug would probably not be noticed.  When ast_read() is called
and erroneously thinks that there is a timer event to handle, it calls the
ast_timer_ack() function.  The pthread and dahdi timing modules handle the
ack() function being called when there is no event by simply ignoring it.
In the case of the timerfd module, it results in a read() on the timer fd
that will block forever, as there is no data to read.  This caused Asterisk
to lock up very quickly.

Thanks to dvossel and mmichelson for the fun debugging session.  :-)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-02 23:38:23 +00:00
Tilghman Lesher
33d3f5ab4f KeepAlive application no longer exists, so fix gosub implementation to not use it.
(closes issue #14571)
 Reported by: zktech
 Patches: 
       20090302__bug14571.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-02 17:58:20 +00:00
Mark Michelson
eb9e2f2c4e Add error checking when updating the "paused" field of a realtime queue member.
This code already existed in trunk and 1.6.1, but was not in 1.6.0 prior to
this commit.


(closes issue #14338)
Reported by: fiddur
Patches:
      14338.patch uploaded by mmichelson (license 60)
Tested by: fiddur



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@179222 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-01 22:07:09 +00:00
Terry Wilson
de2bbd8f13 Change include order to make compile on Centos 5 with DAHDI
If BIT_TYPES_DEFINED gets defined before linux/types.h is included, the
__s32 type doesn't get defined


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@178306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-24 18:05:03 +00:00
Dwayne M. Hubbard
e8073da399 Merged revisions 177699 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177699 | dhubbard | 2009-02-20 14:29:00 -0600 (Fri, 20 Feb 2009) | 9 lines
  
  Make app_fax compatible with spandsp-0.0.6pre4
  
  Prior to spandsp-0.0.6pre4 the t30_stats_t structure used a pages_transferred
  integer to indicate the number of pages transferred (so far) during the fax
  session.  The spandsp-0.0.6pre4 release removed the pages_transferred integer
  and replaced it with two different integers - pages_tx and pages_rx.  This
  revision uses the new integers for spandsp-0.0.6pre4 while maintaining backwards
  compatibility for previous spandsp releases.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 21:56:39 +00:00
Dwayne M. Hubbard
14bb8408db Merged revisions 148868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r148868 | tilghman | 2008-10-14 10:15:45 -0500 (Tue, 14 Oct 2008) | 6 lines
  
  API differences in spandsp 0.0.6pre1 and higher
  (closes issue #13688)
   Reported by: irroot
   Patches: 
         app_fax-span6.patch uploaded by irroot (license 52) with minor modifications by me
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 21:41:54 +00:00
Tilghman Lesher
36f41cee56 Merged revisions 177664 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177664 | tilghman | 2009-02-20 11:29:51 -0600 (Fri, 20 Feb 2009) | 8 lines
  
  Allow semicolons to be escaped, when passing arguments to the System command.
  (closes issue #14231)
   Reported by: jcovert
   Patches: 
         20090113__bug14231__2.diff.txt uploaded by Corydon76 (license 14)
         corrected_20090113__bug14231__2.diff.txt uploaded by jcovert (license 551)
   Tested by: jcovert
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 17:42:16 +00:00
Tilghman Lesher
b2cc0480ac Merged revisions 177661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177661 | tilghman | 2009-02-20 11:22:19 -0600 (Fri, 20 Feb 2009) | 2 lines
  
  Oops, merge broke trunk
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-20 17:27:20 +00:00
Tilghman Lesher
8b4c344ca7 Merged revisions 177537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r177537 | tilghman | 2009-02-19 16:33:00 -0600 (Thu, 19 Feb 2009) | 14 lines
  
  Merged revisions 177536 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r177536 | tilghman | 2009-02-19 16:26:01 -0600 (Thu, 19 Feb 2009) | 7 lines
    
    Fix up potential crashes, by reducing the sharing between interactive and non-interactive threads.
    (closes issue #14253)
     Reported by: Skavin
     Patches: 
           20090219__bug14253.diff.txt uploaded by Corydon76 (license 14)
     Tested by: Skavin
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-19 22:34:37 +00:00
Joshua Colp
d82a4d919c Merged revisions 177384 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r177384 | file | 2009-02-19 12:38:41 -0400 (Thu, 19 Feb 2009) | 10 lines
  
  Merged revisions 177383 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r177383 | file | 2009-02-19 12:37:25 -0400 (Thu, 19 Feb 2009) | 3 lines
    
    If we are able to create a speech structure unset the ERROR variable in case it was previously set.
    (issue #LUMENVOX-13)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-19 16:39:28 +00:00
Russell Bryant
ffa0eaebef Merged revisions 177101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r177101 | russell | 2009-02-18 13:12:49 -0600 (Wed, 18 Feb 2009) | 8 lines

Re-add 'o' option to MeetMe, reverting rev 62297.

Enabling this option by default proved to be a bad idea, as the talker detection
is not very reliable.  So, make it optional again, and off by default.

(issue #13801)
Reported by: justdave

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@177135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-18 19:25:03 +00:00
Mark Michelson
d504f89a9d Merged revisions 176253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r176253 | mmichelson | 2009-02-16 15:40:40 -0600 (Mon, 16 Feb 2009) | 24 lines
  
  Merged revisions 176249,176252 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r176249 | mmichelson | 2009-02-16 15:34:27 -0600 (Mon, 16 Feb 2009) | 14 lines
    
    Open the DAHDI pseudo device and set it to be nonblocking atomically
    
    Apparently on FreeBSD, attempting to set the O_NONBLOCKING flag separately
    from opening the file was causing an "inappropriate ioctl for device" error.
    While I cannot fathom why this would be happening, I certainly am not opposed
    to making the code a bit more compact/efficient if it also fixes a bug.
    
    (closes issue #14482)
    Reported by: ys
    Patches:
          meetme.patch uploaded by ys (license 281)
    Tested by: ys
  ........
    r176252 | mmichelson | 2009-02-16 15:39:21 -0600 (Mon, 16 Feb 2009) | 3 lines
    
    Remove unused variable and make dev-mode compilation happy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@176256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-16 21:47:11 +00:00
Joshua Colp
496e168b87 Merged revisions 175549 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r175549 | file | 2009-02-13 12:41:15 -0400 (Fri, 13 Feb 2009) | 4 lines
  
  Add an option to keep the recorded file upon hangup.
  (closes issue #14341)
  Reported by: fnordian
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@175550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-13 16:43:13 +00:00