Archived
14
0
Fork 0
Commit graph

16296 commits

Author SHA1 Message Date
mvanbaak
7ec166b840 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: http://svn.digium.com/svn/asterisk/trunk@135056 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-01 11:00:13 +00:00
kpfleming
8e7bccd3c6 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: http://svn.digium.com/svn/asterisk/trunk@135016 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 22:28:42 +00:00
tilghman
805af77dd8 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: http://svn.digium.com/svn/asterisk/trunk@134980 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 21:55:42 +00:00
tilghman
471074406c Switch command order, to meet with current specs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134977 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 21:53:59 +00:00
tilghman
b797b71916 Increase column size beyond the minimum required, since PostgreSQL won't let
us modify existing columns.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134925 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 20:10:39 +00:00
murf
07835cb96c 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: http://svn.digium.com/svn/asterisk/trunk@134922 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 19:48:08 +00:00
tilghman
5acd124dff 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: http://svn.digium.com/svn/asterisk/trunk@134919 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 19:43:02 +00:00
russell
8f37b0abdd 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: http://svn.digium.com/svn/asterisk/trunk@134917 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 19:39:50 +00:00
russell
295533fd85 fix the potential use of an uninitialized variable
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134916 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 19:39:25 +00:00
tilghman
c8ccc483f8 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: http://svn.digium.com/svn/asterisk/trunk@134867 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 19:03:41 +00:00
russell
38884ff944 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: http://svn.digium.com/svn/asterisk/trunk@134815 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 16:50:10 +00:00
russell
8d62c44e93 Fix some tex errors
(closes issue #13211)
Reported by: eliel
Patches:
      fixtexerrors.patch uploaded by eliel (license 64)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134803 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 16:37:08 +00:00
mmichelson
5a3889ab94 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: http://svn.digium.com/svn/asterisk/trunk@134759 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-31 16:05:12 +00:00
tilghman
5a6e9221ba 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: http://svn.digium.com/svn/asterisk/trunk@134705 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 22:40:48 +00:00
tilghman
f52ba8f25f Oops, wrong define
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134703 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 22:38:58 +00:00
murf
19a46abd43 blocking 134652 from trunk because this problem only applies to 1.4
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134653 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 22:04:07 +00:00
tilghman
9aae759f1c 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: http://svn.digium.com/svn/asterisk/trunk@134650 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 21:40:08 +00:00
mmichelson
1e27b2a5d5 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: http://svn.digium.com/svn/asterisk/trunk@134598 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 21:05:37 +00:00
russell
3484fe8a9e 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: http://svn.digium.com/svn/asterisk/trunk@134596 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 20:38:35 +00:00
mmichelson
1b97d0a538 Fix the parsing of the "reason" parameter in the
Diversion: header.

(closes issue #13195)
Reported by: woodsfsg



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134556 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 20:24:40 +00:00
russell
3ffd7f4411 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: http://svn.digium.com/svn/asterisk/trunk@134541 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 19:55:31 +00:00
tilghman
1af9fe06b6 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: http://svn.digium.com/svn/asterisk/trunk@134538 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 19:48:37 +00:00
tilghman
57e6c35f42 Let "roundrobin" also reference rrmemory, for the 1.6 release (as described in
UPGRADE-1.4.txt)
(Closes issue #13181)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134483 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 19:17:38 +00:00
tilghman
4c81650745 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: http://svn.digium.com/svn/asterisk/trunk@134481 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 19:05:35 +00:00
mmichelson
2d62a6015f 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: http://svn.digium.com/svn/asterisk/trunk@134476 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 18:33:12 +00:00
tilghman
ebffaaf90e Document adaptive capabilities
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134443 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 17:36:31 +00:00
tilghman
e4883b8dd4 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


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134442 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 17:32:28 +00:00
tilghman
9573bd9402 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: http://svn.digium.com/svn/asterisk/trunk@134401 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 16:40:43 +00:00
kpfleming
c874d37df5 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: http://svn.digium.com/svn/asterisk/trunk@134355 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 15:32:14 +00:00
tilghman
6b26c0501c 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: http://svn.digium.com/svn/asterisk/trunk@134353 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-30 15:30:18 +00:00
tilghman
58e599d7e9 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: http://svn.digium.com/svn/asterisk/trunk@134312 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-29 23:00:45 +00:00
kpfleming
c5d4094208 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: http://svn.digium.com/svn/asterisk/trunk@134260 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-29 22:22:13 +00:00
bbryant
6a26d91c7e Fix deadlock when unloading res_http_post because the uris lock was still locked.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134253 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-29 21:23:43 +00:00
tilghman
de2a300765 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: http://svn.digium.com/svn/asterisk/trunk@134163 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 22:07:12 +00:00
tilghman
5e46b9f94e Restore properties mistakenly removed (broke merging)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134162 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 21:56:00 +00:00
mmichelson
d1ae07e8e7 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: http://svn.digium.com/svn/asterisk/trunk@134125 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 19:53:56 +00:00
tilghman
aa5fc8c256 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: http://svn.digium.com/svn/asterisk/trunk@134088 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 16:49:29 +00:00
kpfleming
255f52d647 remove remaining Zaptel references in various places
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134086 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 16:42:00 +00:00
mmichelson
f76a823f67 merging the zap_and_dahdi_trunk branch up to trunk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134050 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-28 16:00:19 +00:00
russell
f4056d9f18 Add a missing unlock within error handling
(closes issue #13176)
Reported by: pj


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134005 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-27 21:12:14 +00:00
russell
695ec5d5c7 actually use the cache_cache argument
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133946 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26 15:16:20 +00:00
russell
9e1954caf6 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.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133945 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26 15:15:14 +00:00
russell
e7f57f6eed Re-work comment about how device state changes are processed to be a bit more clear
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133943 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26 14:57:50 +00:00
russell
a269115f5f Remove the code that decided when device state changes should be cached or not.
It is no longer needed.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133941 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-26 14:46:13 +00:00
tilghman
ab21558ab8 Hebrew syntax for voicemail prompts
(closes issue #13155)
 Reported by: greenfieldtech
 Patches: 
       app_voicemail.c.patch uploaded by greenfieldtech (license 369)
       hebrew.ods uploaded by greenfieldtech (license 369)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133904 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 22:08:06 +00:00
tilghman
fb6c2d1804 Update version
(closes issue #13163)
 Reported by: suretec
 Patches: 
       asterisk.ldif uploaded by suretec (license 70)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133902 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 21:59:39 +00:00
tilghman
1b294dd713 Deprecate *_device_state_* APIs in favor of *_devstate_* APIs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133860 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 21:20:03 +00:00
kpfleming
7ab3f69dea minor change to test automerge
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133819 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 20:56:43 +00:00
bkruse
41d884e00e Revert tilghman and pari's code changes, as
we do NOT need to uri_decode in manager.
(if I sent core%20show%20channels from a telnet
session, it should be interpreted literally, however,
if I send that from an http session, it should be
decoded, which is the behaivor now)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133770 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 19:12:17 +00:00
tilghman
38cbad4106 Blocked revisions 133709 via svnmerge
........
r133709 | tilghman | 2008-07-25 13:00:33 -0500 (Fri, 25 Jul 2008) | 3 lines

Remove unnecessary mmap flag
(Closes issue #13161)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@133710 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-25 18:01:58 +00:00