Commit Graph

16065 Commits

Author SHA1 Message Date
Michiel van Baak
ad8494bc11 Blocked revisions 135373 via svnmerge
........
r135373 | mvanbaak | 2008-08-03 02:03:53 +0200 (Sun, 03 Aug 2008) | 2 lines

whitespace fixes only.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:06:24 +00:00
Michiel van Baak
c2fb65d6c4 Blocked revisions 135371 via svnmerge
........
r135371 | mvanbaak | 2008-08-03 02:00:06 +0200 (Sun, 03 Aug 2008) | 8 lines

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/branches/1.6.0@135372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-03 00:01:11 +00:00
Michiel van Baak
283d95d035 Blocked revisions 135300 via svnmerge
........
r135300 | mvanbaak | 2008-08-02 14:29:23 +0200 (Sat, 02 Aug 2008) | 8 lines

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/branches/1.6.0@135301 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 12:31:33 +00:00
Steve Murphy
88a4540726 Merged revisions 135265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135265 | murf | 2008-08-01 22:51:29 -0600 (Fri, 01 Aug 2008) | 31 lines

(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.


in 1.6.0, the changes to only main/pbx.c were applicable,
as apparently the code added to main/features by jpeeler
were not included in 1.6.0.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-02 05:15:59 +00:00
Terry Wilson
17a509e4d6 Blocked revisions 135235 via svnmerge
........
r135235 | twilson | 2008-08-01 16:56:07 -0500 (Fri, 01 Aug 2008) | 2 lines

Fix mime parsing by re-adding support for passing headers to callback functions

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 21:58:06 +00:00
Sean Bright
3f6647d7ad Merged revisions 135197 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135197 | seanbright | 2008-08-01 15:29:26 -0400 (Fri, 01 Aug 2008) | 6 lines

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/branches/1.6.0@135198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 19:30:31 +00:00
Russell Bryant
60cc0566b0 Blocked revisions 135158 via svnmerge
........
r135158 | russell | 2008-08-01 13:16:24 -0500 (Fri, 01 Aug 2008) | 14 lines

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/branches/1.6.0@135159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 18:17:22 +00:00
Tilghman Lesher
45253fa663 Merged revisions 135128 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135128 | tilghman | 2008-08-01 12:09:50 -0500 (Fri, 01 Aug 2008) | 2 lines

Picky, picky, buildbot

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 17:10:29 +00:00
Tilghman Lesher
4802c70d3a Merged revisions 135126 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135126 | tilghman | 2008-08-01 11:39:51 -0500 (Fri, 01 Aug 2008) | 9 lines

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/branches/1.6.0@135127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 16:44:32 +00:00
Mark Michelson
52f334eacf Merged revisions 135067-135068 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r135067 | mmichelson | 2008-08-01 09:29:48 -0500 (Fri, 01 Aug 2008) | 13 lines

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)


........
r135068 | mmichelson | 2008-08-01 09:42:24 -0500 (Fri, 01 Aug 2008) | 3 lines

IMAP-specific items must go in IMAP_STORAGE defines...


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 14:43:19 +00:00
Michiel van Baak
c82f22257d Blocked revisions 135061 via svnmerge
........
r135061 | mvanbaak | 2008-08-01 14:17:33 +0200 (Fri, 01 Aug 2008) | 8 lines

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/branches/1.6.0@135062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 12:18:18 +00:00
Michiel van Baak
f138b46450 Merged revisions 135059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135059 | mvanbaak | 2008-08-01 13:47:34 +0200 (Fri, 01 Aug 2008) | 10 lines

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/branches/1.6.0@135060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:57:38 +00:00
Michiel van Baak
5468f7fe62 Merged revisions 135056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135056 | mvanbaak | 2008-08-01 13:00:13 +0200 (Fri, 01 Aug 2008) | 16 lines

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/branches/1.6.0@135057 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-01 11:03:07 +00:00
Kevin P. Fleming
e6c7675f32 Merged revisions 135016 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r135016 | kpfleming | 2008-07-31 17:28:42 -0500 (Thu, 31 Jul 2008) | 11 lines

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/branches/1.6.0@135034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 22:34:44 +00:00
Tilghman Lesher
6d0cdb3f22 Merged revisions 134980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134980 | tilghman | 2008-07-31 16:55:42 -0500 (Thu, 31 Jul 2008) | 16 lines

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/branches/1.6.0@134981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:58:26 +00:00
Tilghman Lesher
2ea9a77dc1 Merged revisions 134977 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134977 | tilghman | 2008-07-31 16:53:59 -0500 (Thu, 31 Jul 2008) | 2 lines

