Commit Graph

16129 Commits

Author SHA1 Message Date
Tilghman Lesher
b2a42c3353 Merged revisions 135915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135915 | tilghman | 2008-08-05 22:24:56 -0500 (Tue, 05 Aug 2008) | 4 lines

Since powerof() can return an error condition, it's foolhardy not to detect and
deal with that condition.
(Related to issue #13240)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 03:29:42 +00:00
Tilghman Lesher
29228a3afc Merged revisions 135899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135899 | tilghman | 2008-08-05 22:02:59 -0500 (Tue, 05 Aug 2008) | 4 lines

1) Bugfix for debugging code
2) Reduce compiler warnings for another section of debugging code
(Closes issue #13237)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 03:04:01 +00:00
Mark Michelson
89c2844242 Merged revisions 135841,135847,135850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135841 | mmichelson | 2008-08-05 19:25:10 -0500 (Tue, 05 Aug 2008) | 27 lines

Merging the issue11259 branch.

The purpose of this branch was to take into account
"burps" which could cause jitterbuffers to misbehave.
One such example is if the L option to Dial() were used
to inject audio into a bridged conversation at regular
intervals. Since the audio here was not passed through
the jitterbuffer, it would cause a gap in the jitterbuffer's
timestamps which would cause a frames to be dropped for a 
brief period.

Now ast_generic_bridge will empty and reset the jitterbuffer
each time it is called. This causes injected audio to be handled
properly.

ast_generic_bridge also will empty and reset the jitterbuffer
if it receives an AST_CONTROL_SRCUPDATE frame since the change
in audio source could negatively affect the jitterbuffer.

All of this was made possible by adding a new public API call
to the abstract_jb called ast_jb_empty_and_reset.

(closes issue #11259)
Reported by: plack
Tested by: putnopvut


........
r135847 | mmichelson | 2008-08-05 19:27:54 -0500 (Tue, 05 Aug 2008) | 4 lines

Revert inadvertent changes to app_skel that occurred when
I was testing for a memory leak


........
r135850 | mmichelson | 2008-08-05 19:29:54 -0500 (Tue, 05 Aug 2008) | 3 lines

Remove properties that should not be here


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 00:30:53 +00:00
Steve Murphy
5eaf8450d6 Merged revisions 135799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135799 | murf | 2008-08-05 17:13:20 -0600 (Tue, 05 Aug 2008) | 34 lines

(closes issue #12982)
Reported by: bcnit
Tested by: murf

I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.

And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first 
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).

I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.

To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.

I also corrected one small mention of the Zap device
to equally consider the dahdi device.

I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:45:32 +00:00
Tilghman Lesher
de582e1eb2 Merged revisions 135747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135747 | tilghman | 2008-08-05 16:34:46 -0500 (Tue, 05 Aug 2008) | 9 lines

In a conversion to use ast_strlen_zero, the meaning of the flag IAX_HASCALLERID
was perverted.  This change reverts IAX2 to the original meaning, which was,
that the callerid set on the client should be overridden on the server, even if
that means the resulting callerid is blank.  In other words, if you set
"callerid=" in the IAX config, then the callerid should be overridden to blank,
even if set on the client.  Note that there's a distinction, even on realtime,
between the field not existing (NULL in databases) and the field existing, but
set to blank (override callerid to blank).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 21:37:35 +00:00
Tilghman Lesher
ff101d0b07 Add '+=' append operator to configuration files.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 18:25:16 +00:00
Kevin P. Fleming
f24d7a89f5 datastore inheritance is a channel feature, so move this definition back
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 17:05:34 +00:00
Kevin P. Fleming
7df8b8b848 make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 16:56:11 +00:00
Tilghman Lesher
8ba981911a Always output a version string, even when we can't figure out what we are.
(Closes issue #13223)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 15:30:23 +00:00
Sean Bright
3fdc96d0b4 Merged revisions 135597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135597 | seanbright | 2008-08-05 09:25:00 -0400 (Tue, 05 Aug 2008) | 1 line

Use PATH_MAX for filenames
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 13:26:34 +00:00
Russell Bryant
194d90bafd Merged revisions 135536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135536 | russell | 2008-08-04 15:15:03 -0500 (Mon, 04 Aug 2008) | 2 lines

fix a config sample typo

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 20:15:27 +00:00
Tilghman Lesher
7e8f0ab219 Rename Mandrake scripts to Mandriva
(Closes issue #13221)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135485 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 17:12:15 +00:00
Tilghman Lesher
ffbd21ad7f Merged revisions 135482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135482 | tilghman | 2008-08-04 12:07:52 -0500 (Mon, 04 Aug 2008) | 2 lines

Define ASTSBINDIR for script
(Closes issue #13221)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 17:08:42 +00:00
Tilghman Lesher
0785fad14f Merged revisions 135479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135479 | tilghman | 2008-08-04 11:56:19 -0500 (Mon, 04 Aug 2008) | 6 lines

Memory leak on unload
(closes issue #13231)
 Reported by: eliel
 Patches: 
       app_voicemail.leak.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 16:58:29 +00:00
Tilghman Lesher
aca394bf0c HTTP module memory leaks
(closes issue #13230)
 Reported by: eliel
 Patches: 
       res_http_post_leak.patch uploaded by eliel (license 64)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 16:34:04 +00:00
Russell Bryant
b73b6b53cd Merged revisions 135473 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135473 | russell | 2008-08-04 11:26:17 -0500 (Mon, 04 Aug 2008) | 2 lines

Add a minor clarification to the documentation of mohinterpret and mohsuggest

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 16:28:07 +00:00
Russell Bryant
bbf50cf072 Be explicit that we don't want a result from this callback. The callback would
never indicate a match, so nothing would have been returned anyway, but it was
still a poor example of proper usage.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-04 15:02:12 +00:00
Sean Bright
6cf6d9eca5 Merge in changes that allow Asterisk to be built against the Hoard
memory allocator.  See doc/hoard.txt for more details.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 16:14:14 +00:00
Michiel van Baak
340809a771 whitespace fixes only.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:03:53 +00:00
Michiel van Baak
dc819e881e Dont coredump on register of non-configured devices
(closes issue #13224)
Reported by: mvanbaak
Patches:
      noncon.diff uploaded by wedhorn (license 30) with whitespace fixes by me
Tested by: wedhorn, mvanbaak


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:00:06 +00:00
Michiel van Baak
0f1a3177dc make this work again, and not segfault on device registration
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 13:56:00 +00:00
Kevin P. Fleming
bd28649280 --enable-dev-mode is your friend :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 13:21:16 +00:00
Michiel van Baak
532c10551a pass device instead of session to transmit_ functions.
(closes issue #10396)
Reported by: wedhorn
Patches:
      transmit3a.diff uploaded by wedhorn (license 30)
Tested by: wedhorn, mvanbaak


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 12:29:23 +00:00
Steve Murphy
9051edfa4a (closes issue #13202)
Reported by: falves11
Tested by: murf

falves11 ==

The changes I introduce here seem to clear up the problem
for me. However, if they do not for you, please reopen this
bug, and we'll keep digging.

The root of this problem seems to be a subtle memory corruption
introduced when creating an extension with an empty extension
name. While valgrind cannot detect it outside of DEBUG_MALLOC
mode, when compiled with DEBUG_MALLOC, this is certain death.

The code in main/features.c is a puzzle to me. On the initial
module load, the code is attempting to add the parking extension
before the features.conf file has even been opened!

I just wrapped the offending call with an if() that will not
try to add the extension if the extension name is empty. THis
seems to solve the corruption, and let the "memory show allocations"
work as one would expect.

But, really, adding an extension with an empty name is a seriously
bad thing to allow, as it will mess up all the pattern matching 
algorithms, etc. So, I added a statement to the add_extension2 code to return
a -1 if this is attempted.




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 04:51:29 +00:00
Terry Wilson
671627028c Fix mime parsing by re-adding support for passing headers to callback functions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 21:56:07 +00:00
Sean Bright
ca38a1a082 Remove some code that used to do something but does not anymore, mainly
to get rid of a shadow warning (but this seemed legitimate enough to fix
here instead of in my branch).

Thanks to putnopvut for taking a look as well.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 19:29:26 +00:00
Russell Bryant
58291bcec9 Merge changes from team/bbryant/keyrotation
This set of changes enhances IAX2 encryption support by adding key rotation
to provide enhanced security.  The key used for encryption is rotated right 
after the call gets set up, and then again every few minutes.  This was
discussed at the last AstriDevCon.  For interoperability with older versions
of Asterisk, there is an option that disables key rotation.

(closes issue #13018)
Reported by: bbryant
Patches:
      07072008__iax2_key_rotation.diff uploaded by bbryant (license 36)
Tested by: russell, bbryant


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 18:16:24 +00:00
Tilghman Lesher
62db05502f Picky, picky, buildbot
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 17:09:50 +00:00
Tilghman Lesher
6cb6583475 SIP should use the transport type set in the Moved Temporarily for the next
invite.
(closes issue #11843)
 Reported by: pestermann
 Patches: 
       20080723__issue11843_302_ignores_transport_16branch.diff uploaded by bbryant (license 36)
       20080723__issue11843_302_ignores_transport_trunk.diff uploaded by bbryant (license 36)
 Tested by: pabelanger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 16:39:51 +00:00
Mark Michelson
577d6a5c78 IMAP-specific items must go in IMAP_STORAGE defines...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 14:42:24 +00:00
Mark Michelson
a673e3d90a IMAP storage functioned under the assumption that folders
such as "Work" and "Family" would be subfolders of the
INBOX. This is an invalid assumption to make, but it could
be desirable to set up folders in this manner, so a new
option for voicemail.conf, "imapparentfolder" has been
added to allow for this.

(closes issue #13142)
Reported by: jaroth
Patches:
      parentfolder.patch uploaded by jaroth (license 50)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 14:29:48 +00:00
Michiel van Baak
d1df7bfcfc Make safe_asterisk work on dash/sh/bash etc.
(closes issue #13111)
Reported by: pabelanger
Patches:
      2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7)
Tested by: mvanbaak, pabelanger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 12:17:33 +00:00
Michiel van Baak
32edf478d1 Merged revisions 135058 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135058 | mvanbaak | 2008-08-01 13:43:46 +0200 (Fri, 01 Aug 2008) | 2 lines

make app_ices compile on OpenBSD.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:47:34 +00:00
Michiel van Baak
e9fc0e572c Merged revisions 135055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135055 | mvanbaak | 2008-08-01 12:55:27 +0200 (Fri, 01 Aug 2008) | 8 lines

fix some potential deadlocks in chan_skinny

(closes issue #13215)
Reported by: qwell
Patches:
      2008080100_bug13215.diff.txt uploaded by mvanbaak (license 7)
Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:00:13 +00:00
Kevin P. Fleming
54b0143463 Merged revisions 134983 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134983 | kpfleming | 2008-07-31 17:18:11 -0500 (Thu, 31 Jul 2008) | 3 lines

accomodate users who seem to lack a sense of humor :-)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 22:28:42 +00:00
Tilghman Lesher
72c3465669 Blocked revisions 134976 via svnmerge
........
r134976 | tilghman | 2008-07-31 16:53:19 -0500 (Thu, 31 Jul 2008) | 9 lines

Specify codecs in callfiles and manager, to allow video calls to be set up
from callfiles and AMI.
(closes issue #9531)
 Reported by: Geisj
 Patches: 
       20080715__bug9531__1.4.diff.txt uploaded by Corydon76 (license 14)
       20080715__bug9531__1.6.0.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:55:42 +00:00
Tilghman Lesher
e682d4c67e Switch command order, to meet with current specs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:53:59 +00:00
Tilghman Lesher
52b2aeb679 Increase column size beyond the minimum required, since PostgreSQL won't let
us modify existing columns.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134925 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 20:10:39 +00:00
Steve Murphy
5aa43c0afe Merged revisions 134883 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134883 | murf | 2008-07-31 13:23:42 -0600 (Thu, 31 Jul 2008) | 51 lines

(closes issue #11849)
Reported by: greyvoip
Tested by: murf

OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid 
notebook pages of notes later, I  have made the small
tweek necc. to get the start time right on the second 
CDR when:

  A Calls B
  B answ.
  A hits Xfer button on sip phone,
  A dials C and hits the OK button,
  A hangs up
  C answers ringing phone
  B and C converse
  B and/or C hangs up

But does not harm the scenario where:

  A Calls B
  B answ.
  B hits xfer button on sip phone,
  B dials C and hits the OK button,
  B hangs up
  C answers ringing phone
  A and C converse
  A and/or C hangs up

The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is 
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep 
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.

I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I 
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.

I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR 
changes and loses the proper start time.


........

and as to 1.4 to trunk; have I expressed my 
feelings about code shifting from one file
to another? Good.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:48:08 +00:00
Tilghman Lesher
c4131d9752 Two errors:
1) If a function returns SQLITE_LOCKED, no recovery is possible.
	2) An error message can be allocated, even when no error is signalled.
(closes issue #13109)
 Reported by: gknispel_proformatique


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:43:02 +00:00
Russell Bryant
2a6ce7b40a Merged revisions 134915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134915 | russell | 2008-07-31 14:37:26 -0500 (Thu, 31 Jul 2008) | 9 lines

Get app_ices working again

(closes issue #12981)
Reported by: dlogan
Patches:
      20080709__app_ices_v2_update_trunk.diff uploaded by bbryant (license 36)
      20080709__app_ices_v2_update_14.diff uploaded by bbryant (license 36)
Tested by: bbryant

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:39:50 +00:00
Russell Bryant
6d5979ff7e fix the potential use of an uninitialized variable
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:39:25 +00:00
Tilghman Lesher
b89ecf2407 Optimize frame cache by realloc'ing the smallest frame when the cache is full.
This ensures that we don't just keep a cache of tiny frames, continually doing
an alloc/free for each data frame, thus negating the point of having a cache.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:03:41 +00:00
Russell Bryant
8adc6fb4ea Merged revisions 134814 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134814 | russell | 2008-07-31 11:45:31 -0500 (Thu, 31 Jul 2008) | 7 lines

In case we have some processing threads that free more frames than they allocate,
do not let the frame cache grow forever.

(closes issue #13160)
Reported by: tavius
Tested by: tavius, russell

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:50:10 +00:00
Russell Bryant
f4c4469f38 Fix some tex errors
(closes issue #13211)
Reported by: eliel
Patches:
      fixtexerrors.patch uploaded by eliel (license 64)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:37:08 +00:00
Mark Michelson
95ab87a07d 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/trunk@134759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:05:12 +00:00
Tilghman Lesher
68eaf774cc Blocked revisions 134704 via svnmerge
........
r134704 | tilghman | 2008-07-30 17:39:57 -0500 (Wed, 30 Jul 2008) | 2 lines

Oops, wrong define

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:40:48 +00:00
Tilghman Lesher
c95460a353 Oops, wrong define
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:38:58 +00:00
Steve Murphy
bf8e80eebc blocking 134652 from trunk because this problem only applies to 1.4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:04:07 +00:00
Tilghman Lesher
e9fa4afa4e Merged revisions 134649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134649 | tilghman | 2008-07-30 16:38:50 -0500 (Wed, 30 Jul 2008) | 4 lines

Qwell pointed out, via IRC, that the previous fix only worked when explicitly
set.  When nothing is set, and the option is implied, it breaks, because
configure sets the prefix to 'NONE'.  Fixing.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:40:08 +00:00