Commit Graph

570 Commits

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

................
r163081 | mmichelson | 2008-12-11 10:33:16 -0600 (Thu, 11 Dec 2008) | 22 lines

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

........
r163080 | mmichelson | 2008-12-11 10:24:43 -0600 (Thu, 11 Dec 2008) | 14 lines

Fix a potential crash due to unsafe datastore handling.

This patch also contains a conversion from using long to time_t
for representing times for a queue, as well as some whitespace
fixes.

(closes issue #14060)
Reported by: nivek
Patches:
      datastore_fixup.patch.corrected uploaded by nivek (license 636)
	  with slight modification from me
Tested by: nivek


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@163082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-11 16:40:46 +00:00
Mark Michelson
3d5b168cbc Merged revisions 160626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

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

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

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

(closes issue #13548)
Reported by: fiddur


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 18:41:28 +00:00
Mark Michelson
f2168e3a67 Merged revisions 160555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

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

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

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


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-03 17:09:27 +00:00
Tilghman Lesher
b0bad74445 Merged revisions 152216,152287,152369,152467,152569,152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152216 | tilghman | 2008-10-27 16:34:04 -0500 (Mon, 27 Oct 2008) | 13 lines
  
  Merged revisions 152215 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
    
    Inherit ALL elements of CallerID across a local channel.
    (closes issue #13368)
     Reported by: Peter Schlaile
     Patches: 
           20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
  ........
................
  r152287 | jpeeler | 2008-10-27 18:31:39 -0500 (Mon, 27 Oct 2008) | 10 lines
  
  Merged revisions 152286 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152286 | jpeeler | 2008-10-27 18:28:49 -0500 (Mon, 27 Oct 2008) | 2 lines
  
  Buffer policy setting for half is not needed.
  
  ........
................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................
  r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
  
  Merged revisions 152463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
    
    Quoting in the wrong direction
    (Fixes AST-107)
  ........
................
  r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines
  
  Merged revisions 152539 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines
  
  Fix an incorrect usage of sizeof()
  
  (closes issue #13795)
  Reported by: andrew53
  Patches:
  	chan_sip_sizeof.patch uploaded by andrew53 (license 519)
  
  ........
................
  r152605 | murf | 2008-10-29 00:47:13 -0500 (Wed, 29 Oct 2008) | 22 lines
  
  Merged revisions 152538 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines
  
  A little documentation cross-ref between features and
  dial and queue... I wasted some time (stupidly) trying
  to get the one-touch parking stuff working, because it
  didn't occur to me that I had to also have the corresponding
  options in the dial command! Duh! (In all this time, I never
  set this up before!)
  So, to keep some poor fool from suffering the same fate,
  I made the features.conf.sample file mention the corresponding
  opts in dial/queue; and the docs for dial/app specifically
  mention the corresponding decls in the feature.conf file.
  
  I hope this doesn't spoil some vast, eternal plan...
  
  
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 22:19:37 +00:00
Tilghman Lesher
8411899d44 Merged revisions 147518,147689,148000,148112,148268,148917,148988,149062,149131,149201,149205,149208 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r147518 | file | 2008-10-08 09:53:51 -0500 (Wed, 08 Oct 2008) | 9 lines
  
  Merged revisions 147517 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r147517 | file | 2008-10-08 11:51:42 -0300 (Wed, 08 Oct 2008) | 2 lines
    
    If we receive DTMF make sure that the state of the speech structure goes back to being not ready. (issue #LUMENVOX-8)
  ........
................
  r147689 | kpfleming | 2008-10-08 17:26:55 -0500 (Wed, 08 Oct 2008) | 9 lines
  
  Merged revisions 147681 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r147681 | kpfleming | 2008-10-08 17:22:09 -0500 (Wed, 08 Oct 2008) | 3 lines
    
    when parsing a text configuration option, ensure that the buffer on the stack is actually large enough to hold the legal values of that option, and also ensure that sscanf() knows to stop parsing if it would overrun the buffer (without these changes, specifying "buffers=...,immediate" would overflow the buffer on the stack, and could not have worked as expected)
  ........
................
  r148000 | tilghman | 2008-10-09 14:39:34 -0500 (Thu, 09 Oct 2008) | 11 lines
  
  Merged revisions 147997 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r147997 | tilghman | 2008-10-09 14:38:33 -0500 (Thu, 09 Oct 2008) | 4 lines
    
    When blank, callerid name and number should display "unknown caller" in voicemail
    emails.
    (Closes issue #13643)
  ........
................
  r148112 | mmichelson | 2008-10-09 18:15:33 -0500 (Thu, 09 Oct 2008) | 26 lines
  
  Merged revisions 146026 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r146026 | murf | 2008-10-03 12:12:54 -0500 (Fri, 03 Oct 2008) | 18 lines
  
  (closes issue #13579)
  Reported by: dwagner
  
  (closes issue #13584)
  Reported by: dwagner
  Tested by: murf, putnopvut
  
  The thought occurred to me that the res= from the extension spawn
  was ending up being returned from the bridge.
  
  "Thou shalt not poison the return value". Made the change
  and it appears to allow blind xfers to work as normal.
  
  If I'm wrong, reopen the bugs. But it looks good to me!
  
  Many thanks to putnopvut for helping me reproduce this!
  
  
  ........
................
  r148268 | tilghman | 2008-10-10 11:31:31 -0500 (Fri, 10 Oct 2008) | 14 lines
  
  Merged revisions 148257 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148257 | tilghman | 2008-10-10 11:25:31 -0500 (Fri, 10 Oct 2008) | 7 lines
    
    User not notified of temporary greeting, if ODBC storage is in use.
    (closes issue #13659)
     Reported by: moliveras
     Patches: 
           20081009__bug13659.diff.txt uploaded by Corydon76 (license 14)
     Tested by: moliveras
  ........
................
  r148917 | tilghman | 2008-10-14 12:46:48 -0500 (Tue, 14 Oct 2008) | 11 lines
  
  Merged revisions 148916 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148916 | tilghman | 2008-10-14 12:41:08 -0500 (Tue, 14 Oct 2008) | 4 lines
    
    Ensure that mail headers are 7-bit clean, even when UTF-8 characters are used
    in headers like 'Subject' and 'To'.
    Closes AST-107.
  ........
................
  r148988 | tilghman | 2008-10-14 14:03:44 -0500 (Tue, 14 Oct 2008) | 9 lines
  
  Merged revisions 148987 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148987 | tilghman | 2008-10-14 14:03:08 -0500 (Tue, 14 Oct 2008) | 2 lines
    
    Some compilers warn, some don't.  Fixing.
  ........
................
  r149062 | tilghman | 2008-10-14 15:16:48 -0500 (Tue, 14 Oct 2008) | 13 lines
  
  Merged revisions 149061 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r149061 | tilghman | 2008-10-14 15:09:06 -0500 (Tue, 14 Oct 2008) | 6 lines
    
    Check correct values in the return of ast_waitfor(); also, get rid of a
    possible memory leak.
    (closes issue #13658)
     Reported by: explidous
     Patch by: me
  ........
................
  r149131 | mmichelson | 2008-10-14 16:08:48 -0500 (Tue, 14 Oct 2008) | 15 lines
  
  Merged revisions 149130 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r149130 | mmichelson | 2008-10-14 15:49:02 -0500 (Tue, 14 Oct 2008) | 7 lines
  
  Don't allow reserved characters to be used in register
  lines in sip.conf.
  
  (closes issue #13570)
  Reported by: putnopvut
  
  
  ........
................
  r149201 | mmichelson | 2008-10-14 17:41:13 -0500 (Tue, 14 Oct 2008) | 20 lines
  
  Merged revisions 149200 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r149200 | mmichelson | 2008-10-14 17:40:42 -0500 (Tue, 14 Oct 2008) | 12 lines
  
  Update the queue with the correct number of calls and
  whether the call was completed within the service level
  when a transfer takes place. This way, we do not "break"
  the leastrecent and fewestcalls strategies by not logging
  a call until after the transferred call has ended.
  
  (closes issue #13395)
  Reported by: Marquis
  Patches:
        app_queue.c.transfer.patch uploaded by Marquis (license 32)
  
  
  ........
................
  r149205 | mmichelson | 2008-10-14 18:04:44 -0500 (Tue, 14 Oct 2008) | 20 lines
  
  Merged revisions 149204 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r149204 | mmichelson | 2008-10-14 18:00:01 -0500 (Tue, 14 Oct 2008) | 12 lines
  
  Add a tolerance period for sync-triggered audiohooks
  so that if packetization of audio is close (but not equal)
  we don't end up flushing the audiohooks over small
  inconsistencies in synchronization.
  
  Related to issue #13005, and solves the issue
  for most people who were experiencing the problem.
  However, a small number of people are still experiencing
  the problem on long calls, so I am not closing
  the issue yet
  
  
  ........
................
  r149208 | mmichelson | 2008-10-14 18:15:04 -0500 (Tue, 14 Oct 2008) | 17 lines
  
  Merged revisions 149207 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r149207 | mmichelson | 2008-10-14 18:10:26 -0500 (Tue, 14 Oct 2008) | 9 lines
  
  Call register_peer_exten even in the case that the peer's
  IP/port does not change.
  
  (closes issue #13309)
  Reported by: dimas
  Patches:
        v2-13309.patch uploaded by dimas (license 88)
  
  
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-02 22:16:32 +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
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
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
Terry Wilson
969bef1dea Small modification to putnopvut's patch to fix this issue. Thanks for all the help, putnopvut!
(closes issue #12884)
	Reported by: bcnit
	Patches: 
	      12884v4-1.6.0-branch.patch uploaded by otherwiseguy (license 396)
	Tested by: otherwiseguy


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@152644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:13:22 +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
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
dc4224c694 Merged revisions 140975 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140975 | mmichelson | 2008-09-03 15:16:12 -0500 (Wed, 03 Sep 2008) | 4 lines

Fix some locking order issues in app_queue. This was
brought up by atis on IRC a while ago.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 20:18:14 +00:00
Mark Michelson
ac72baa7b5 Merged revisions 138687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r138687 | mmichelson | 2008-08-18 15:04:10 -0500 (Mon, 18 Aug 2008) | 18 lines

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

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@138688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-18 20:05:09 +00:00
Tilghman Lesher
f67e68de8e Merged revisions 136489 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r136489 | tilghman | 2008-08-07 11:55:57 -0500 (Thu, 07 Aug 2008) | 15 lines

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

........
r136488 | tilghman | 2008-08-07 11:50:47 -0500 (Thu, 07 Aug 2008) | 7 lines

Update persistent state on all exit conditions.
(closes issue #12916)
 Reported by: sgenyuk
 Patches: 
       app_queue.patch.txt uploaded by neutrino88 (license 297)
 Tested by: sgenyuk, aragon

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@136490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-07 16:57:53 +00:00
Mark Michelson
a97827b540 Merged revisions 134759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134759 | mmichelson | 2008-07-31 11:05:12 -0500 (Thu, 31 Jul 2008) | 24 lines

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

........
r134758 | mmichelson | 2008-07-31 10:56:18 -0500 (Thu, 31 Jul 2008) | 16 lines

Add more timeout checks into app_queue, specifically
targeting areas where an unknown and potentially
long time has just elapsed. Also added a check
to try_calling() to return early if the timeout
has elapsed instead of potentially setting a negative
timeout for the call (thus making it have *no* timeout
at all).


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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:07:14 +00:00
Mark Michelson
8feaba9ab0 Merged revisions 134598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134598 | mmichelson | 2008-07-30 16:05:37 -0500 (Wed, 30 Jul 2008) | 15 lines

Merged revisions 134556 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r134556 | mmichelson | 2008-07-30 15:24:40 -0500 (Wed, 30 Jul 2008) | 7 lines

Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:06:12 +00:00
Tilghman Lesher
232ab001d2 Merged revisions 134483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134483 | tilghman | 2008-07-30 14:17:38 -0500 (Wed, 30 Jul 2008) | 4 lines

Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:18:12 +00:00
Mark Michelson
8d78d518bf Merged revisions 131375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131375 | mmichelson | 2008-07-16 15:24:12 -0500 (Wed, 16 Jul 2008) | 22 lines

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

........
r131369 | mmichelson | 2008-07-16 15:23:02 -0500 (Wed, 16 Jul 2008) | 14 lines

Move the init_queue call back to where it used to be (changed
Sept 12 last year). It was moved then to prevent a memory leak.
Since then, the same memory leak recurred and was fixed in a 
better way.

Now it has been found that the placement of this init_queue
call can cause problems if a realtime queue has values changed
to an empty string. The problem is that the default value
for that queue parameter would not be set.

(closes issue #13084)
Reported by: elbriga


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 20:24:56 +00:00
Mark Michelson
fb892b269d Merged revisions 131358 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131358 | mmichelson | 2008-07-16 14:37:42 -0500 (Wed, 16 Jul 2008) | 14 lines

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

........
r131357 | mmichelson | 2008-07-16 14:37:08 -0500 (Wed, 16 Jul 2008) | 6 lines

Apparently, "thread safety" is important, whatever
that means. :P

(Thanks Russell!)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 19:39:05 +00:00
Mark Michelson
58a8d7c521 Merged revisions 131300 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r131300 | mmichelson | 2008-07-16 13:59:27 -0500 (Wed, 16 Jul 2008) | 21 lines

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

........
r131299 | mmichelson | 2008-07-16 13:57:34 -0500 (Wed, 16 Jul 2008) | 13 lines

Make absolutely certain that the transfer datastore
is removed from the calling channel once the caller
is finished in the queue. This could have weird con-
sequences when dialing local queue members when multiple
transfers occur on a single call.

Also fixed a memory leak that would occur when an
attended transfer occurred from a queue member.

(closes issue #13047)
Reported by: festr


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@131301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-16 18:59:59 +00:00
Steve Murphy
e45d4f3bf1 Merged revisions 130145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

Merging this rev from trunk to 1.6.0 was not
simple. Why? Because we've enhanced trunk to
do a [fast] merge-and-delete operation which 
also solved problems with contexts having 
entries from different registrars.
Fast as in the amount of time the contexts
are locked down. That *is* fast, but traversing
the entire dialplan looking for priorities to
delete takes more time overall.
This particular fix involved pulling in those
enhancements from trunk, along with all the
various fixes and refinements made along the
way.

Merging all this from trunk into 1.6 involved:
a. mergetrunk6 in the stuff from 130145;
b. revert all but the prop changes
c. catalog all revisions to pbx.c since 1.6.0 was forked
   (at rev 105596).
d. catalog all revisions to pbx.c in trunk since 1.6.0
   was forked, making special note of all revs that
   were not merged into 1.6.0.
e. study each rev in trunk not applied to 1.6.0, and
   determine if it was involved in the merge_and_delete
   enhancements in trunk. 25 commits were done in 1.6.0,
   all but one (106306) was a merge from trunk.
   Trunk had 22 additional changes, of which 7 were
   involved in the merge_and_delete enhancements:
    106757
    108894
    109169
    116461
    123358
    130145
    130297
f. Go to trunk and collect patches, one by one,
   of the changes made by each rev across the
   entire source tree, using svn diff -c <num> > pfile
g. Apply each patch in order to 1.6.0, and 
   resolve all failures and compilation problems
   before proceding to the next patch.
h. test the stuff.
i. profit!


........
r130145 | murf | 2008-07-11 12:24:31 -0600 (Fri, 11 Jul 2008) | 40 lines

(closes issue #13041)
Reported by: eliel
Tested by: murf

(closes issue #12960)
Reported by: mnicholson

In this 'omnibus' fix, I **think** I solved both
the problem in 13041, where unloading pbx_ael.so
caused crashes, or incomplete removal of previous
registrar'ed entries. And I added code to completely
remove all includes, switches, and ignorepats that
had a matching registrar entry, which should
appease 12960.

I also added a lot of seemingly useless brackets
around single statement if's, which helped debug 
so much that I'm leaving them there.

I added a routine to check the correlation between
the extension tree lists and the hashtab 
tables. It can be amazingly helpful when you have
lots of dialplan stuff, and need to narrow
down where a problem is occurring. It's ifdef'd
out by default.

I cleaned up the code around the new CIDmatch code.
It was leaving hanging extens with bad ptrs, getting confused
over which objects to remove, etc. I tightened
up the code and changed the call to remove_exten
in the merge_and_delete code.

I added more conditions to check for empty context
worthy of deletion. It's not empty if there are
any includes, switches, or ignorepats present.

If I've missed anything, please re-open this bug,
and be prepared to supply example dialplan code.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-15 13:14:07 +00:00
Brett Bryant
f6f918d6a6 Merged revisions 129684 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r129684 | bbryant | 2008-07-10 14:13:12 -0500 (Thu, 10 Jul 2008) | 8 lines

Fixes a bug where the interface for a queue member gets reloaded as the state_interface, if a state_interface was set, on reload because the 
state_interface isn't stored in the ast_db.

(closes issue #13043)
Reported by: jvandal
Patches:
      app_queue.patch uploaded by jvandal (license 413)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@129685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-10 19:14:24 +00:00
Mark Michelson
64174167cb Port revisions 124661 and 123650 from trunk to 1.6.0
Thanks to Atis Lezdins for pointing this out on the asterisk-dev
mailing list



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 21:00:47 +00:00
Mark Michelson
1fbfd723e8 Merged revisions 125855 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125855 | mmichelson | 2008-06-27 11:16:13 -0500 (Fri, 27 Jun 2008) | 5 lines

Ensure the thread-safety of the monexec variable in app_queue.

Thanks to Russell for pointing out the problem


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:19:16 +00:00
Mark Michelson
a8979176c1 SENTINEL is not defined in 1.6.0
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 01:09:04 +00:00
Mark Michelson
b43587a16e Merged revisions 125666 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125666 | mmichelson | 2008-06-26 19:22:03 -0500 (Thu, 26 Jun 2008) | 3 lines

Make this compile with dev-mode on


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:22:23 +00:00
Mark Michelson
6250e77c59 Merged revisions 125649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125649 | mmichelson | 2008-06-26 19:15:54 -0500 (Thu, 26 Jun 2008) | 15 lines

The monitor-join option for queues was deprecated in favor of using
MixMonitor to mix audio. However, it was pointed out to me that because
of this, the command set for the MONITOR_EXEC variable is ignored as well.
This means that people can't do their own custom mixing commands at the end
of recordings in order to make, for instance, stereo recordings of calls.

With this patch, app_queue will set the "joinfiles" variable for the channel's
monitor if MONITOR_EXEC is not zero-length. This means that for normal audio
mixing, MixMonitor is still the preferred choice, but we allow custom
mixing to be done with the two Monitor streams if desired.

(closes issue #12923)
Reported by: snyfer


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:17:39 +00:00
Mark Michelson
74e07ac0aa Merged revisions 125591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125591 | mmichelson | 2008-06-26 18:06:18 -0500 (Thu, 26 Jun 2008) | 3 lines

Fix a really stupid mistake


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:06:47 +00:00
Mark Michelson
9152577c24 Merged revisions 125586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125586 | mmichelson | 2008-06-26 18:01:02 -0500 (Thu, 26 Jun 2008) | 19 lines

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

........
r125585 | mmichelson | 2008-06-26 17:52:39 -0500 (Thu, 26 Jun 2008) | 11 lines

Add the interface of a queue member to the output of the "queue show" command
so that it can easily be associated with a queue member's name. This helps
so that the appropriate queue member can be removed or paused since the 
interface is required, not the member's name.

(closes issue #12783)
Reported by: davevg
Patches:
      app_queue.diff uploaded by davevg (license 209) with small mod from me


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:04:12 +00:00
Mark Michelson
6d89f9ac86 Merged revisions 125531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125531 | mmichelson | 2008-06-26 17:03:54 -0500 (Thu, 26 Jun 2008) | 17 lines

Blocked revisions 125530 via svnmerge

........
r125530 | mmichelson | 2008-06-26 17:02:55 -0500 (Thu, 26 Jun 2008) | 10 lines

Backport of attended transfer queue_log patch from trunk.

This patch allows for attended transfers to be logged in the
queue_log the same way that blind transfers have always been.

It was decided by popular opinion on the asterisk-dev mailing
list that this should be backported to 1.4. Thanks to everyone
who gave an opinion.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 22:06:20 +00:00
Mark Michelson
3f71d4600e Merged revisions 125477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125477 | mmichelson | 2008-06-26 15:57:41 -0500 (Thu, 26 Jun 2008) | 19 lines

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

........
r125476 | mmichelson | 2008-06-26 15:56:01 -0500 (Thu, 26 Jun 2008) | 11 lines

Prior to this patch, the "queue show" command used cached
information for realtime queues instead of giving up-to-date
info. Now realtime is queried for the latest and greatest in
queue info.

(closes issue #12858)
Reported by: bcnit
Patches:
      queue_show.patch uploaded by putnopvut (license 60)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 20:58:48 +00:00
Mark Michelson
c0c3e2cde9 Merged revisions 123652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r123652 | mmichelson | 2008-06-18 10:08:56 -0500 (Wed, 18 Jun 2008) | 7 lines

A portion of the code which handled the 'c' queue option had been
removed. No telling when it happened. Anyway, it's back in now
and works properly.

(Based on issue reported on mailing list)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-18 15:09:19 +00:00
Jeff Peeler
f089bbf663 Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-17 18:08:09 +00:00
Mark Michelson
8c4f56f424 Merged revisions 123275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r123275 | mmichelson | 2008-06-17 10:57:43 -0500 (Tue, 17 Jun 2008) | 20 lines

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

........
r123274 | mmichelson | 2008-06-17 10:56:55 -0500 (Tue, 17 Jun 2008) | 12 lines

davidw pointed out that the holdtime calculation used by
app_queue does not use "boxcar" filtering as the comments
say. The term "boxcar" means that the number of samples used
to calculate stays constant, with new samples replacing the
oldest ones. The queue holdtime calculation uses all holdtime
samples collected since the queue was loaded, so the comment
has been changed to be accurate.

(closes issue #12781)
Reported by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123276 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-17 15:58:21 +00:00
Steve Murphy
3a1b062a16 Merged revisions 123165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r123165 | murf | 2008-06-16 14:43:46 -0600 (Mon, 16 Jun 2008) | 19 lines

(closes issue #12689)
Reported by: ys

Many thanks to ys for doing the research on this problem.
I didn't think it would be best to unlock the contexts
and then relock them after the remove_extension2() call,
so I added an extra arg to remove_extension2() and set it
appropriately in each call. There were not that many.

I considered forcing the code to lock the contexts before
the call to remove_extension2(), but that would require
a slightly greater degree of changes, especially since
the find_context_locked is local to pbx.c

I did a simple sanity test to make sure the code doesn't
mess things up in general.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@123173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-16 21:19:23 +00:00
Mark Michelson
d8873c2856 Merged revisions 122312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r122312 | mmichelson | 2008-06-12 13:53:17 -0500 (Thu, 12 Jun 2008) | 17 lines

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

........
r122311 | mmichelson | 2008-06-12 13:50:58 -0500 (Thu, 12 Jun 2008) | 9 lines

Properly play a holdtime message if the announce-holdtime option is
set to "once."

(closes issue #12842)
Reported by: ramonpeek
Patches:
      patch001.diff uploaded by ramonpeek (license 266)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@122313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-12 18:54:01 +00:00
Mark Michelson
a067ee471a Merged revisions 120514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r120514 | mmichelson | 2008-06-04 17:07:37 -0500 (Wed, 04 Jun 2008) | 14 lines

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

........
r120513 | mmichelson | 2008-06-04 17:05:33 -0500 (Wed, 04 Jun 2008) | 6 lines

Make sure that the string we set will survive the unref of
the queue member.

Thanks to Russell, who pointed this out.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-04 22:08:09 +00:00
Mark Michelson
d192aa7cca Merged revisions 120286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r120286 | mmichelson | 2008-06-04 09:12:45 -0500 (Wed, 04 Jun 2008) | 15 lines

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

........
r120285 | mmichelson | 2008-06-04 09:11:12 -0500 (Wed, 04 Jun 2008) | 7 lines

Tab completion when removing a member should give the member's interface,
not the name, since the interface is what is expected for the command.

(closes issue #12783)
Reported by: davevg


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-04 14:13:23 +00:00
Tilghman Lesher
1db927c186 Merged revisions 119419 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r119419 | tilghman | 2008-05-30 16:23:14 -0500 (Fri, 30 May 2008) | 14 lines

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

........
r119404 | tilghman | 2008-05-30 16:17:45 -0500 (Fri, 30 May 2008) | 6 lines

When joinempty=strict, it only failed on join if there were busy members.  If
all members were logged out OR paused, then it (incorrectly) let callers join
the queue.
(closes issue #12451)
 Reported by: davidw

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@119420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-30 21:24:01 +00:00
Jason Parker
fc07d2e1b7 Merged revisions 115705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r115705 | qwell | 2008-05-12 11:35:50 -0500 (Mon, 12 May 2008) | 1 line

Correctly document state interface for AddQueueMember.  Discovered while looking at issue #12626.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-12 16:36:24 +00:00
Mark Michelson
cb62c9cba8 Merged revisions 115321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r115321 | mmichelson | 2008-05-05 16:43:21 -0500 (Mon, 05 May 2008) | 21 lines

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

........
r115320 | mmichelson | 2008-05-05 16:41:34 -0500 (Mon, 05 May 2008) | 13 lines

Don't consider a caller "handled" until the caller is bridged with
a queue member. There was too much of an opportunity for the member
to hang up (either during a delay, announcement, or overly long
agi) between the time that he answered the phone and the time when
he actually was bridged with the caller. The consequence of this
was that if the member hung up in that interval, then proper
abandonment details would not be noted in the queue log if the caller
were to hang up at any point after the member hangup.

(closes issue #12561)
Reported by: ablackthorn


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-05 21:44:04 +00:00
Mark Michelson
ec4819f368 Merged revisions 114849 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114849 | mmichelson | 2008-04-29 14:42:04 -0500 (Tue, 29 Apr 2008) | 22 lines

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

........
r114848 | mmichelson | 2008-04-29 14:40:06 -0500 (Tue, 29 Apr 2008) | 14 lines

Use the MACRO_CONTEXT and MACRO_EXTEN channel variables instead of the channel's macrocontext
and macroexten fields. This is needed because if macros are daisy-chained, the incorrect 
context and extension are placed on the new channel. I also added locking to the channel prior
to accessing these variables as noted in trunk's janitor project file.


(closes issue #12549)
Reported by: darren1713
Patches:
      app_queue.c.macroextenpatch uploaded by darren1713 (license 116)
	       (with modifications from me)
Tested by: putnopvut


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-29 19:42:43 +00:00
Mark Michelson
9ebf88ab3d Merged revisions 114629 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114629 | mmichelson | 2008-04-24 15:43:52 -0500 (Thu, 24 Apr 2008) | 16 lines

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

........
r114628 | mmichelson | 2008-04-24 15:43:03 -0500 (Thu, 24 Apr 2008) | 8 lines

Output of channel variables when eventwhencalled=vars was set
was being truncated two characters. This patch corrects the
problem.

(closes issue #12493)
Reported by: davidw


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-24 20:44:37 +00:00
Jason Parker
8ec76fdc91 Merged revisions 114540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r114540 | qwell | 2008-04-22 13:14:09 -0500 (Tue, 22 Apr 2008) | 8 lines

Allow setqueuevar=yes (et al) to work, after changes to pbx_builtin_setvar()

(closes issue #12490)
Reported by: bcnit
Patches:
      12490-queuevars-3.diff uploaded by qwell (license 4)
Tested by: qwell

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-22 18:14:44 +00:00
Jason Parker
d98b6009ce Merged revisions 114134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114134 | qwell | 2008-04-15 11:18:38 -0500 (Tue, 15 Apr 2008) | 16 lines

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

........
r114133 | qwell | 2008-04-15 11:18:08 -0500 (Tue, 15 Apr 2008) | 8 lines

Allow autofill to work in the general section of queues.conf.
Additionally, don't try to (re)set options when they have empty values in realtime (all unset columns would have an empty value).

(closes issue #12445)
Reported by: atis
Patches:
      12445-autofill.diff uploaded by qwell (license 4)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-15 16:19:06 +00:00
Mark Michelson
96e74f94f0 Merged revisions 114113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r114113 | mmichelson | 2008-04-14 11:25:09 -0500 (Mon, 14 Apr 2008) | 17 lines

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

........
r114112 | mmichelson | 2008-04-14 11:24:22 -0500 (Mon, 14 Apr 2008) | 9 lines

If the datastore has been moved to another channel due to a masquerade, then
freeing the datastore here causes an eventual double free when the new channel
hangs up. We should only free the datastore if we were able to successfully remove
it from the channel we are referencing (i.e. the datastore was not moved).

(closes issue #12359)
Reported by: pguido


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-14 16:25:57 +00:00
Mark Michelson
3dd87d6d77 Merged revisions 113980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r113980 | mmichelson | 2008-04-09 17:32:32 -0500 (Wed, 09 Apr 2008) | 8 lines

Fix a crash that happened due to accessing free'd memory

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@113982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-09 22:34:04 +00:00
Mark Michelson
bb75d40666 Merged revisions 112394 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r112394 | mmichelson | 2008-04-02 09:32:43 -0500 (Wed, 02 Apr 2008) | 14 lines

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

........
r112393 | mmichelson | 2008-04-02 09:32:00 -0500 (Wed, 02 Apr 2008) | 6 lines

Ensure that there is no timeout if none is specified.

(closes issue #12349)
Reported by: johnlange


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-02 14:33:33 +00:00
Joshua Colp
0ee953a249 Merged revisions 111565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r111565 | file | 2008-03-27 21:55:47 -0300 (Thu, 27 Mar 2008) | 2 lines

Forgetting to unregister a manager action is bad, mmmk?

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@111566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-28 00:56:44 +00:00