Switch command order, to meet with current specs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 21:54:47 +00:00
Tilghman Lesher
511ebd6e50 Blocked revisions 134925 via svnmerge
........
r134925 | tilghman | 2008-07-31 15:10:39 -0500 (Thu, 31 Jul 2008) | 3 lines

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/branches/1.6.0@134926 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 20:11:17 +00:00
Steve Murphy
7a26f22be2 Merged revisions 134922 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134922 | murf | 2008-07-31 13:48:08 -0600 (Thu, 31 Jul 2008) | 63 lines

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.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134923 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:54:58 +00:00
Tilghman Lesher
e1972c6d9d Blocked revisions 134919 via svnmerge
........
r134919 | tilghman | 2008-07-31 14:43:02 -0500 (Thu, 31 Jul 2008) | 6 lines

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/branches/1.6.0@134920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:43:38 +00:00
Russell Bryant
a6439b01e2 Merged revisions 134917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134917 | russell | 2008-07-31 14:39:50 -0500 (Thu, 31 Jul 2008) | 17 lines

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/branches/1.6.0@134918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:41:11 +00:00
Tilghman Lesher
b346b35ea9 Blocked revisions 134867 via svnmerge
........
r134867 | tilghman | 2008-07-31 14:03:41 -0500 (Thu, 31 Jul 2008) | 4 lines

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/branches/1.6.0@134869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:04:26 +00:00
Russell Bryant
3abfb2c7d4 Merged revisions 134815 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134815 | russell | 2008-07-31 11:50:10 -0500 (Thu, 31 Jul 2008) | 15 lines

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/branches/1.6.0@134816 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 16:53:18 +00:00
Russell Bryant
61077f93d3 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134806 65c4cc65-6c06-0410-ace0-fbb531ad65f3 2008-07-31 16:38:28 +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
Tilghman Lesher
032752eeb5 Blocked revisions 134705 via svnmerge
................
r134705 | tilghman | 2008-07-30 17:40:48 -0500 (Wed, 30 Jul 2008) | 9 lines

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/branches/1.6.0@134707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:41:54 +00:00
Tilghman Lesher
6d5f021393 Merged revisions 134703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134703 | tilghman | 2008-07-30 17:38:58 -0500 (Wed, 30 Jul 2008) | 2 lines

Oops, wrong define

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 22:41:23 +00:00
Tilghman Lesher
1e369845e3 Merged revisions 134650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134650 | tilghman | 2008-07-30 16:40:08 -0500 (Wed, 30 Jul 2008) | 12 lines

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/branches/1.6.0@134651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 21:41:23 +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
Russell Bryant
740073aaf8 Merged revisions 134596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134596 | russell | 2008-07-30 15:38:35 -0500 (Wed, 30 Jul 2008) | 14 lines

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

........
r134595 | russell | 2008-07-30 15:37:17 -0500 (Wed, 30 Jul 2008) | 6 lines

Reduce stack consumption by 12.5% of the max stack size to fix a crash when
compiled with LOW_MEMORY.

