]> git.ipfire.org Git - thirdparty/asterisk.git/log
thirdparty/asterisk.git
17 years agoThanks to Russell's education I realize that BUFSIZ has changed since I learned the...
Olle Johansson [Tue, 22 Jan 2008 20:56:09 +0000 (20:56 +0000)] 
Thanks to Russell's education I realize that BUFSIZ has changed since I learned the C language
over 20 years ago... Resetting chan_sip to the size of BUFSIZ that I expected in my old
head to avoid to heavy memory allocations on some systems.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99652 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix the defines for OS X (and Solaris, too)
Tilghman Lesher [Tue, 22 Jan 2008 20:34:55 +0000 (20:34 +0000)] 
Fix the defines for OS X (and Solaris, too)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99643 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd more dependencies on chan_local and add a note to the description of chan_local
Olle Johansson [Tue, 22 Jan 2008 17:41:57 +0000 (17:41 +0000)] 
Add more dependencies on chan_local and add a note to the description of chan_local
so that people don't disable it in menuselect just to clean up.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99594 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd dependency on chan_local to app_dial.
Olle Johansson [Tue, 22 Jan 2008 17:31:17 +0000 (17:31 +0000)] 
Add dependency on chan_local to app_dial.

Dial still runs without chan_local, but will be missing forwarding functionality.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99592 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoEnsure that we can get an address even when we don't have a default route.
Tilghman Lesher [Tue, 22 Jan 2008 16:54:06 +0000 (16:54 +0000)] 
Ensure that we can get an address even when we don't have a default route.
(closes issue #9225)
 Reported by: junky
 Patches:
       20080122__bug9225.diff.txt uploaded by Corydon76 (license 14)
 Tested by: oej, loloski, sergee

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99540 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoCleaning up some documentation that led to confusion in a bug report
Olle Johansson [Tue, 22 Jan 2008 15:08:14 +0000 (15:08 +0000)] 
Cleaning up some documentation that led to confusion in a bug report

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99501 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFixing an issue wherein monitoring local channels was not possible. During a channel
Mark Michelson [Mon, 21 Jan 2008 23:55:26 +0000 (23:55 +0000)] 
Fixing an issue wherein monitoring local channels was not possible. During a channel
masquerade, the monitors on the two channels involved are swapped. In 99% of the cases
this results in the desired effect. However, if monitoring a local channel, this caused
the monitor which was on the local channel to get moved onto a channel which is immediately
hung up after the masquerade has completed. By swapping the monitors prior to the masquerade,
we avoid the problem by tricking the masquerade into placing the monitor back onto the channel
where we want it.

During the investigation of the issue, the channel's monitor was the only thing that was swapped
in such a manner which did not make sense to have done. All other variable swapping made sense.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99426 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoPermit the user to specify number of seconds that a connection may remain idle,
Tilghman Lesher [Mon, 21 Jan 2008 18:11:07 +0000 (18:11 +0000)] 
Permit the user to specify number of seconds that a connection may remain idle,
which fixes a crash on reconnect with the MyODBC driver.
(closes issue #11798)
 Reported by: Corydon76
 Patches:
       20080119__res_odbc__idlecheck.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99341 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoBump the buffer size for Via headers up to 512. There are some exceptionally large...
Joshua Colp [Mon, 21 Jan 2008 16:01:00 +0000 (16:01 +0000)] 
Bump the buffer size for Via headers up to 512. There are some exceptionally large Via headers out there.
(closes issue #11783)
Reported by: ofirroval

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99301 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix a couple of memory leaks with frame handling. Specifically,
Russell Bryant [Sat, 19 Jan 2008 10:05:27 +0000 (10:05 +0000)] 
Fix a couple of memory leaks with frame handling.  Specifically,
ast_frame_free() needed to be called on the frame that came from the translator
to signed linear.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99187 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoRemove the __ in front of the unused variable. This causes some compilers to freak...
Joshua Colp [Fri, 18 Jan 2008 22:57:15 +0000 (22:57 +0000)] 
Remove the __ in front of the unused variable. This causes some compilers to freak out.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99127 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoRevert adding the packed attribute, as it really doesn't make sense why that
Russell Bryant [Fri, 18 Jan 2008 21:37:21 +0000 (21:37 +0000)] 
Revert adding the packed attribute, as it really doesn't make sense why that
would do any good.  Fix the real bug, which is to do the check to see if the
frame came from a translator at the beginning of ast_frame_free(), instead of
at the end.  This ensures that it always gets checked, even if none of the
parts of the frame are malloc'd, and also ensures that we aren't looking at
free'd memory in the case that it is a malloc'd frame.

(closes issue #11792, reported by explidous, patched by me)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99081 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoSince we're relying on the offset between the frame and the beginning of the translator
Russell Bryant [Fri, 18 Jan 2008 21:22:21 +0000 (21:22 +0000)] 
Since we're relying on the offset between the frame and the beginning of the translator
pvt struct, set the packed attribute to make sure we get to the right place.
(potential fix for issue #11792)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99079 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoThis should at least temporarily fix a problem where the 't' Dial
Terry Wilson [Fri, 18 Jan 2008 17:13:00 +0000 (17:13 +0000)] 
This should at least temporarily fix a problem where the 't' Dial
option is incorrectly passed to the transferee when built-in
attended transfers are used.  There is still a problem with 'T',
but better to fix some problems than no problems while we work
on it.

(closes issue #7904)
Reported by: k-egg
Patches:
      transfer-fix-b14-r97657.diff uploaded by sergee (license 138)
Tested by: sergee, otherwiseguy

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99032 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agodoh! revert a revert of a revert (changed by mistake in 99010)
Pari Nannapaneni [Thu, 17 Jan 2008 23:42:45 +0000 (23:42 +0000)] 
doh! revert a revert of a revert (changed by mistake in 99010)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99014 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agomissed that one while reverting
Pari Nannapaneni [Thu, 17 Jan 2008 23:23:25 +0000 (23:23 +0000)] 
missed that one while reverting

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoreverting 99001 - We need the Max-Age for extending the life of cookie mansession_id
Pari Nannapaneni [Thu, 17 Jan 2008 23:09:53 +0000 (23:09 +0000)] 
reverting 99001 - We need the Max-Age for extending the life of cookie  mansession_id

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99007 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoHave IAX2 optimize the codec translation path just like chan_sip does it. If
Russell Bryant [Thu, 17 Jan 2008 22:37:22 +0000 (22:37 +0000)] 
Have IAX2 optimize the codec translation path just like chan_sip does it.  If
the caller's codec is in our codec list, move it to the top to avoid transcoding.

(closes issue #10500)
Reported by: stevedavies
Patches:
      iax-prefer-current-codec.patch uploaded by stevedavies (license 184)
      iax-prefer-current-codec.1.4.patch uploaded by stevedavies (license 184)
Tested by: stevedavies, pj, sheldonh

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99004 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agowe should only send the Set-Cookie header to the browser on the first response after...
Kevin P. Fleming [Thu, 17 Jan 2008 21:31:56 +0000 (21:31 +0000)] 
we should only send the Set-Cookie header to the browser on the first response after creating a manager session, not on every response (doing so causes the browser to clear any local cookies it may have associated with the session)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99001 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd a clarification about the immediate= option of zapata.conf
Jason Parker [Thu, 17 Jan 2008 16:19:46 +0000 (16:19 +0000)] 
Add a clarification about the immediate= option of zapata.conf

Issue 11784, patch by klaus3000.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98991 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd an unused pointer to the ast_channel struct. This makes the ast_channel structure
Russell Bryant [Wed, 16 Jan 2008 22:36:24 +0000 (22:36 +0000)] 
Add an unused pointer to the ast_channel struct.  This makes the ast_channel structure
retain the same size as it had in previous 1.4 releases.  Also, all of the offsets for
members in the structure are still the same (except for the two pointers that got replaced
for the new spy/whisper architecture.)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98982 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoBump up cleancount due to previous commit that changed the channel structure.
Joshua Colp [Wed, 16 Jan 2008 20:34:30 +0000 (20:34 +0000)] 
Bump up cleancount due to previous commit that changed the channel structure.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98973 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoReplace current spy architecture with backport of audiohooks. This should take care...
Joshua Colp [Wed, 16 Jan 2008 20:33:47 +0000 (20:33 +0000)] 
Replace current spy architecture with backport of audiohooks. This should take care of current known spy issues.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98972 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd missing NULLs at end of two ast_load_realtimes.
Joshua Colp [Wed, 16 Jan 2008 17:50:10 +0000 (17:50 +0000)] 
Add missing NULLs at end of two ast_load_realtimes.
(closes issue #11769)
Reported by: tequ
Patches:
      chaniax.patch uploaded by dimas (license 88)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98966 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix a deadlock in chan_local in local_hangup. There was contention because
Mark Michelson [Wed, 16 Jan 2008 17:20:11 +0000 (17:20 +0000)] 
Fix a deadlock in chan_local in local_hangup. There was contention because
the local_pvt was held and it was attempting to lock a channel, which is the
incorrect locking order.

(closes issue #11730)
Reported by: UDI-Doug
Patches:
      11730.patch uploaded by putnopvut (license 60)
  Tested by: UDI-Doug

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98964 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIntroduce a lock into the dialing API that protects it when destroying the structure.
Joshua Colp [Wed, 16 Jan 2008 15:08:24 +0000 (15:08 +0000)] 
Introduce a lock into the dialing API that protects it when destroying the structure.
(closes issue #11687)
Reported by: callguy
Patches:
      11687.diff uploaded by file (license 11)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98960 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd two more SDP names for ulaw and alaw.
Joshua Colp [Wed, 16 Jan 2008 15:03:14 +0000 (15:03 +0000)] 
Add two more SDP names for ulaw and alaw.
(closes issue #11777)
Reported by: tootai

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98958 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't drop the old record route information when dealing with packets related to...
Joshua Colp [Wed, 16 Jan 2008 03:07:24 +0000 (03:07 +0000)] 
Don't drop the old record route information when dealing with packets related to a reinvite.
(closes issue #11545)
Reported by: kebl0155
Patches:
      reinvite-patch.txt uploaded by kebl0155 (license 356)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98955 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd autoconf logic for speexdsp. Later versions use a separate library for some thing...
Joshua Colp [Wed, 16 Jan 2008 01:13:27 +0000 (01:13 +0000)] 
Add autoconf logic for speexdsp. Later versions use a separate library for some things so we need to use it if present in codec_speex.
(closes issue #11693)
Reported by: yzg

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoChange a buffer in check_auth() to be a thread local dynamically allocated
Russell Bryant [Tue, 15 Jan 2008 23:50:10 +0000 (23:50 +0000)] 
Change a buffer in check_auth() to be a thread local dynamically allocated
buffer, instead of a massive buffer on the stack.  This fixes a crash reported
by Qwell due to running out of stack space when building with LOW_MEMORY defined.

On a very related note, the usage of BUFSIZ in various places in chan_sip is
arbitrary and careless.  BUFSIZ is a system specific define.  On my machine,
it is 8192, but by definition (according to google) could be as small as 256.
So, this buffer in check_auth was 16 kB.  We don't even support SIP messages
larger than 4 kB!  Further usage of this define should be avoided, unless it
is used in the proper context.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoCommit a fix for some memory access errors pointed out by the valgrind2.txt
Russell Bryant [Tue, 15 Jan 2008 23:26:52 +0000 (23:26 +0000)] 
Commit a fix for some memory access errors pointed out by the valgrind2.txt
output on issue #11698.

The issue here is that it is possible for an instance of a translator to get
destroyed while the frame allocated as a part of the translator is still being
processed.  Specifically, this is possible anywhere between a call to ast_read()
and ast_frame_free(), which is _a lot_ of places in the code.  The reason this
happens is that the channel might get masqueraded during this time.  During a
masquerade, existing translation paths get destroyed.

So, this patch fixes the issue in an API and ABI compatible way.  (This one is
 for you, paravoid!)

It changes an int in ast_frame to be used as flag bits.  The 1 bit is still used
to indicate that the frame contains timing information.  Also, a second flag has
been added to indicate that the frame came from a translator.  When a frame with
this flag gets released and has this flag, a function is called in translate.c to
let it know that this frame is doing being processed.  At this point, the flag gets
cleared.  Also, if the translator was requested to be destroyed while its internal
frame still had this flag set, its destruction has been deffered until it finds out
that the frame is no longer being processed.

Admittedly, this feels like a hack.  But, it does fix the issue, and I was not able
to think of a better solution ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoBased on the boundary found move over the correct amount.
Joshua Colp [Tue, 15 Jan 2008 20:08:43 +0000 (20:08 +0000)] 
Based on the boundary found move over the correct amount.
(closes issue #11750)
Reported by: tasker

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98934 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAccept "; boundary=" not just ";boundary=" in the multipart mixed content type.
Joshua Colp [Mon, 14 Jan 2008 22:41:55 +0000 (22:41 +0000)] 
Accept "; boundary=" not just ";boundary=" in the multipart mixed content type.
(closes issue #11750)
Reported by: tasker

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98894 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdding in appropriate unlocks for the locks I added. Thanks to joetester on IRC
Mark Michelson [Mon, 14 Jan 2008 20:59:26 +0000 (20:59 +0000)] 
Adding in appropriate unlocks for the locks I added. Thanks to joetester on IRC
for pointing this out.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98849 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoRevert a change that introduces an unacceptable performance hit and is causing
Russell Bryant [Mon, 14 Jan 2008 17:38:38 +0000 (17:38 +0000)] 
Revert a change that introduces an unacceptable performance hit and is causing
memory leaks ... (from rev 97973)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98774 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFixing another compilation error. I'm a bit off today :(
Mark Michelson [Mon, 14 Jan 2008 16:35:12 +0000 (16:35 +0000)] 
Fixing another compilation error. I'm a bit off today :(

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98737 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoOops. Last commit had compilation error.
Mark Michelson [Mon, 14 Jan 2008 16:30:33 +0000 (16:30 +0000)] 
Oops. Last commit had compilation error.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98734 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdding explicit defaults for missing options to init_queue. This is necessary because
Mark Michelson [Mon, 14 Jan 2008 16:21:28 +0000 (16:21 +0000)] 
Adding explicit defaults for missing options to init_queue. This is necessary because
if a user either removes or comments one of these options and reloads their queues, the
option will not reset to its default, instead maintaining the value from prior to the
reload.

Thanks to John Bigelow for pointing this error out to me.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98733 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd a connection timeout attribute, as that was what was intended with the
Tilghman Lesher [Sat, 12 Jan 2008 00:05:08 +0000 (00:05 +0000)] 
Add a connection timeout attribute, as that was what was intended with the
login timeout, but ODBC divides it up into 2 different timeouts.
(Closes issue #11745)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98467 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix up setting the EID on BSD based systems.
Russell Bryant [Fri, 11 Jan 2008 22:46:21 +0000 (22:46 +0000)] 
Fix up setting the EID on BSD based systems.

(closes issue #11646)
Reported by: caio1982
Patches:
      dundi_osx_eid6.diff.txt uploaded by caio1982 (license 22)
      dundi_osx_eid6-1.4.diff uploaded by caio1982 (license 22)
Tested by: caio1982, mvanbaak

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98390 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoComment explaining how to force browser to always read some html files from server.
Pari Nannapaneni [Fri, 11 Jan 2008 21:28:48 +0000 (21:28 +0000)] 
Comment explaining how to force browser to always read some html files from server.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98372 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIf the incoming RTP stream changes codec force the bridge to break if the other side...
Joshua Colp [Fri, 11 Jan 2008 19:51:10 +0000 (19:51 +0000)] 
If the incoming RTP stream changes codec force the bridge to break if the other side does not support it.
(closes issue #11729)
Reported by: tsearle
Patches:
      new_codec_patch_udiff.patch uploaded by tsearle (license 373)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98325 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIf the channel is hungup during RECORD FILE send a result code of -1 to be uniform...
Joshua Colp [Fri, 11 Jan 2008 19:28:30 +0000 (19:28 +0000)] 
If the channel is hungup during RECORD FILE send a result code of -1 to be uniform with everything else.
(closes issue #11743)
Reported by: davevg
Patches:
      res_agi.diff uploaded by davevg (license 209)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98317 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoProperly report the hangup cause as no answer when someone does not answer
Mark Michelson [Fri, 11 Jan 2008 19:10:57 +0000 (19:10 +0000)] 
Properly report the hangup cause as no answer when someone does not answer

(closes issue #10574, reported by boch, patched by moy)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98315 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAdd another exception (which doesn't work) for -march optimization flag.
Tilghman Lesher [Fri, 11 Jan 2008 18:25:44 +0000 (18:25 +0000)] 
Add another exception (which doesn't work) for -march optimization flag.
Reported by: thomasmebes
Patch by: tilghman
(Closes issue #11563)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98266 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoBackport the ability to set the ToS bits on Linux when not running as root.
Russell Bryant [Fri, 11 Jan 2008 18:25:30 +0000 (18:25 +0000)] 
Backport the ability to set the ToS bits on Linux when not running as root.
Normally, we would not backport features into 1.4, but, I was convinced by the
justification supplied by the supplier of this patch.  He pointed out that this
patch removes a requirement for running as root, thus reducing the potential
impacts of security issues.

(closes issue #11742)
Reported by: paravoid
Patches:
      libcap.diff uploaded by paravoid (license 200)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98265 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoEnsure the return value of ast_bridge_call is passed back up as the application retur...
Joshua Colp [Fri, 11 Jan 2008 17:22:53 +0000 (17:22 +0000)] 
Ensure the return value of ast_bridge_call is passed back up as the application return value. This is needed for transfers to function so the PBX core knows to continue execution.
(closes issue #10327)
Reported by: kkiely

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98219 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoBack out changes from revision 97077, since it wasn't perfect
Tilghman Lesher [Fri, 11 Jan 2008 15:52:31 +0000 (15:52 +0000)] 
Back out changes from revision 97077, since it wasn't perfect

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98164 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix samples vs. length calculations for g722
Russell Bryant [Fri, 11 Jan 2008 03:39:33 +0000 (03:39 +0000)] 
Fix samples vs. length calculations for g722

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98082 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoSimplify this code with a suggestion from Luigi on the asterisk-dev list.
Russell Bryant [Fri, 11 Jan 2008 00:14:59 +0000 (00:14 +0000)] 
Simplify this code with a suggestion from Luigi on the asterisk-dev list.
Instead of using is16kHz(), implement a format_rate() function.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@98025 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix various timing calculations that made assumptions that the audio being
Russell Bryant [Thu, 10 Jan 2008 23:30:40 +0000 (23:30 +0000)] 
Fix various timing calculations that made assumptions that the audio being
processed was at a sample rate of 8 kHz.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97976 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years ago1) When we get a translated frame out, clone it, because if the
Tilghman Lesher [Thu, 10 Jan 2008 23:08:36 +0000 (23:08 +0000)] 
1) When we get a translated frame out, clone it, because if the
translator pvt is freed before we use the frame, bad things happen.
2) Getting a failure from ast_sched_delete means that the schedule
ID is currently running.  Don't just ignore it.
(Closes issue #11698)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97973 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoLet us leave a voicemail for ourself if we have logged into VoiceMailMain and chosen
Mark Michelson [Thu, 10 Jan 2008 21:57:06 +0000 (21:57 +0000)] 
Let us leave a voicemail for ourself if we have logged into VoiceMailMain and chosen
to leave a message.

(closes issue #11735, reported and patched by jamessan)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97925 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoApplied the same fixes for ael.flex as was done in 97849 for ast_expr2.fl; overrode...
Steve Murphy [Thu, 10 Jan 2008 21:37:10 +0000 (21:37 +0000)] 
Applied the same fixes for ael.flex as was done in 97849 for ast_expr2.fl; overrode the normally generate yyfree func with our own version that checks the pointer for non-null before passing to free(). Also takes care of a little problem with 2.5.33 and the use of the __STDC_VERSION__ macro.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97889 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoThis is a fix for 2 things: a problem Terry was having in OSX with null pointers...
Steve Murphy [Thu, 10 Jan 2008 20:21:27 +0000 (20:21 +0000)] 
This is a fix for 2 things: a problem Terry was having in OSX with null pointers, which was my fault, as I probably forgot to run the sed script last time I made mods. So, I moved the fix into the flex input itself. Then, I found when I used flex 2.5.33, that it was using __STDC_VERSION__, and that's not real good; so I added back in a DIFFERENT sed script to fix that little mess. Tested everything, a couple different ways. Hope I did no harm, at the least.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97849 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix a comment that is no longer true.
Jason Parker [Thu, 10 Jan 2008 20:12:37 +0000 (20:12 +0000)] 
Fix a comment that is no longer true.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97847 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoRemove other remnants of pbx_kdeconsole
Russell Bryant [Thu, 10 Jan 2008 16:19:47 +0000 (16:19 +0000)] 
Remove other remnants of pbx_kdeconsole

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97753 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoRemove pbx_kdeconsole from the tree. It hasn't worked in ages, and nobody has
Russell Bryant [Thu, 10 Jan 2008 16:10:09 +0000 (16:10 +0000)] 
Remove pbx_kdeconsole from the tree.  It hasn't worked in ages, and nobody has
complained.
(closes issue #11706, reported by caio1982)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97734 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't try to copy the category from the group if no category exists.
Joshua Colp [Thu, 10 Jan 2008 15:07:12 +0000 (15:07 +0000)] 
Don't try to copy the category from the group if no category exists.
(closes issue #11724)
Reported by: IgorG
Patches:
      group_count.v1.patch uploaded by IgorG (license 20)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97697 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoStrip terminal sequences from the verbose messages
Russell Bryant [Wed, 9 Jan 2008 23:01:48 +0000 (23:01 +0000)] 
Strip terminal sequences from the verbose messages

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97645 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMake pbx_gtkconsole build ... but doesn't actually load on my system still
Russell Bryant [Wed, 9 Jan 2008 22:26:33 +0000 (22:26 +0000)] 
Make pbx_gtkconsole build ... but doesn't actually load on my system still
(related to issue #11706)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97640 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoCorrectly display a message if a command could not be found.
Jason Parker [Wed, 9 Jan 2008 20:28:43 +0000 (20:28 +0000)] 
Correctly display a message if a command could not be found.
Also fix a comment which may have led to this happening.

Issue 11718, reported by kshumard.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97622 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix some locking and return value funkiness. We really shouldn't be unlocking this...
Jason Parker [Wed, 9 Jan 2008 20:05:45 +0000 (20:05 +0000)] 
Fix some locking and return value funkiness.  We really shouldn't be unlocking this lock inside of a function, unless we locked it there too.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97618 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoPart 2 of app_queue doxygen improvements. Some smaller functions this time
Mark Michelson [Wed, 9 Jan 2008 18:48:15 +0000 (18:48 +0000)] 
Part 2 of app_queue doxygen improvements. Some smaller functions this time

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97575 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix saying the parking space number to the caller doing the parking ...
Russell Bryant [Wed, 9 Jan 2008 18:02:08 +0000 (18:02 +0000)] 
Fix saying the parking space number to the caller doing the parking ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97529 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoreport the same message whether Zaptel does not have transcoder support loaded or...
Kevin P. Fleming [Wed, 9 Jan 2008 17:21:14 +0000 (17:21 +0000)] 
report the same message whether Zaptel does not have transcoder support loaded or no transcoders were found

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97491 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoSet the caller id within the gtalk_alloc function.
Philippe Sultan [Wed, 9 Jan 2008 16:44:24 +0000 (16:44 +0000)] 
Set the caller id within the gtalk_alloc function.

As underlined in issue #10437 by Josh, we need to prevent a possible
memory leak. We only set the name part of the caller id, the number
part is not relevant when dealing with JIDs.

Closes issue #11549.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97489 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't do conferencing totally in Zaptel if Monitor is running on the channel.
Joshua Colp [Wed, 9 Jan 2008 16:11:17 +0000 (16:11 +0000)] 
Don't do conferencing totally in Zaptel if Monitor is running on the channel.
(closes issue #11709)
Reported by: BigJimmy
Patches:
      patch-meetmerec uploaded by BigJimmy (license 371)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97450 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agopass the right variable to get an error string... oops
Kevin P. Fleming [Wed, 9 Jan 2008 15:43:19 +0000 (15:43 +0000)] 
pass the right variable to get an error string... oops

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97448 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoadd error number output to ioctl failure messages to help with debugging
Kevin P. Fleming [Wed, 9 Jan 2008 15:26:23 +0000 (15:26 +0000)] 
add error number output to ioctl failure messages to help with debugging

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97410 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAllow filename completion on zero-length modules, remove a memory leak, remove
Tilghman Lesher [Wed, 9 Jan 2008 00:44:14 +0000 (00:44 +0000)] 
Allow filename completion on zero-length modules, remove a memory leak, remove
a file descriptor leak, and make filename completion thread-safe.
Patched and tested by tilghman.
(Closes issue #11681)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97350 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agouse the \retval doxygen command properly
Mark Michelson [Wed, 9 Jan 2008 00:17:40 +0000 (00:17 +0000)] 
use the \retval doxygen command properly

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97308 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoPart 1 of N of adding doxygen comments to app_queue. I picked some of the most common...
Mark Michelson [Tue, 8 Jan 2008 23:49:11 +0000 (23:49 +0000)] 
Part 1 of N of adding doxygen comments to app_queue. I picked some of the most common functions
used (which also happen to be some the biggest/ugliest functions too) to document first. I'm pretty
new to doxygen so criticism is welcome.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97304 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoSome coding guidelines-related cleanup
Mark Michelson [Tue, 8 Jan 2008 21:24:48 +0000 (21:24 +0000)] 
Some coding guidelines-related cleanup

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97206 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix various DTMF issues in chan_mgcp.
Joshua Colp [Tue, 8 Jan 2008 20:48:20 +0000 (20:48 +0000)] 
Fix various DTMF issues in chan_mgcp.
(closes issue #11443)
Reported by: eferro
Patches:
      dtmf_control_hybrid-inband-mode.patch uploaded by eferro (license 337)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97195 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIncrease constants to where we're less likely to hit them while debugging.
Tilghman Lesher [Tue, 8 Jan 2008 20:47:07 +0000 (20:47 +0000)] 
Increase constants to where we're less likely to hit them while debugging.
(Closes issue #11694)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97194 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMaking some changes designed to not allow for a corrupted mailstream for a vm_state.
Mark Michelson [Tue, 8 Jan 2008 20:42:07 +0000 (20:42 +0000)] 
Making some changes designed to not allow for a corrupted mailstream for a vm_state.

1. Add locking to the vm_state retrieval functions so that no linked list corruption occurs.
2. Make sure to always grab the persistent vm_state when mailstream access is necessary.
3. Correct an incorrect return value in the init_mailstream function.

(closes issue #11304, reported by dwhite)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97192 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIf no group has been provided to the GROUP_COUNT dialplan function then use the first...
Joshua Colp [Tue, 8 Jan 2008 19:53:52 +0000 (19:53 +0000)] 
If no group has been provided to the GROUP_COUNT dialplan function then use the first one specific to the channel.
(closes issue #11077)
Reported by: m4him

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97152 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMake app_queue calls work with directed pickup.
Joshua Colp [Tue, 8 Jan 2008 18:36:40 +0000 (18:36 +0000)] 
Make app_queue calls work with directed pickup.
(closes issue #11700)
Reported by: jbauer

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97093 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoApply multiple crash fixes, found in issue #11386, but not completely
Tilghman Lesher [Tue, 8 Jan 2008 18:02:13 +0000 (18:02 +0000)] 
Apply multiple crash fixes, found in issue #11386, but not completely
closing that issue.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97077 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMerged revisions 96931 via svnmerge from
Russell Bryant [Mon, 7 Jan 2008 20:47:52 +0000 (20:47 +0000)] 
Merged revisions 96931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r96931 | russell | 2008-01-07 14:46:22 -0600 (Mon, 07 Jan 2008) | 2 lines

Change misery.digium.com to pbx.digium.com

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96932 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't crash if something happens when setting up an SMDI interface and it gets
Russell Bryant [Mon, 7 Jan 2008 16:39:23 +0000 (16:39 +0000)] 
Don't crash if something happens when setting up an SMDI interface and it gets
destroyed before the SMDI port handling thread gets created.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96884 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIndentation fix, makes the code easier to read
Philippe Sultan [Mon, 7 Jan 2008 14:34:36 +0000 (14:34 +0000)] 
Indentation fix, makes the code easier to read

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96815 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoCompute the base64 value over the [authzid]\0authcid\0password string,
Philippe Sultan [Mon, 7 Jan 2008 14:25:29 +0000 (14:25 +0000)] 
Compute the base64 value over the [authzid]\0authcid\0password string,
thus excluding the trailing NULL byte.

This change has already been committed to trunk, see #11644.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96797 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't pass an empty string as the device name.
Russell Bryant [Sat, 5 Jan 2008 02:09:19 +0000 (02:09 +0000)] 
Don't pass an empty string as the device name.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96644 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoFix the problem of notification of a device state change to a device with a '-'
Tilghman Lesher [Fri, 4 Jan 2008 23:03:40 +0000 (23:03 +0000)] 
Fix the problem of notification of a device state change to a device with a '-'
in the name.  Could probably do with a better fix in trunk, but this bug has
been open way too long without a better solution.
Reported by: stevedavies
Patch by: tilghman
(Closes issue #9668)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96575 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoProperly continue in the dialplan if using PARKINGEXTEN and the slot is full.
Jason Parker [Fri, 4 Jan 2008 22:55:56 +0000 (22:55 +0000)] 
Properly continue in the dialplan if using PARKINGEXTEN and the slot is full.

Issue 11237, patch by me.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96573 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoIf you change the bindaddr in sip.conf to a non-bound address and reload, sip goes...
Tilghman Lesher [Fri, 4 Jan 2008 19:27:25 +0000 (19:27 +0000)] 
If you change the bindaddr in sip.conf to a non-bound address and reload, sip goes kablooie.
Reported and patched by: one47
(Closes issue #11535)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96525 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMake use of the temporary channel pointer while the pvt is unlocked.
Russell Bryant [Fri, 4 Jan 2008 16:19:22 +0000 (16:19 +0000)] 
Make use of the temporary channel pointer while the pvt is unlocked.

(closes issue #11675)
Reported by: flefoll
Patches:
      chan_zap.c.patch-store-owner-before-unlock uploaded by flefoll (license 244)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96449 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoDon't crash if the iax2 pvt structure has been destroyed before we get to this point
Russell Bryant [Thu, 3 Jan 2008 22:44:22 +0000 (22:44 +0000)] 
Don't crash if the iax2 pvt structure has been destroyed before we get to this point
(closes issue #11672, reported by snuffy, patched by me)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96394 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoMissed initialization caused crash.
Tilghman Lesher [Thu, 3 Jan 2008 21:37:02 +0000 (21:37 +0000)] 
Missed initialization caused crash.
Reported and fixed by: tiziano
(Closes issue #11671)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96318 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agomake sure frame is completely clean, before we send it to asterisk as DTMF. If we...
Christian Richter [Thu, 3 Jan 2008 12:12:27 +0000 (12:12 +0000)] 
make sure frame is completely clean, before we send it to asterisk as DTMF. If we don't make it clean, it happens that one way audio occurs..

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96199 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agowhen overlapdial was used and no number was dialed, the call was dropped, now we...
Christian Richter [Thu, 3 Jan 2008 12:08:40 +0000 (12:08 +0000)] 
when overlapdial was used and no number was dialed, the call was dropped, now we just jump into the s extension, which makes a lot more sense.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96198 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoWe need to reset the membername to NULL on each iteration of this loop, otherwise...
Mark Michelson [Wed, 2 Jan 2008 23:46:02 +0000 (23:46 +0000)] 
We need to reset the membername to NULL on each iteration of this loop, otherwise the result is that
multiple members can have the same name, since the variable was not reset on each iteration of the loop.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96102 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoConvert locks of the contexts list in pbx_config to the appropriate rdlock or wrlock
Russell Bryant [Wed, 2 Jan 2008 22:14:28 +0000 (22:14 +0000)] 
Convert locks of the contexts list in pbx_config to the appropriate rdlock or wrlock

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96024 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agopbx_dundi only needs a rdlock on the contexts list.
Russell Bryant [Wed, 2 Jan 2008 22:04:47 +0000 (22:04 +0000)] 
pbx_dundi only needs a rdlock on the contexts list.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96022 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoapp_macro only needs a rdlock on the contexts list.
Russell Bryant [Wed, 2 Jan 2008 22:00:21 +0000 (22:00 +0000)] 
app_macro only needs a rdlock on the contexts list.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96020 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAllocate a SIP refer structure when performing a transfer using BYE with Also so...
Joshua Colp [Wed, 2 Jan 2008 20:24:09 +0000 (20:24 +0000)] 
Allocate a SIP refer structure when performing a transfer using BYE with Also so that the transfer information is properly stored. (AST-2008-001)
(closes issue #11637)
Reported by: greyvoip

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@95946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoA change to improve the accuracy of queue logging in the case where a member does not
Mark Michelson [Wed, 2 Jan 2008 17:51:22 +0000 (17:51 +0000)] 
A change to improve the accuracy of queue logging in the case where a member does not
answer during the specified timeout period. Prior to this change, there was a small chance
that the member name recorded in this case would be blank. Also prior to this change, if using
the ringall strategy, if no one answered the call during the specified timeout, the member name
listed in the queue log would randomly be one of the members that was rung.

(closes issue #11498, reported and tested by hloubser, patched by me)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@95890 65c4cc65-6c06-0410-ace0-fbb531ad65f3

17 years agoAvoiding a potentially bad locking situation. ast_merge_contexts_and_delete writelock...
Mark Michelson [Mon, 31 Dec 2007 23:43:13 +0000 (23:43 +0000)] 
Avoiding a potentially bad locking situation. ast_merge_contexts_and_delete writelocks the conlock, then
calls ast_hint_extension, which attempts to readlock the same lock. Recursion with read-write locks is
dangerous, so the inner lock needs to be removed. I did this by copying the "guts" of ast_hint_extension
into ast_merge_contexts_and_delete (sans the extra lock).

(this change is inspired by the locking problems seen in issue #11080, but I have no idea if this is the
problematic area experienced by the reporters of that issue)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@95577 65c4cc65-6c06-0410-ace0-fbb531ad65f3