Mark Michelson [Fri, 19 Sep 2008 15:43:28 +0000 (15:43 +0000)]
We should only unsubscribe to the device state event
subscription if we have previously subscribed. Otherwise
a segfault will occur.
(closes issue #13476)
Reported by: jonnt
Patches:
13476.patch uploaded by putnopvut (license 60)
Tested by: jonnt
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143609
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 18 Sep 2008 23:41:33 +0000 (23:41 +0000)]
Merged revisions 143534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r143534 | murf | 2008-09-18 16:11:51 -0600 (Thu, 18 Sep 2008) | 1 line
A micro-fix, in sip_park_thread, where d is freed before the func is done using it.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143559
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Thu, 18 Sep 2008 21:02:02 +0000 (21:02 +0000)]
Blocked revisions 143475 via svnmerge
........
r143475 | jpeeler | 2008-09-18 16:01:23 -0500 (Thu, 18 Sep 2008) | 1 line
compare peer and chan instead of looking at the parked user (pu), which could have possibly already have been freed by the parking thread
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143476
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 17 Sep 2008 20:57:58 +0000 (20:57 +0000)]
Merged revisions 143404 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r143404 | tilghman | 2008-09-17 15:55:47 -0500 (Wed, 17 Sep 2008) | 6 lines
When callerid is blank, we want to use "unknown caller" in those cases, too.
(closes issue #13486)
Reported by: tomo1657
Patches:
20080917__bug13486.diff.txt uploaded by Corydon76 (license 14)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143405
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 17 Sep 2008 20:25:40 +0000 (20:25 +0000)]
If attempting to free a NULL pointer when MALLOC_DEBUG
is set, don't bother searching for a region to free, just
immediately exit.
This has the dual benefit of suppressing a warning message
about freeing memory at (nil) and of optimizing the free()
replacement by not having to do any futile searching for
the proper region to free.
(closes issue #13498)
Reported by: pj
Patches:
13498.patch uploaded by putnopvut (license 60)
Tested by: pj
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143400
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 17 Sep 2008 18:26:35 +0000 (18:26 +0000)]
Merged revisions 143337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r143337 | mmichelson | 2008-09-17 13:24:15 -0500 (Wed, 17 Sep 2008) | 6 lines
Allow for "G.729" if offered in an SDP even though
it is not RFC 3551 compliant. Some Cisco switches
will send this in an SDP, and it doesn't hurt to
be able to accept this.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143340
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Tue, 16 Sep 2008 21:44:52 +0000 (21:44 +0000)]
Blocked revisions 143270 via svnmerge
........
r143270 | jpeeler | 2008-09-16 16:44:21 -0500 (Tue, 16 Sep 2008) | 9 lines
(closes issue #13493)
Reported by: mdu113
Patches:
bug13493.diff uploaded by jpeeler (license 325)
Tested by: mdu113
Changed park_call_full to hold the parkinglot lock a little longer, which protects the parkeduser struct from being freed out from underneath. Made sure that the parking extension is added to the parking context while holding the lock thereby ensuring that there are no spurious warnings from removal attempts when a hangup occurs while the parking lot is being announced.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143271
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Tue, 16 Sep 2008 16:35:32 +0000 (16:35 +0000)]
Blocked revisions 143204 via svnmerge
........
r143204 | jpeeler | 2008-09-16 11:14:25 -0500 (Tue, 16 Sep 2008) | 10 lines
(closes issue #13465)
(closes issue #13425)
Reported by: mdu113
Patches:
bug13425.diff uploaded by jpeeler (license 325)
Tested by: mdu113
The main change here was to masquerade the channel if the channel that was to be parked was running a PBX on it. The PBX thread can then maintain full control of the channel (the zombie) as it expects to while allowing the parking thread full control of the real (parked) channel.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143226
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 15 Sep 2008 21:31:36 +0000 (21:31 +0000)]
Merged revisions 143140 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r143140 | tilghman | 2008-09-15 16:29:32 -0500 (Mon, 15 Sep 2008) | 6 lines
Set the raw formats at the same time as the other formats.
(closes issue #13240)
Reported by: jvandal
Patches:
20080813__bug13240.diff.txt uploaded by Corydon76 (license 14)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143141
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Sun, 14 Sep 2008 22:16:34 +0000 (22:16 +0000)]
plug a couple of memleaks in chan_skinny.
(closes issue #13452)
Reported by: pj
Patches:
memleak5.diff uploaded by wedhorn (license 30)
Tested by: wedhorn, pj, mvanbaak
(closes issue #13294)
Reported by: pj
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143082
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sat, 13 Sep 2008 14:15:08 +0000 (14:15 +0000)]
Everytime a compile fails, a puppy dies.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143034
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 13 Sep 2008 13:54:15 +0000 (13:54 +0000)]
Repair IAXVAR implementation so that it works again (regression?)
(closes issue #13354)
Reported by: adomjan
Patches:
20080828__bug13354.diff.txt uploaded by Corydon76 (license 14)
20080829__bug13354__1.6.0.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76, adomjan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143031
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 12 Sep 2008 23:30:03 +0000 (23:30 +0000)]
Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating
when a file is invalid from when a file is missing. This is most important when
we have two configuration files. Consider the following example:
Old system:
sip.conf users.conf Old result New result
======== ========== ========== ==========
Missing Missing SIP doesn't load SIP doesn't load
Missing OK SIP doesn't load SIP doesn't load
Missing Invalid SIP doesn't load SIP doesn't load
OK Missing SIP loads SIP loads
OK OK SIP loads SIP loads
OK Invalid SIP loads incompletely SIP doesn't load
Invalid Missing SIP doesn't load SIP doesn't load
Invalid OK SIP doesn't load SIP doesn't load
Invalid Invalid SIP doesn't load SIP doesn't load
So in the case when users.conf doesn't load because there's a typo that
disrupts the syntax, we may only partially load users, instead of failing with
an error, which may cause some calls not to get processed. Worse yet, the old
system would do this with no indication that anything was even wrong.
(closes issue #10690)
Reported by: dtyoo
Patches:
20080716__bug10690.diff.txt uploaded by Corydon76 (license 14)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142992
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Fri, 12 Sep 2008 22:24:13 +0000 (22:24 +0000)]
Merged revisions 142927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142927 | jpeeler | 2008-09-12 17:22:28 -0500 (Fri, 12 Sep 2008) | 6 lines
(closes issue #12965)
Reported by: rlsutton2
Prevents local channels from playing MOH at each other which was causing ast_generic_bridge to loop much faster.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142929
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 12 Sep 2008 20:49:46 +0000 (20:49 +0000)]
Merged revisions 142865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142865 | tilghman | 2008-09-12 15:37:18 -0500 (Fri, 12 Sep 2008) | 11 lines
Create rules for disallowing contacts at certain addresses, which may
improve the security of various installations. As this does not change
any default behavior, it is not classified as a direct security fix for
anything within Asterisk, but may help PBX admins better secure their
SIP servers.
(closes issue #11776)
Reported by: ibc
Patches:
20080829__bug11776.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76, blitzrage
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142866
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Fri, 12 Sep 2008 18:22:17 +0000 (18:22 +0000)]
Recorded merge of revisions 142807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142807 | mvanbaak | 2008-09-12 19:59:25 +0200 (Fri, 12 Sep 2008) | 2 lines
fix copyright year range
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142808
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 12 Sep 2008 16:54:44 +0000 (16:54 +0000)]
When checking for an encoded character, make sure the string isn't blank, first.
(Closes issue #13470)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142748
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 12 Sep 2008 16:38:55 +0000 (16:38 +0000)]
Merged revisions 142744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142744 | tilghman | 2008-09-12 11:38:02 -0500 (Fri, 12 Sep 2008) | 4 lines
Missing merge from 1.2 fixes errant exit on DTMF, only when language is Italian
(cf commit 34242)
(Closes issue #7353)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142745
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 12 Sep 2008 16:29:01 +0000 (16:29 +0000)]
Merged revisions 142740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142740 | tilghman | 2008-09-12 11:27:32 -0500 (Fri, 12 Sep 2008) | 4 lines
Don't return a free'd pointer, when a file cannot be opened.
(closes issue #13462)
Reported by: wackysalut
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142741
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Fri, 12 Sep 2008 04:50:48 +0000 (04:50 +0000)]
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/trunk@142676
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Fri, 12 Sep 2008 00:49:31 +0000 (00:49 +0000)]
Build under dev-mode
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142635
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 11 Sep 2008 23:12:53 +0000 (23:12 +0000)]
Merged revisions 142575 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142575 | murf | 2008-09-11 16:55:49 -0600 (Thu, 11 Sep 2008) | 20 lines
(closes issue #13364)
Reported by: mdu113
Well, fundamentally, the problems revealed in 13364 are
because of the ForkCDR call that is done before the dial.
When the bridge is in place, it's dealing with the first
(and wrong) cdr in the list.
So, I wrote a little func to zip down to the first non-locked
cdr in the chain, and thru-out the ast_bridge_call, these
results are used instead of raw chan->cdr and peer->cdr pointers.
This shouldn't affect anyone who isn't forking cdrs before a
dial, and should correct the cdr's of those that do.
So, this change ends up correcting the dstchannel
and userfield; the disposition was fixed by a previous
patch, it was OK coming into this problem.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142576
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 11 Sep 2008 21:45:07 +0000 (21:45 +0000)]
Add usegmtime, as per the recent -users list discussion, and also add my
explanation to the file, since that additional text helps people understand
the concept.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142536
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 10 Sep 2008 22:11:27 +0000 (22:11 +0000)]
Merged revisions 142474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142474 | murf | 2008-09-10 15:58:17 -0600 (Wed, 10 Sep 2008) | 30 lines
(closes issue #12318)
Reported by: krtorio
I made a small change to the code that handles local channel situations.
In that code, I copy the answer time from the peer cdr, to the bridge_cdr,
but I wasn't also copying the disposition from the peer cdr.
So, Now I copy the disposition, and I've tested against
these cases:
1. phone 1 never answers the phone; no cdr is generated at all.
this should show up as a manager command failure or something.
2. phone 2 never answers. CDR is generated, says NO ANSWER
3. phone 2 is busy. CDR is generated, says BUSY
4. phone 2 answers: CDR is generated, times are correct; disposition
is ANSWERED, which is correct. The start time is the time that
the manager dialed the first phone. The answer time is the time
the second phone picks up.
I purposely left the cid and src fields blank; since this call really
originates from the manager, there is no 'easy' data to put in these
fields. If you feel strongly that these fields should be filled in,
re-open this bug and I'll dig further.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142475
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Wed, 10 Sep 2008 19:09:03 +0000 (19:09 +0000)]
Merged revisions 142416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142416 | seanbright | 2008-09-10 15:05:46 -0400 (Wed, 10 Sep 2008) | 9 lines
Fix detection of PWLIB and OpenH323 version when spacing in the headers
isn't consistent.
(closes issue #13426)
Reported by: bamby
Patches:
detect_openh323.diff uploaded by bamby (license 430)
(Modified by me to use sed instead of tr)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142417
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 10 Sep 2008 16:55:31 +0000 (16:55 +0000)]
Merged revisions 142358 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142358 | tilghman | 2008-09-10 11:54:29 -0500 (Wed, 10 Sep 2008) | 2 lines
Publish new extra sounds version.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142359
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 10 Sep 2008 16:41:55 +0000 (16:41 +0000)]
Merged revisions 142354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142354 | russell | 2008-09-10 11:39:53 -0500 (Wed, 10 Sep 2008) | 7 lines
It is a normal situation that a task gets put in the scheduler that should run
as soon as possible. Accept "0" as an acceptable time to run, and also treat
negative as "run now", and don't print a debug message about it.
(inspired by a message asking about the "request to schedule in the past"
debug message on the -dev list)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142355
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 10 Sep 2008 15:57:50 +0000 (15:57 +0000)]
Move last change to CHANGES up to the 1.6.2 section
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142318
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Philippe Sultan [Tue, 9 Sep 2008 22:08:56 +0000 (22:08 +0000)]
Disable autoprune by default.
(closes issue #13411)
Reported by: caio1982
Patches:
res_jabber_autoprune1.diff uploaded by caio1982 (license 22)
Tested by: caio1982
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142280
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 9 Sep 2008 19:16:30 +0000 (19:16 +0000)]
Merged revisions 142218 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142218 | mmichelson | 2008-09-09 14:15:28 -0500 (Tue, 09 Sep 2008) | 14 lines
Make sure that the branch sent in CANCEL requests
matches the branch of the INVITE it is cancelling.
(closes issue #13381)
Reported by: atca_pres
Patches:
13381v2.patch uploaded by putnopvut (license 60)
Tested by: atca_pres
(closes issue #13198)
Reported by: rickead2000
Tested by: rickead2000
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142219
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 9 Sep 2008 17:30:52 +0000 (17:30 +0000)]
Cleaned up comment
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142181
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 9 Sep 2008 17:15:29 +0000 (17:15 +0000)]
This is the trunk version of the patch to close
issue 12979. The difference between this and the
1.6.0 and 1.6.1 versions is that this is a much more
invasive change. With this, we completely get rid
of the interfaces list, along with all its helper
functions.
Let me take a moment to say that this change personally
excites me since it may mean huge steps forward regarding
proper lock order in app_queue without having to strew
seemingly unnecessary locks all over the place. It also
results in a huge reduction in lines of code and complexity.
Way to go Brett!
(closes issue #12979)
Reported by: sigxcpu
Patches:
20080710_issue12979_queue_custom_state_interface_trunk_2.diff uploaded by bbryant (license 36)
Tested by: sigxcpu, putnopvut
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142146
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 9 Sep 2008 16:20:41 +0000 (16:20 +0000)]
Merged revisions 142079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142079 | mmichelson | 2008-09-09 11:19:17 -0500 (Tue, 09 Sep 2008) | 21 lines
When determining if codecs used by SIP peers allow
the media to be natively bridged, use the jointcapability
instead of the peercapability.
It seems that the intent of using the peercapability was to
expand the choice of codecs for the call to increase the
chances of being able to native bridge the channels. The
problem is that if a codec were settled on for the native
bridge and that wasn't a codec that was configured to be used
by Asterisk for that peer, then Asterisk would send a
REINVITE with no codecs in the SDP which is a bug no matter
how you slice it.
(closes issue #13076)
Reported by: ramonpeek
Patches:
13076.patch uploaded by putnopvut (license 60)
Tested by: tbelder
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142080
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 9 Sep 2008 15:44:10 +0000 (15:44 +0000)]
Merged revisions 142063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142063 | russell | 2008-09-09 10:40:24 -0500 (Tue, 09 Sep 2008) | 5 lines
Ensure that the stored CDR reference is still valid after the bridge before
poking at it. Also, keep the channel locked while messing with this CDR.
(fixes crashes reported in issue #13409)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142064
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Bradley Latus [Tue, 9 Sep 2008 12:34:32 +0000 (12:34 +0000)]
Minor fix to doco
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142000
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 9 Sep 2008 12:32:38 +0000 (12:32 +0000)]
Use ast_debug for debug messages. I was wondering why debug
messages weren't showing up when I had set the debug level
high for just app_queue.c. It's because we were only checking
the global option_debug variable instead of using the awesome
macro which checks both the global and file-specific value
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141998
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 9 Sep 2008 10:20:58 +0000 (10:20 +0000)]
Fix a memory leak in chan_oss
(closes issue #13311)
Reported by: eliel
Patches:
chan_oss.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141995
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 9 Sep 2008 01:47:56 +0000 (01:47 +0000)]
Modify ast_answer() to not hold the channel lock while calling ast_safe_sleep()
or when calling ast_waitfor(). These are inappropriate times to hold the channel
lock. This is what has caused "could not get the channel lock" messages from
chan_sip and has likely caused a negative impact on performance results of SIP
in Asterisk 1.6. Thanks to file for pointing out this section of code.
(closes issue #13287)
(closes issue #13115)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141949
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 8 Sep 2008 23:00:06 +0000 (23:00 +0000)]
Optimization: The only reason we should check member
status is if the queue has a joinempty or a leavewhenempty
setting which could cause the caller to not join the queue
or exit the queue. Prior to this patch, we could potentially
traverse the entire queue's member list for no reason since
even if the members are currently not available in some way
we're going to let the caller join the queue anyway.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141906
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 8 Sep 2008 22:14:40 +0000 (22:14 +0000)]
Um, apparently I didn't actually finish merging before committing.
Bad bad bad
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141868
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 8 Sep 2008 21:18:49 +0000 (21:18 +0000)]
Merged revisions 141809 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141809 | mmichelson | 2008-09-08 16:10:10 -0500 (Mon, 08 Sep 2008) | 14 lines
Fix pedantic mode of chan_sip to only check the
remote tag of an endpoint once a dialog has
been confirmed. Up until that point, it is possible
and legal for the far-end to send provisional
responses with a different To: tag each time. With
this patch applied, these provisional messages
will not cause a matching problem.
(closes issue #11536)
Reported by: ibc
Patches:
11536v2.patch uploaded by putnopvut (license 60)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141810
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 8 Sep 2008 21:05:01 +0000 (21:05 +0000)]
Merged revisions 141806 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141806 | russell | 2008-09-08 16:02:36 -0500 (Mon, 08 Sep 2008) | 7 lines
When doing an async goto, detect if the channel is already in the middle of a
masquerade. This can happen when chan_local is trying to optimize itself out.
If this happens, fail the async goto instead of bursting into flames.
(closes issue #13435)
Reported by: geoff2010
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141807
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Mon, 8 Sep 2008 20:18:17 +0000 (20:18 +0000)]
Merged revisions 141741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141741 | qwell | 2008-09-08 15:15:42 -0500 (Mon, 08 Sep 2008) | 8 lines
Remove RPM package targets from Makefile (and all associated parts).
This has never worked in 1.4, and we decided that it makes no sense to be done here.
There are many distros out there that already have "proper" spec files that can be (re)used.
Closes issue #13113
Closes issue #10950
Closes issue #10952
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141745
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 8 Sep 2008 17:13:04 +0000 (17:13 +0000)]
Quote the arguments to grep so that sh on various platforms doesn't choke
on the special characters (like ^).
(closes issue #13417)
Reported by: dougm
Patches:
13417.make_buildopts_h.patch uploaded by seanbright (license 71)
Tested by: dougm
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141682
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 8 Sep 2008 16:26:48 +0000 (16:26 +0000)]
Blocked revisions 141678 via svnmerge
........
r141678 | russell | 2008-09-08 11:26:00 -0500 (Mon, 08 Sep 2008) | 4 lines
Actually use Zaptel CFLAGS if using Zaptel instead of DAHDI
This fixes building against Zaptel when using a custom path
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141679
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Sun, 7 Sep 2008 00:04:05 +0000 (00:04 +0000)]
make func_curl.c compile under devmode.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141626
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 6 Sep 2008 20:19:50 +0000 (20:19 +0000)]
Merged revisions 141565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141565 | murf | 2008-09-06 14:13:16 -0600 (Sat, 06 Sep 2008) | 1 line
This fix comes from Joshua Colp The Brilliant, who, given the trace, came up with a solution. This will most likely will close 13235 and 13409. I'll wait till Monday to verify, and then close these bugs.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141566
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 6 Sep 2008 15:40:15 +0000 (15:40 +0000)]
Get rid of the casts that cause warnings on OpenBSD. The compiler is errantly
detecting warnings when we redefine a structure each time it is used, even
though the structure is identical.
Reported by: mvanbaak, via #asterisk-dev
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141507
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 6 Sep 2008 15:26:45 +0000 (15:26 +0000)]
Merged revisions 141503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141503 | tilghman | 2008-09-06 10:23:42 -0500 (Sat, 06 Sep 2008) | 4 lines
Reverting behavior change (AGI should not exit non-zero on SUCCESS)
(closes issue #13434)
Reported by: francesco_r
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141504
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Sat, 6 Sep 2008 12:03:11 +0000 (12:03 +0000)]
Some fixes to autocompletion in some commands.
Changes applied by this patch:
- Fix autocompletion in 'sip prune realtime', sip peers where never auto completed. Now we complete this command with:
'sip prune realtime peer' -> all | like | sip peers
Also I have modified the syntax in the usage, was wrong...
- Pass ast_cli_args->argv and ast_cli_args->argc while running autocompletion on CLI commands (CLI_GENERATE).
With this we avoid comparisons on ast_cli_args->line like this:
strcasestr(a->line, " description")
strcasestr(a->line, "descriptions ")
strcasestr(a->line, "realtime peer"), and so on..
Making the code more confusing (check the spaces in description!).
The only thing we must be sure is to first check a->pos or a->argc.
- Fix 'iax2 prune realtime' autocompletion, now we autocomplete this command with 'all' & 'iax2 peers', check a look that iax2 peers where all the peers, now only the ones in the cache..
(closes issue #13133)
Reported by: eliel
Patches:
clichanges.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141464
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 5 Sep 2008 22:03:26 +0000 (22:03 +0000)]
Fix func_curl compilation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141425
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 5 Sep 2008 21:12:09 +0000 (21:12 +0000)]
Merged revisions 141366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141366 | mmichelson | 2008-09-05 16:10:32 -0500 (Fri, 05 Sep 2008) | 7 lines
Agent's should not try to call a channel's indicate callback
if the channel has been hung up. It will likely crash
otherwise
ABE-1159
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141367
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 5 Sep 2008 19:12:03 +0000 (19:12 +0000)]
Add the CURLOPT dialplan function, which permits setting various options for
use with the CURL dialplan function.
(closes issue #12920)
Reported by: davevg
Patches:
20080904__bug12920.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76, davevg
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141328
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 5 Sep 2008 16:36:48 +0000 (16:36 +0000)]
Blocked revisions 141267 via svnmerge
........
r141267 | mmichelson | 2008-09-05 11:35:54 -0500 (Fri, 05 Sep 2008) | 11 lines
Since greetings are not stored in IMAP, we should
not be DISPOSE'ing of them the same way we do with
other messages.
(closes issue #13414)
Reported by: mthomasslo
Patches:
13414v2.patch uploaded by putnopvut (license 60)
Tested by: mthomasslo
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141271
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 5 Sep 2008 16:03:11 +0000 (16:03 +0000)]
Blocked revisions 141217 via svnmerge
........
r141217 | mmichelson | 2008-09-05 11:00:24 -0500 (Fri, 05 Sep 2008) | 14 lines
Commit 140417 had a logic flaw in it which
caused port 5060 to always be used when dialing
a peer if no explicit port was specified. This
broke the behavior of implicitly using the port
from which the peer registered if no port is
specified. This commit fixes the logic flaw.
(closes issue #13424)
Reported by: mdu113
Patches:
13424.patch uploaded by putnopvut (license 60)
Tested by: mdu113
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141218
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Fri, 5 Sep 2008 14:18:43 +0000 (14:18 +0000)]
Merged revisions 141156 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141156 | murf | 2008-09-05 08:15:43 -0600 (Fri, 05 Sep 2008) | 1 line
A small change to prevent double-posting of CDR's; thanks to Daniel Ferrer for bringing it to our attention
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141157
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 4 Sep 2008 23:31:41 +0000 (23:31 +0000)]
Merged revisions 141094 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141094 | murf | 2008-09-04 17:15:07 -0600 (Thu, 04 Sep 2008) | 70 lines
(closes issue #13357)
Reported by: pj
Tested by: murf
(closes issue #13416)
Reported by: yarns
Tested by: murf
If you find this message overly verbose, relax, it's probably
not meant for you. This message is meant for probably only
two people in the whole world: me, or the poor schnook that
has to maintain this code because I'm either dead or unavailable
at the moment.
This fix solves two reports, both having to do with embedding
a function call in a ${} construct. It was tricky because the
funccall syntax has parenthesis () in it. And up till now,
the 'word' token in the flex stuff didn't allow that, because
it would tend to steal the LP and RP tokens. To be truthful,
the "word" token was the trickiest, most unstable thing in
the whole lexer. I was lucky it made this long without complaints.
I had to choose every character in the pattern with extreme
care, and I knew that someday I'd have to revisit it. Well,
the day has come.
So, my brilliant idea (and I'm being modest), was to use the
surrounding ${} construct to make a state machine and capture
everything in it, no matter what it contains. But, I have to now
treat the word token like I did with comments, in that I turn
the whole thing into a state-machine sort of spec, with new
contexts "curlystate", "wordstate", and "brackstate".
Wait a minute, "brackstate"? Yes, well, it didn't take very many
regression tests to point out if I do this for ${} constructs,
I also have to do it with the $[] constructs, too.
I had to create a separate pcbstack2 and pcbstack3 because
these constructs can occur inside macro argument lists, and
when we have two state machines operating on the same structures
we'd get problems otherwise. I guess I could have stopped at
pcbstack2 and had the brackstate stuff share it, but it doesn't
hurt to be safe. So, the pcbpush and pcbpop routines also now
have versions for "2" and "3".
I had to add the {KEYWORD} construct to the initial pattern for
"word", because previously word would match stuff like "default7",
because it was a longer match than the keyword "default". But,
not any more, because the word pattern only matches only one or
two characters now, and it will always lose. So, I made it the
winner again by making an optional match on any of the keywords
before it's normal pattern.
I added another regression test to make sure we don't
lose this in future edits, and had to fix just one regression,
where it no longer reports a 'cascaded' error, which I guess
is a plus.
I've given some thought as to whether to apply these fixes to
1.4 and the 1.6.x releases, vs trunk; I decided to put it in
1.4 because one of the bug reports was against 1.4; and it
is unexpected that AEL cannot handle this situation. It actually
reduced the amount of useless "cascade" error messages that
appeared in the regressions (by one line, ehhem). There is
a possible side-effect in that it does now do more careful
checking of what's in those ${} constructs, as far as matching
parens, and brackets are concerned. Some users may find a an
insidious problem and correct it this way. This should be
exceedingly rare, I hope.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141115
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Thu, 4 Sep 2008 17:27:56 +0000 (17:27 +0000)]
Merged revisions 141028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines
(closes issue #11979)
Fixes multiple parking problems:
Crash when executing a park on an extension dialed by AGI due to not returning the proper return code.
Crash when using a builtin feature that was a subset of a enabled dynamic feature.
Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141039
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 3 Sep 2008 20:16:12 +0000 (20:16 +0000)]
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/trunk@140975
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Wed, 3 Sep 2008 18:06:35 +0000 (18:06 +0000)]
Added 'skinny show lines verbose'
This will print the subs and their status for every line (if any).
wedhorn did most of the work with his patch which introduced
'skinny show debug' but a discussion on IRC stated that it should be
added to 'skinny show lines'
Input on the output format by Qwell on IRC.
(closes issue #13344)
Reported by: wedhorn
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140938
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 3 Sep 2008 14:41:54 +0000 (14:41 +0000)]
Fix compilation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140887
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 3 Sep 2008 14:31:33 +0000 (14:31 +0000)]
Merged revisions 140850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140850 | mmichelson | 2008-09-03 09:29:15 -0500 (Wed, 03 Sep 2008) | 9 lines
Fix voicemail forwarding when using ODBC storage.
(closes issue #13387)
Reported by: moliveras
Patches:
13387.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140860
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Wed, 3 Sep 2008 14:01:27 +0000 (14:01 +0000)]
In these changes, I have added some explanation
of changes to the Set and MSet apps, so people aren't
so shocked and surprised when they upgrade from
1.4 to 1.6.
Also, for the sake of those upgrading from 1.4 to
1.6 with AEL, I provide automatic support for the
"old" way of using Set(), that still does the
exact same old thing with quotes and backslashes
and so on as 1.4 did, by having AEL compile in the
use of MSet() instead of Set(), everywhere it inserts
this code.
But, if the app_set var is set to 1.6 or higher,
it uses the "new", non-evaluative Set().
This only usually happens if the user manually
inserts this into the asterisk.conf file, or runs
the "make samples" command.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140824
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Wed, 3 Sep 2008 13:48:12 +0000 (13:48 +0000)]
Move some duplicated code into a separate function.
Also try to do some wacky stuff in the commit message, like:
a newline \n
a bell \a
a tab \t
a format specification %p
That is all.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140821
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 3 Sep 2008 13:41:51 +0000 (13:41 +0000)]
Formatting change to test something on the svn server
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140820
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 3 Sep 2008 13:26:43 +0000 (13:26 +0000)]
Merged revisions 140816 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140816 | russell | 2008-09-03 08:24:35 -0500 (Wed, 03 Sep 2008) | 4 lines
Don't freak out if the poll emulation receives NULL for the pollfds array
(closes issue #13307)
Reported by: jcovert
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140817
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 2 Sep 2008 23:48:25 +0000 (23:48 +0000)]
Merged revisions 140751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140751 | mmichelson | 2008-09-02 18:47:49 -0500 (Tue, 02 Sep 2008) | 6 lines
After adding the context checking to app_voicemail
for IMAP storage, I left out a crucial place to
copy the context to the vm_state structure. This
is the correction.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140752
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 2 Sep 2008 23:44:04 +0000 (23:44 +0000)]
Merged revisions 140747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140747 | murf | 2008-09-02 17:36:56 -0600 (Tue, 02 Sep 2008) | 1 line
I am turning the warnings generated in ast_cdr_free and post_cdr into verbose level 2 messages. Really, they matter little to end users. You either get the CDR's you wanted, or you don't, and it is a bug.
For trunk, I am going one step further. These messages were pretty worthless even for debug, so I'm completely removing them.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140749
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 2 Sep 2008 22:55:12 +0000 (22:55 +0000)]
Merged revisions 140690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140690 | murf | 2008-09-02 16:40:13 -0600 (Tue, 02 Sep 2008) | 1 line
After reconsidering, with respect to 13409, ast_cdr_detach should be OK, better in fact, than ast_cdr_free, which generates lots of useless warnings that will undoubtably generate complaints.
Hmmm. It doesn't hush the useless warnings, but it does allow control of posting via the detach and post routines, for those possible situations,
where you'd want to post single-channel cdrs.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140692
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 2 Sep 2008 22:50:59 +0000 (22:50 +0000)]
Merged revisions 140670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140670 | murf | 2008-09-02 16:15:57 -0600 (Tue, 02 Sep 2008) | 14 lines
(closes issue #13409)
Reported by: tomaso
Patches:
asterisk-1.6.0-rc2-cdrmemleak.patch uploaded by tomaso (license 564)
I basically spent the day, verifying that this patch
solves the problem, and doesn't hurt in non-problem
cases. Why valgrind did not plainly reveal this leak
absolutely mystifies and stuns me.
Many, many thanks to tomaso for finding and providing the fix.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140691
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 2 Sep 2008 18:15:54 +0000 (18:15 +0000)]
Merged revisions 140605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140605 | seanbright | 2008-09-02 14:14:57 -0400 (Tue, 02 Sep 2008) | 8 lines
Make sure to use the correct length of the mohinterpret and mohsuggest
buffers when copying configuration values.
(closes issue #13336)
Reported by: decryptus_proformatique
Patches:
chan_iax2_mohinterpret_mohsuggest_general_settings.patch uploaded by decryptus (license 555)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140606
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 2 Sep 2008 15:11:53 +0000 (15:11 +0000)]
Update instructions for getting libresample
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140566
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 2 Sep 2008 15:09:20 +0000 (15:09 +0000)]
I'm not sure how these files got to trunk (probably my fault), but they
should not be here
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140563
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 2 Sep 2008 14:41:41 +0000 (14:41 +0000)]
When a call is rejected because of call-limit, the channel driver is behaving
as expected, so we shouldn't report it as an error. Change to LOG_NOTICE
instead.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140559
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Fri, 29 Aug 2008 17:53:32 +0000 (17:53 +0000)]
Added the option s to the Park application which will silence the announcement of the parking space number. Also, fixes the bug of just clearing the flags instead of actually parsing the arguments to Park.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140491
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 29 Aug 2008 17:47:17 +0000 (17:47 +0000)]
Merged revisions 140488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines
After working on the ao2_containers branch, I noticed
something a bit strange. In all cases where we provide
a callback function to ao2_container_alloc, the callback
function would only return 0 or CMP_MATCH. After inspecting
the ao2_callback() code carefully, I found that if you're
only looking for one specific item, then you should return
CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue
traversing the current bucket until the end searching for
more matches.
In cases like chan_iax2 where in 1.4, all the peers are
shoved into a single bucket, this makes for potentially
terrible performance since the entire bucket will be
traversed even if the peer is one of the first ones come
across in the bucket.
All the changes I have made were for cases where the
callback function defined was passed to ao2_container_alloc
so that calls to ao2_find could find a unique instance
of whatever object was being stored in the container.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140489
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 29 Aug 2008 16:24:37 +0000 (16:24 +0000)]
Allow for video files to be opened as well as
audio files.
(closes issue #13372)
Reported by: epicac
Patches:
13372.patch uploaded by putnopvut (license 60)
Tested by: epicac
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140433
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 29 Aug 2008 16:06:09 +0000 (16:06 +0000)]
Merged revisions 140421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140421 | mmichelson | 2008-08-29 11:01:07 -0500 (Fri, 29 Aug 2008) | 12 lines
Add context checking when retrieving a vm_state.
This was causing a problem for people who had identically
named mailboxes in separate voicemail contexts.
This commit affects IMAP storage only.
(closes issue #13194)
Reported by: moliveras
Patches:
13194.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140422
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 29 Aug 2008 15:32:02 +0000 (15:32 +0000)]
Merged revisions 140417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140417 | mmichelson | 2008-08-29 10:26:52 -0500 (Fri, 29 Aug 2008) | 10 lines
Fix SIP's parsing so that if a port is specified
in a string to Dial(), it is not ignored.
(closes issue #13355)
Reported by: acunningham
Patches:
13355v2.patch uploaded by putnopvut (license 60)
Tested by: acunningham
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140418
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 27 Aug 2008 23:23:56 +0000 (23:23 +0000)]
Oops
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140355
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 27 Aug 2008 20:11:22 +0000 (20:11 +0000)]
Merged revisions 140299 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140299 | mmichelson | 2008-08-27 14:49:20 -0500 (Wed, 27 Aug 2008) | 11 lines
Fix tag checking in get_sip_pvt_byid_locked when
in pedantic mode. The problem was that the wrong
tags would be compared depending on the direction
of the call.
(closes issue #13353)
Reported by: flefoll
Patches:
chan_sip.c.br14.139015.patch-refer-pedantic uploaded by flefoll (license 244)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140301
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Doug Bailey [Tue, 26 Aug 2008 21:59:31 +0000 (21:59 +0000)]
Move the mwi send thread functionality back into the do_monitor thread so that it is easier to manage CID spill resources when do_monitor needs to be killed.
(closes issue #13213)
Reported by: bbryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140246
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Tue, 26 Aug 2008 18:48:55 +0000 (18:48 +0000)]
Merged revisions 140056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140056 | jpeeler | 2008-08-26 10:57:02 -0500 (Tue, 26 Aug 2008) | 9 lines
(closes issue #12071)
Reported by: tzafrir
Patches:
dahdi_close.diff uploaded by tzafrir (license 46)
Tested by: tzafrir, jpeeler
This patch fixes closing open file descriptors in the case of an error.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140205
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 26 Aug 2008 18:46:07 +0000 (18:46 +0000)]
OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140201
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 26 Aug 2008 18:11:49 +0000 (18:11 +0000)]
Fix building menuselect-tree with PRINT_DIR set. We _must_ use the --quiet
flag here, or else some arbitrary text will end up in the resulting
menuselect-tree file and things will explode.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140169
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 26 Aug 2008 18:05:58 +0000 (18:05 +0000)]
Standardize the option names for consistency (but continue to work with the
existing names for backwards compatibility).
(closes issue #13370)
Reported by: jsturtevant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140167
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Tue, 26 Aug 2008 16:51:48 +0000 (16:51 +0000)]
Blocked revisions 140115 via svnmerge
........
r140115 | jpeeler | 2008-08-26 11:49:57 -0500 (Tue, 26 Aug 2008) | 1 line
add HAVE_PRI if define around dahdi_close_pri_fd
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140116
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 26 Aug 2008 16:10:06 +0000 (16:10 +0000)]
Merged revisions 140060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140060 | russell | 2008-08-26 11:07:58 -0500 (Tue, 26 Aug 2008) | 6 lines
Fix some bogus scheduler usage in chan_sip. This code used the return value
of a completely unrelated function to determine whether the scheduler should
be run or not. This would have caused the scheduler to not run in cases where
it should have. Also, leave a note about another scheduler issue that needs
to be addressed at some point.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140061
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 26 Aug 2008 15:57:49 +0000 (15:57 +0000)]
(closes issue #13366)
Reported by: erousseau
This was a reasonable enhancement request, which was
easy to implement. Since it's an enhancement, it
could only be applied to trunk.
Basically, for accounting where "initiated" seconds
are billed for, if the microseconds field on the end
time is greater than the microseconds field for the
answer time, add one second to the billsec field.
The implementation was requested by erousseau, and
I've implemented it as requested. I've updated the
CHANGES, the cdr.conf.sample, and the .h files
accordingly, to accept and set a flag for the
corresponding new option. cdr.c adds in the extra
second based on the usec fields if the option is
set. Tested, seems to be working fine.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140057
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 26 Aug 2008 15:29:25 +0000 (15:29 +0000)]
Merged revisions 140051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r140051 | russell | 2008-08-26 10:27:23 -0500 (Tue, 26 Aug 2008) | 15 lines
Fix a race condition with the IAX scheduler thread. A lock and condition are
used here to allow newly scheduled tasks to wake up the scheduler just in case
the new task needs to run sooner than the current wakeup time when the thread
is sleeping. However, there was a race condition such that a newly scheduled
task would not properly wake up the scheduler or affect the wake up period.
The order of execution would have been:
1) Scheduler thread determines wake up time of N ms.
2) Another thread schedules a task and signals the condition, with an
execution time of < N ms.
3) Scheduler thread locks and goes to sleep for N ms.
By moving the sleep time determination to inside the critical section, this
possibility is avoided.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140053
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Terry Wilson [Tue, 26 Aug 2008 15:27:46 +0000 (15:27 +0000)]
Blocked revisions 140050 via svnmerge
........
r140050 | twilson | 2008-08-26 10:22:58 -0500 (Tue, 26 Aug 2008) | 4 lines
sounds/Makefile installs sounds using the "new" language directory structure, but languageprefix needs to be set = yes for sounds in subdirectories (digits/1, etc.) to play as the correct language.
Fix the generation of asterisk.conf to include languageprefix=yes
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140052
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 25 Aug 2008 23:13:32 +0000 (23:13 +0000)]
Optional light colored background, for those who use black on white terminals.
(closes issue #13306)
Reported by: Corydon76
Patches:
20080814__bug13306__3.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76, pkempgen
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139981
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Mon, 25 Aug 2008 21:48:51 +0000 (21:48 +0000)]
Merged revisions 139927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139927 | jpeeler | 2008-08-25 16:47:33 -0500 (Mon, 25 Aug 2008) | 3 lines
Fix a typo I made. Lesson learned, apply the patch if one exists.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139928
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 25 Aug 2008 21:32:10 +0000 (21:32 +0000)]
Merged revisions 139909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139909 | seanbright | 2008-08-25 17:31:03 -0400 (Mon, 25 Aug 2008) | 9 lines
Some versions of awk (nawk, for example) don't like empty regular expressions
so be slightly more verbose.
(closes issue #13374)
Reported by: dougm
Patches:
13374.diff uploaded by seanbright (license 71)
Tested by: dougm
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139915
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Terry Wilson [Mon, 25 Aug 2008 20:59:58 +0000 (20:59 +0000)]
Merged revisions 139869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139869 | twilson | 2008-08-25 15:46:10 -0500 (Mon, 25 Aug 2008) | 2 lines
Make SIPADDHEADER() propagate indefinitely
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139870
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 25 Aug 2008 17:24:02 +0000 (17:24 +0000)]
Add output of variables to AgentRingNoAnswer manager
event if eventwhencalled is set to "vars" in
queues.conf. Yay for consistency.
(closes issue #13369)
Reported by: srt
Patches:
13369_agentringnoanswer_variables.diff uploaded by srt (license 378)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139832
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 25 Aug 2008 16:02:56 +0000 (16:02 +0000)]
Realtime capabilities for the Find-Me-Follow-Me application.
(closes issue #13295)
Reported by: Corydon76
Patches:
20080813__followme_realtime_enabled.diff.txt uploaded by Corydon76 (license 14)
Tested by: dferrer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139775
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 25 Aug 2008 15:55:10 +0000 (15:55 +0000)]
Blocked revisions 139769 via svnmerge
........
r139769 | mmichelson | 2008-08-25 10:52:59 -0500 (Mon, 25 Aug 2008) | 12 lines
Fix the logic in config_text_file_save so that if an
UpdateConfig manager action is issued and the
file specified in DstFileName does not yet exist,
an error is not returned.
(closes issue #13341)
Reported by: vadim
Patches:
13341.patch uploaded by putnopvut (license 60)
(with small modification from seanbright)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139771
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 25 Aug 2008 15:54:18 +0000 (15:54 +0000)]
Merged revisions 139764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines
This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.
I will un-close 13251.
Back to the drawing board/ concept/ beginning/ whatever!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139770
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sun, 24 Aug 2008 16:26:48 +0000 (16:26 +0000)]
Memory leak
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139707
65c4cc65-6c06-0410-ace0-
fbb531ad65f3