(closes issue #13154)
Reported by: edantie

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:39:02 +00:00
Mark Michelson
d6b4e025b0 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@134561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 20:25:57 +00:00
Russell Bryant
d9041c8424 Merged revisions 134541 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134541 | russell | 2008-07-30 14:55:31 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134540 | russell | 2008-07-30 14:52:53 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a memory leak in func_curl.  Every thread that used this function leaked
an allocation the size of a pointer.
(reported by jmls in #asterisk-dev)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:56:24 +00:00
Tilghman Lesher
9179cfcfab Merged revisions 134538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134538 | tilghman | 2008-07-30 14:48:37 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134536 | tilghman | 2008-07-30 14:47:16 -0500 (Wed, 30 Jul 2008) | 4 lines

Only override sysconfdir and mandir when prefix=/usr
(closes issue #13093)
 Reported by: pabelanger

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:49:45 +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
Tilghman Lesher
3a9aae2f65 Merged revisions 134481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134481 | tilghman | 2008-07-30 14:05:35 -0500 (Wed, 30 Jul 2008) | 13 lines

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

........
r134480 | tilghman | 2008-07-30 14:03:44 -0500 (Wed, 30 Jul 2008) | 5 lines

launch_netscript sometimes returns -1, which fails to set AGISTATUS.  Map
failure to -1, so that AGISTATUS is always set.
(closes issue #13199)
 Reported by: smw1218

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 19:06:17 +00:00
Mark Michelson
656005417b Merged revisions 134476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134476 | mmichelson | 2008-07-30 13:33:12 -0500 (Wed, 30 Jul 2008) | 12 lines

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

........
r134475 | mmichelson | 2008-07-30 13:31:47 -0500 (Wed, 30 Jul 2008) | 4 lines

Fix a spot where a function could return without bringing
a channel out of autoservice.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 18:33:58 +00:00
Tilghman Lesher
6c0fd16554 Blocked revisions 134442-134443 via svnmerge
........
r134442 | tilghman | 2008-07-30 12:32:28 -0500 (Wed, 30 Jul 2008) | 7 lines

Add adaptive capabilities to the sqlite realtime driver
(closes issue #13097)
 Reported by: gknispel_proformatique
 Patches: 
       20080730__bug13097.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........
r134443 | tilghman | 2008-07-30 12:36:31 -0500 (Wed, 30 Jul 2008) | 2 lines

Document adaptive capabilities

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134444 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 17:37:12 +00:00
Tilghman Lesher
9ee4daf685 Blocked revisions 134401 via svnmerge
........
r134401 | tilghman | 2008-07-30 11:40:43 -0500 (Wed, 30 Jul 2008) | 7 lines

Move implementation of an attended-transfer-complete sound from one channel
driver into a common place for multiple channel drivers.
(closes issue #13152)
 Reported by: caio1982
 Patches: 
       atxfer_complete_sound3.diff uploaded by caio1982 (license 22)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 16:43:11 +00:00
Kevin P. Fleming
9386205b4b Merged revisions 134355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134355 | kpfleming | 2008-07-30 10:32:14 -0500 (Wed, 30 Jul 2008) | 10 lines

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

........
r134352 | kpfleming | 2008-07-30 10:29:17 -0500 (Wed, 30 Jul 2008) | 2 lines

use the proper method for building version.h

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 15:34:08 +00:00
Tilghman Lesher
096b9d2b75 Blocked revisions 134353 via svnmerge
........
r134353 | tilghman | 2008-07-30 10:30:18 -0500 (Wed, 30 Jul 2008) | 8 lines

Add %u and %g to the ASTERISK_PROMPT settings, for username and group,
respectively.  Also, take the opportunity to clean up the CLI prompt
generation code.
(closes issue #13175)
 Reported by: eliel
 Patches: 
       cliprompt.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-30 15:31:10 +00:00
Tilghman Lesher
200a0295e4 Blocked revisions 134312 via svnmerge
........
r134312 | tilghman | 2008-07-29 18:00:45 -0500 (Tue, 29 Jul 2008) | 6 lines

Minor changes to reduce packaging changes made by the Fedora maintainer.
(closes issue #12974)
 Reported by: jcollie
 Patches: 
       0001-Don-t-override-duplicate-optimization-flags.patch uploaded by jcollie (license 412)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 23:01:26 +00:00
Kevin P. Fleming
25fe3c40f1 Merged revisions 134260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134260 | kpfleming | 2008-07-29 17:22:13 -0500 (Tue, 29 Jul 2008) | 2 lines

build against the now-typedef-free dahdi/user.h, and remove some #ifdefs for features that will always be present in DAHDI

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-29 22:29:11 +00:00
Tilghman Lesher
2e8d6fc9b8 Merged revisions 134163 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r134163 | tilghman | 2008-07-28 17:07:12 -0500 (Mon, 28 Jul 2008) | 15 lines

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

........
r134161 | tilghman | 2008-07-28 16:50:50 -0500 (Mon, 28 Jul 2008) | 7 lines

Detect when sox fails to raise the volume, because sox can't read the file.
(closes issue #12939)
 Reported by: rickbradley
 Patches: 
       20080728__bug12939.diff.txt uploaded by Corydon76 (license 14)
 Tested by: rickbradley

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 22:16:39 +00:00
Mark Michelson
b2eaaae0b5 Merged revisions 134125 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134125 | mmichelson | 2008-07-28 14:53:56 -0500 (Mon, 28 Jul 2008) | 27 lines

This commit compensates for buggy poll(2)
implementations. Asterisk has, for a long time,
had its own implementation of poll(2) which
just used the input arguments to call select(2).
In 1.4, this internal implementation was used
for Darwin systems. This was removed in Asterisk
trunk at some point, but it seems as though this
was not the right move to make.

On Mac OS X, it appears as though the poll used
to gather CLI input does not respond properly
when connecting via a remote Asterisk console.
Reverting to the use of Asterisk's poll fixed
the issue.

Also, there is now an option for the configure
script, --enable-internal-poll, which will allow
for anyone to use Asterisk's internal poll
implementation in case they suspect that their
system's poll implementation is buggy.

closes issue #11928)
Reported by: adriavidal
Patches:
      1.6.0-configurev2.patch uploaded by putnopvut (license 60)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 19:55:44 +00:00
Tilghman Lesher
bdbeb72fc4 Blocked revisions 134088 via svnmerge
........
r134088 | tilghman | 2008-07-28 11:49:29 -0500 (Mon, 28 Jul 2008) | 7 lines

Change SendImage() to output a more consistent status variable.
(closes issue #13134)
 Reported by: eliel
 Patches: 
       app_image.c.patch uploaded by eliel (license 64)
       UPGRADE.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:50:42 +00:00
Kevin P. Fleming
261a4972f6 Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines

remove remaining Zaptel references in various places


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:49:18 +00:00
Mark Michelson
7eb4b5bf5b Merged revisions 134050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r134050 | mmichelson | 2008-07-28 11:00:19 -0500 (Mon, 28 Jul 2008) | 3 lines

merging the zap_and_dahdi_trunk branch up to trunk


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-28 16:13:34 +00:00
Russell Bryant
322153ad93 Blocked revisions 134005 via svnmerge
........
r134005 | russell | 2008-07-27 16:12:14 -0500 (Sun, 27 Jul 2008) | 4 lines

Add a missing unlock within error handling
(closes issue #13176)
Reported by: pj

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@134006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-27 21:12:43 +00:00
Russell Bryant
86cef15735 Include the licensing page in 1.6.0 as well. Now, this page exists in 1.4, trunk,
and 1.6.0.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:34:42 +00:00
Russell Bryant
a12da2ad99 unblock 133575
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:34:02 +00:00
Russell Bryant
42cf9fc54e Merged revisions 133945-133946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r133945 | russell | 2008-07-26 10:15:14 -0500 (Sat, 26 Jul 2008) | 6 lines

ast_device_state() gets called in two different ways.  The first way is when
called from elsewhere in Asterisk to find the current state of a device.  In
that case, we want to use the cached value if it exists.  The other way is when
processing a device state change.  In that case, we do not want to check the
cache because returning the last known state is counter productive.

........
r133946 | russell | 2008-07-26 10:16:20 -0500 (Sat, 26 Jul 2008) | 1 line

actually use the cache_cache argument
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@133947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-26 15:17:46 +00:00