]> git.ipfire.org Git - thirdparty/asterisk.git/log
thirdparty/asterisk.git
14 years agowhite space change
Jonathan Rose [Tue, 12 Apr 2011 18:19:41 +0000 (18:19 +0000)] 
white space change

........

  reload Chan_dahdi memory leak caused by variables

  chan_dahdi reloading with variables set via setvar in chan_dahdi.conf would
  stay in the dahdi_pvt structs for individual channels (causing them to just
  continue adding the new ones to the list) and also there was a memory leak
  causes by the conf objects. This patch resolves both of these by using
  ast_variables_destroy during the loading process.

  (closes issue #17450)
  Reported by: nahuelgreco

  Patches:
  patch.diff uploaded by jrose (license 1225)
  Tested by: tilghman, jrose

  Review: https://reviewboard.asterisk.org/r/1170/

........

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

14 years agofixes reload Chan_dahdi memory leak caused by variables
Jonathan Rose [Tue, 12 Apr 2011 18:12:29 +0000 (18:12 +0000)] 
fixes reload Chan_dahdi memory leak caused by variables

chan_dahdi reloading with variables set via setvar in chan_dahdi.conf would
stay in the dahdi_pvt structs for individual channels (causing them to just
continue adding the new ones to the list) and also there was a memory leak
causes by the conf objects. This patch resolves both of these by using
ast_variables_destroy during the loading process.

(closes issue #17450)
Reported by: nahuelgreco
Patches:
patch.diff uploaded by jrose (license 1225)
Tested by: tilghman, jrose

Review: https://reviewboard.asterisk.org/r/1170/

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

14 years agoMerged revisions 313277 via svnmerge from
Leif Madsen [Mon, 11 Apr 2011 19:33:03 +0000 (19:33 +0000)] 
Merged revisions 313277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r313277 | lmadsen | 2011-04-11 14:30:20 -0500 (Mon, 11 Apr 2011) | 6 lines

  Fix detection of OpenSSL 1.0

  (closes issue #19093)
  Reported by: tzafrir
  Patches:
        detect_openssl_10.diff uploaded by tzafrir (license 46)
........

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

14 years agoMerged revisions 313188 via svnmerge from
Richard Mudgett [Mon, 11 Apr 2011 15:32:53 +0000 (15:32 +0000)] 
Merged revisions 313188 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r313188 | rmudgett | 2011-04-11 10:27:52 -0500 (Mon, 11 Apr 2011) | 25 lines

  Stuck channel using FEATD_MF if caller hangs up at the right time.

  The cause was actually a caller hanging up just at the end of the Feature
  Group D DTMF tones that setup the call.  The reason for this is a "guard
  timer" that's implemented using ast_safe_sleep(100).  If the caller
  happens to hang up AFTER the final tone of the DTMF string but BEFORE the
  end of that ast_safe_sleep(), then ast_safe_sleep() will return non-zero.
  This causes the code to bounce to the end of ss_thread(), but it does NOT
  tear down the call properly.

  This should be a rare occurrence because the caller has to hang up at
  EXACTLY the right time.  Nonetheless, it was happening quite regularly on
  the reporter's system.  It's not easily reproducible, unless you purposely
  increase the guard-time to 2000 or more.  Once you do that, you can
  reproduce it every time by watching the DTMF debug and hanging up just as
  it ends.

  Simply add an ast_hangup() before goto quit.

  (closes issue #15671)
  Reported by: jcromes
  Patches:
        issue15671.patch uploaded by pabelanger (license 224)
  Tested by: jcromes
........

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

14 years agoMakes parking lots clear and rebuild properly when features reload is invoked from CLI
Jonathan Rose [Thu, 7 Apr 2011 13:23:01 +0000 (13:23 +0000)] 
Makes parking lots clear and rebuild properly when features reload is invoked from CLI

Before, default parkinglot in context parkedcalls with ext 700 would always be present and when reload was invoked, the previous parkinglots would not be cleared.

(closes issue #18801)
Reported by: mickecarlsson

Review: https://reviewboard.asterisk.org/r/1161/

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

14 years agoapp_voicemail: close_mailbox change LOG_WARNING to LOG_NOTICE
Alec L Davis [Thu, 7 Apr 2011 10:26:13 +0000 (10:26 +0000)] 
app_voicemail: close_mailbox change LOG_WARNING to LOG_NOTICE

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

14 years agoMerged revisions 312761 via svnmerge from
Matthew Nicholson [Tue, 5 Apr 2011 14:13:07 +0000 (14:13 +0000)] 
Merged revisions 312761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r312761 | mnicholson | 2011-04-05 09:10:34 -0500 (Tue, 05 Apr 2011) | 8 lines

  Limit the number of unauthenticated manager sessions and also limit the time they have to authenticate.

  AST-2011-005

  (closes issue #18996)
  Reported by: tzafrir
  Tested by: mnicholson
........

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

14 years agoBackporting trunk change to add verbosity to 'L' option in meetme
Jonathan Rose [Tue, 5 Apr 2011 14:11:36 +0000 (14:11 +0000)] 
Backporting trunk change to add verbosity to 'L' option in meetme

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

14 years agoMerged revisions 312573 via svnmerge from
Richard Mudgett [Mon, 4 Apr 2011 16:00:02 +0000 (16:00 +0000)] 
Merged revisions 312573 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r312573 | rmudgett | 2011-04-04 10:49:30 -0500 (Mon, 04 Apr 2011) | 38 lines

  Issues with ISDN calls changing B channels during call negotiations.

  The handling of the PROCEEDING message was not using the correct call
  structure if the B channel was changed.  (The same for PROGRESS.) The call
  was also not hungup if the new B channel is not provisioned or is busy.

  * Made all call connection messages (SETUP_ACKNOWLEDGE, PROCEEDING,
  PROGRESS, ALERTING, CONNECT, CONNECT_ACKNOWLEDGE) ensure that they are
  using the correct structure and B channel.  If there is any problem with
  the operations then the call is now hungup with an appropriate cause code.

  * Made miscellaneous messages (INFORMATION, FACILITY, NOTIFY) find the
  correct structure by looking for the call and not using the channel ID.
  NOTIFY is an exception with versions of libpri before v1.4.11 because a
  call pointer is not available for Asterisk to use.

  * Made all hangup messages (DISCONNECT, RELEASE, RELEASE_COMPLETE) find
  the correct structure by looking for the call and not using the channel
  ID.

  (closes issue #18313)
  Reported by: destiny6628
  Tested by: rmudgett
  JIRA SWP-2620

  (closes issue #18231)
  Reported by: destiny6628
  Tested by: rmudgett
  JIRA SWP-2924

  (closes issue #18488)
  Reported by: jpokorny
  JIRA SWP-2929

  JIRA AST-437 (The issues fixed here are most likely causing this JIRA issue.)
  JIRA DAHDI-406
  JIRA LIBPRI-33 (Stuck resetting flag likely fixed)
........

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

14 years agoMerged revisions 312285 via svnmerge from
Tilghman Lesher [Fri, 1 Apr 2011 10:51:24 +0000 (10:51 +0000)] 
Merged revisions 312285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines

  Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code.

  (issue #18969)
   Reported by: oej
   Patches:
         20110315__issue18969__14.diff.txt uploaded by tilghman (license 14)
........

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

14 years agofix up bad merge46 extra 2 yuck: labels
Alec L Davis [Fri, 1 Apr 2011 09:16:26 +0000 (09:16 +0000)] 
fix up bad merge46 extra 2 yuck: labels

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

14 years agoMerged revisions 312174 via svnmerge from
Alec L Davis [Fri, 1 Apr 2011 08:47:29 +0000 (08:47 +0000)] 
Merged revisions 312174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r312174 | alecdavis | 2011-04-01 21:29:49 +1300 (Fri, 01 Apr 2011) | 23 lines

  voicemail: get real last_message_index and count_messages, ODBC resequence

  change last_message_index to read the max msgnum stored in the database
  change count_messages to actually count the number of messages.

  last_message_index change:
    This fixed overwriting of the last message if msgnum=0 was missing.
    Previously every incoming message would overwrite msgnum=1.
  count_messages change:
    allows us to detect when requencing is required in opneA_mailbox.
  resequence enabled for ODBC storage:
    Assists with fixing up corrupt databases with gaps, but only when
    a user actively opens there mailboxes.

  (closes issue #18692,#18582,#19032)
  Reported by: elguero
  Patches:
        based on odbc_resequence_mailbox2.1.diff uploaded by elguero (license 37)
  Tested by: elguero, nivek, alecdavis

  Review: https://reviewboard.asterisk.org/r/1153/
........

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

14 years agoMerged revisions 312070 via svnmerge from
Alec L Davis [Fri, 1 Apr 2011 07:25:54 +0000 (07:25 +0000)] 
Merged revisions 312070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r312070 | alecdavis | 2011-04-01 19:46:56 +1300 (Fri, 01 Apr 2011) | 16 lines

  app_voicemail: close_mailbox needs to respect additional messages while mailbox is open.

  close_mailbox leave gaps in message sequence if messages are deleted and new messages
  arrive during this time, this is because the shuffle down to slot 0, only shuffles
  the number of pre-existing messages when mailbox is opened, ignoring new arrivals.

  Fix: in close_mailbox re-evaluate number of messages before the shuffle, this then includes new arrivals.

  Happens on filebased or ODBC storage.

  (issues #19032,#18582,#18692,#18998)
  Reported by: alecdavis,tootai,afosorio

  Review: https://reviewboard.asterisk.org/r/1153/
........

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

14 years agoWhen comebacktoorigin=no, Asterisk no longer tries to dial extension <Originating...
Jonathan Rose [Tue, 29 Mar 2011 13:17:01 +0000 (13:17 +0000)] 
When comebacktoorigin=no, Asterisk no longer tries to dial extension <Originating Channe>@parkedcalltimeout and instead dials s without going through fallback.

(closes issue #18650)
Reported by: davidw
Patches:
      patch.diff uploaded by jrose (license 1225)

https://reviewboard.asterisk.org/r/1150/

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

14 years agoFixes memory leak in MeetMe AMI action
David Vossel [Tue, 22 Mar 2011 15:24:45 +0000 (15:24 +0000)] 
Fixes memory leak in MeetMe AMI action

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

14 years agoBlocked revisions 311201 via svnmerge
Matthew Nicholson [Mon, 21 Mar 2011 20:57:00 +0000 (20:57 +0000)] 
Blocked revisions 311201 via svnmerge

........
  r311201 | mnicholson | 2011-03-17 14:09:37 -0500 (Thu, 17 Mar 2011) | 4 lines

  Don't dec the usecount of an eventqent then use it.

  ABE-2756
........

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

14 years agoBlocked revisions 311199 via svnmerge
Matthew Nicholson [Mon, 21 Mar 2011 20:54:09 +0000 (20:54 +0000)] 
Blocked revisions 311199 via svnmerge

........
  r311199 | mnicholson | 2011-03-17 14:06:24 -0500 (Thu, 17 Mar 2011) | 4 lines

  Remove the provisional keepalive scheduler entry's reference to the pvt when we remove the scheduler entry.

  ABE-2756
........

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

14 years agoDon't write items to the manager socket twice.
Matthew Nicholson [Thu, 17 Mar 2011 14:58:52 +0000 (14:58 +0000)] 
Don't write items to the manager socket twice.

AST-2011-003

(closes issue 0018987)
Reported by: ks-steven

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

14 years agoMerged revisions 311048 via svnmerge from
Alec L Davis [Thu, 17 Mar 2011 10:45:47 +0000 (10:45 +0000)] 
Merged revisions 311048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r311048 | alecdavis | 2011-03-17 23:43:35 +1300 (Thu, 17 Mar 2011) | 12 lines

  Remove extra quote in indications.conf

  Picking low hanging fruit.

  (closes issue #18971)
  Reported by: IgorG
  Patches:
        based on indications.conf.sample.diff uploaded by IgorG (license 20)
  Tested by: IgorG
........

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

14 years agoFix crash on fdopen failure
Terry Wilson [Wed, 16 Mar 2011 19:46:36 +0000 (19:46 +0000)] 
Fix crash on fdopen failure

See security advisory AST-2011-004

(closes issue #18845)
Reported by: cmaj
Patches:
    patch-main-tcptls-1.8.3-rc2-open-session-crash-take2.diff.txt uploaded by cmaj (license 830)
    patch-main-tcptls-1.8.3-rc2-open-session-crash-take3.diff.txt uploaded by cmaj (license 830)
Tested by: cmaj, twilson

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

14 years agoRevert patch with accidental reversion of a previous patch
Terry Wilson [Wed, 16 Mar 2011 19:45:10 +0000 (19:45 +0000)] 
Revert patch with accidental reversion of a previous patch

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

14 years agoFix crash on fdopen failure
Terry Wilson [Wed, 16 Mar 2011 19:37:54 +0000 (19:37 +0000)] 
Fix crash on fdopen failure

See security advisory AST-2011-004

(closes issue #18845)
Reported by: cmaj
Patches:
     patch-main-tcptls-1.8.3-rc2-open-session-crash-take2.diff.txt uploaded by cmaj (license 830)
     patch-main-tcptls-1.8.3-rc2-open-session-crash-take3.diff.txt uploaded by cmaj (license 830)
Tested by: cmaj, twilson

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

14 years agoDon't keep trying to write to a closed connection
Terry Wilson [Wed, 16 Mar 2011 19:23:03 +0000 (19:23 +0000)] 
Don't keep trying to write to a closed connection

See security advisory AST-2011-003.

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

14 years agoMerged revisions 310888 via svnmerge from
Terry Wilson [Wed, 16 Mar 2011 17:03:27 +0000 (17:03 +0000)] 
Merged revisions 310888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r310888 | twilson | 2011-03-16 11:58:42 -0500 (Wed, 16 Mar 2011) | 29 lines

  Don't delay DTMF in core bridge while listening for DTMF features

  This patch is mostly the work of Olle Johansson. I did some cleanup and
  added the silence generating code if transmit_silence is set.

  When a channel listens for DTMF in the core bridge, the outbound DTMF is not
  sent until we have received DTMF_END. For a long DTMF, this is a disaster. We
  send 4 seconds of DTMF to Asterisk, which sends no audio for those 4 seconds.
  Some products see this delay and the time skew on RTP packets that results and
  start ignoring the audio that is sent afterward.

  With this change, the DTMF_BEGIN frame is inspected and checked. If it matches
  a feature code, we wait for DTMF_END and activate the feature as before. If
  transmit_silence=yes in asterisk.conf, silence is sent if we paritally match a
  multi-digit feature. If it doesn't match a feature, the frame is forwarded
  along with the DTMF_END without delay. By doing it this way, DTMF is not delayed.

  (closes issue #15642)
  Reported by: jasonshugart
  Patches:
        issue_15652_dtmf_ast-1.4.patch.txt uploaded by twilson (license 396)
  Tested by: globalnetinc, jde

  (closes issue #16625)
  Reported by: sharvanek

  Review: https://reviewboard.asterisk.org/r/1092/
  Review: https://reviewboard.asterisk.org/r/1125/
........

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

14 years agoMerged revisions 310779 via svnmerge from
Alec L Davis [Tue, 15 Mar 2011 00:31:56 +0000 (00:31 +0000)] 
Merged revisions 310779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r310779 | alecdavis | 2011-03-15 13:26:09 +1300 (Tue, 15 Mar 2011) | 10 lines

  core show locks: display ThreadID in hexadecimal

  Allow easier cross referencing of thread ID's with GDB backtraces

  (closes issue #18968)
  Reported by: alecdavis
  Patches:
        bug18968.diff.txt uploaded by alecdavis (license 585)
........

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

14 years agoMerged revisions 310633 via svnmerge from
Richard Mudgett [Mon, 14 Mar 2011 16:47:54 +0000 (16:47 +0000)] 
Merged revisions 310633 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r310633 | rmudgett | 2011-03-14 11:38:24 -0500 (Mon, 14 Mar 2011) | 25 lines

  "Caller*ID failed checksum" on Wildcard TDM2400P and TDM410

  The last character in the caller id message is getting a framing error.

  The checksum is the last character in the message.  A framing error in the
  checksum could be because:
  1) The sender did not send a full stop bit.
  2) The sender cut off the FSK carrier too soon.
  3) The sender opted to send zero of the specified zero to 10 trailing mark
  bits and round-off errors in the code resulted in the code not being where
  it thought it was in the demodulated bit stream.

  Bit 8 of 'b' is set when parity error.
  Bit 9 of 'b' is set when framing error.

  Made ignore the framing and parity error bits if the errored character is
  the checksum.  We can tolerate a framing/parity error there.  The checksum
  character validates the message.

  (closes issue #18474)
  Reported by: nivek
  Patches:
        callerid.c.1.patch uploaded by nivek (license 636) (with modifications)
  Tested by: nivek
........

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

14 years agoAdds 'p' as an option to func_volume. When it is on, the old behavior with DTMF...
Jonathan Rose [Mon, 14 Mar 2011 13:56:22 +0000 (13:56 +0000)] 
Adds 'p' as an option to func_volume.  When it is on, the old behavior with DTMF controlling volume adjustment will be enforced.
When it is off, DTMF will not be processed by the function.

Programmed by Jonathan Rose
Reviewed by David Vossel, Leif Madsen, and Russell Bryant

http://reviewboard.digium.internal/r/93/

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

14 years agoRecorded merge of revisions 310435 via svnmerge from
Tilghman Lesher [Sat, 12 Mar 2011 20:24:54 +0000 (20:24 +0000)] 
Recorded merge of revisions 310435 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r310435 | tilghman | 2011-03-12 14:22:07 -0600 (Sat, 12 Mar 2011) | 31 lines

  Add AELSub, which provides a stable entry point into AEL subroutines.

  This commit needs some explanation, given that we're adding a new application
  into an existing release branch.  This is generally a violation of our release
  policy, except in very limited circumstances, and I believe this is one of
  those circumstances.

  The problem that this solves is one of the sanity of using multiple dialplan
  languages to define a dialplan.  In the case of the reporter, he or she is
  using AEL is define subroutines, while using Realtime extensions to invoke
  those subroutines.  While you can do this, it's based upon the reality of AEL
  using actual dialplan extensions; however, there is no guarantee that the
  details of _how_ AEL is compiled into extensions will remain stable.  In fact,
  at the time of this commit, it has already changed twice, once in a
  fundamental way.

  Now normally, a new application would only be added to trunk.  However, this
  application is explicitly to create a stable user-level API between versions,
  and adding it to trunk only will not solve the user's problem of switching
  between 1.6.2 and 1.8, nor will it help anybody switching from 1.8 to 1.10.
  Therefore, it needs to go into existing release branches.  For the sake of
  consistency, and also because one of the changes was between 1.4 and 1.6.x,
  I am also electing to commit this to 1.4.

  (closes issue #18910)
   Reported by: alexandrekeller
   Patches:
         20110304__issue18919__1.6.2.diff.txt uploaded by tilghman (license 14)
         20110304__issue18919__1.4.diff.txt uploaded by tilghman (license 14)
   Tested by: alexandrekeller
........

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

14 years agoTransactional handles should be used for the insertbuf, if available.
Tilghman Lesher [Sat, 12 Mar 2011 19:51:23 +0000 (19:51 +0000)] 
Transactional handles should be used for the insertbuf, if available.

Also, fix a possible resource leak.

(closes issue #18943)
 Reported by: irroot

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

14 years agoMerged revisions 310140 via svnmerge from
Tilghman Lesher [Thu, 10 Mar 2011 05:51:37 +0000 (05:51 +0000)] 
Merged revisions 310140 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r310140 | tilghman | 2011-03-09 23:38:44 -0600 (Wed, 09 Mar 2011) | 5 lines

  Initialize column size to 0 to deal with a potential UnixODBC bug on 64-bit systems.

  (closes issue #18295)
   Reported by: pruiz
........

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

14 years agoMerged revisions 309856 via svnmerge from
Jonathan Rose [Mon, 7 Mar 2011 22:04:44 +0000 (22:04 +0000)] 
Merged revisions 309856 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r309856 | jrose | 2011-03-07 16:02:12 -0600 (Mon, 07 Mar 2011) | 8 lines

  Bug fix for MixMonitor involving filenames with '.' not in the extension

  Closes issue #18391)
  Reported by: pabelanger
  Patches:
  Â Â Â Â Â  bugfix.patch uploaded by jrose (license 1225)
  Tested by: jrose
........

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

14 years agoMissed part of the conversion when we started passing ppid to astcanary.
Tilghman Lesher [Sat, 5 Mar 2011 10:28:24 +0000 (10:28 +0000)] 
Missed part of the conversion when we started passing ppid to astcanary.

(closes issue #18850)
 Reported by: viraptor
 Patches:
       canary_ppid.patch uploaded by viraptor (license 543)

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

14 years agoRestore mysterious lua_pushvalue() call removed in r309494. The mystery has been...
Matthew Nicholson [Fri, 4 Mar 2011 19:37:13 +0000 (19:37 +0000)] 
Restore mysterious lua_pushvalue() call removed in r309494.  The mystery has been solved.

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

14 years agoCheck for errors from fseek() when loading config file, properly abort on errors...
Matthew Nicholson [Fri, 4 Mar 2011 18:59:20 +0000 (18:59 +0000)] 
Check for errors from fseek() when loading config file, properly abort on errors from fread(), and supply a traceback for errors generated when loading the config file.

Also, prepend a newline to traceback output so that the main error message is on it's own line.

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

14 years agoremove mysterious lua_pushvalue() that is never used
Matthew Nicholson [Fri, 4 Mar 2011 17:55:57 +0000 (17:55 +0000)] 
remove mysterious lua_pushvalue() that is never used

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

14 years agoMerged revisions 309355 via svnmerge from
David Ruggles [Fri, 4 Mar 2011 00:42:28 +0000 (00:42 +0000)] 
Merged revisions 309355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r309355 | diruggles | 2011-03-03 19:34:13 -0500 (Thu, 03 Mar 2011) | 9 lines

  fix small memory leak

  fix small memory leak caused by a string allocation that wasn't freed

  (closes issue #18907)
  Reported by: andy11
  Patches:
        asterisk_trunk-app_externalivr-leak.patch uploaded by andy11 (license 1224)
........

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

14 years agoUpdate PickupChan documentation.
Leif Madsen [Thu, 3 Mar 2011 20:13:11 +0000 (20:13 +0000)] 
Update PickupChan documentation.
The PickupChan uses the ampersand as the argument separator.
(closes issue #18905)
Reported by: vmikhnevych
Tested by: vmikhnevych

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

14 years agoFix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP.
Jason Parker [Wed, 2 Mar 2011 19:53:47 +0000 (19:53 +0000)] 
Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP.

Since it's a duplicate, nothing is going to be done, so delme doesn't need to
be set at all.  Strangely, when this was added, this was being set to 1 in 1.6,
and 0 in trunk.

(issue AST-439)

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

14 years agoRevert previous 2 commits, and instead conditionally redefine the same macro used...
Tilghman Lesher [Wed, 2 Mar 2011 01:06:02 +0000 (01:06 +0000)] 
Revert previous 2 commits, and instead conditionally redefine the same macro used in flex 2.5.35 that clashed with our workaround.

Not surprisingly, the workaround was exactly the same code as was provided by
the Flex maintainers, albeit in two different places, in different macros.

This should fix the FreeBSD builds, which have an older version of Flex.

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

14 years agoFixes thread blocking issue in the sip TCP/TLS implementation.
David Vossel [Tue, 1 Mar 2011 16:05:25 +0000 (16:05 +0000)] 
Fixes thread blocking issue in the sip TCP/TLS implementation.

(closes issue #18497)
Reported by: vois
Patches:
      issues_18497.diff uploaded by dvossel (license 671)
Tested by: vois, rossbeer, kowalma, Freddi_Fonet

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

14 years agoClarify meaning, removing double negative (stupid!)
Tilghman Lesher [Mon, 28 Feb 2011 11:07:52 +0000 (11:07 +0000)] 
Clarify meaning, removing double negative (stupid!)

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

14 years agoA later version of flex already includes the fwrite workaround code, which if used...
Tilghman Lesher [Mon, 28 Feb 2011 10:43:12 +0000 (10:43 +0000)] 
A later version of flex already includes the fwrite workaround code, which if used twice causes a compilation error.

Detect whether Flex will compile without the workaround; if so, suppress our workaround code.

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

14 years agoStatements updating zero rows may return SQL_NO_DATA. This is fine; it's handled.
Tilghman Lesher [Mon, 28 Feb 2011 09:32:22 +0000 (09:32 +0000)] 
Statements updating zero rows may return SQL_NO_DATA.  This is fine; it's handled.

(closes issue #18815)
 Reported by: irroot
 Patches:
       func_odbc.insert_nodata.patch uploaded by irroot (license 52)

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

14 years agoMerged revisions 308813 via svnmerge from
Terry Wilson [Thu, 24 Feb 2011 17:54:49 +0000 (17:54 +0000)] 
Merged revisions 308813 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r308813 | twilson | 2011-02-24 11:42:16 -0600 (Thu, 24 Feb 2011) | 12 lines

  Don't broadcast FullyBooted to every AMI connection

  The FullyBooted event should not be sent to every AMI connection every
  time someone connects via AMI. It should only be sent to the user who
  just connected.

  (closes issue #18168)
  Reported by: FeyFre
  Patches:
        bug0018168.patch uploaded by FeyFre (license 1142)
  Tested by: FeyFre, twilson
........

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

14 years agoMerged revisions 308721 via svnmerge from
Matthew Nicholson [Thu, 24 Feb 2011 14:59:41 +0000 (14:59 +0000)] 
Merged revisions 308721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r308721 | mnicholson | 2011-02-24 08:54:56 -0600 (Thu, 24 Feb 2011) | 2 lines

  silence gcc 4.2 compiler warning
........

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

14 years agoUse remotesecret to authenticate with a remote party
Terry Wilson [Thu, 24 Feb 2011 03:38:22 +0000 (03:38 +0000)] 
Use remotesecret to authenticate with a remote party

The remotesecret option was only being used for outbound registration
and not for placing calls. This patch uses remotesecret on outbound
calls if it is set, otherwise secret is still used.

Review: https://reviewboard.asterisk.org/r/1107/

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

14 years agoMerge missing bugfix for issue #11583
Terry Wilson [Thu, 24 Feb 2011 01:15:08 +0000 (01:15 +0000)] 
Merge missing bugfix for issue #11583

This is the combination of two commits that made it into 1.4, 1.6.0,
1.6.1, and trunk (and therefor 1.8) but that was missed for 1.6.2.

........
  r183386 | dvossel | 2009-03-19 14:40:07 -0500 (Thu, 19 Mar 2009) | 6 lines

  Cleaning up a few things in detect disconnect patch

  Initialized ast_call_feature in detect_disconnect to avoid accessing uninitialized memory.  Cleaned up /param tags in features.h.  No longer send dynamic features in ast_feature_detect.

  issue #11583
........
........
  r183126 | dvossel | 2009-03-19 11:15:16 -0500 (Thu, 19 Mar 2009) | 17 lines

  Allow disconnect feature before a call is bridged

  feature.conf has a disconnect option.  By default this option is set to '*', but it could be anything.  If a user wishes to disconnect a call before the other side answers, only '*' will work, regardless if the disconnect option is set to something else.  This is because features are unavailable until bridging takes place.  The default disconnect option, '*', was hardcoded in app_dial, which doesn't make any sense from a user perspective since they may expect it to be something different.  This patch allows features to be detected from outside of the bridge, but not operated on.  In this case, the disconnect feature can be detected before briding and handled outside of features.c.

  (closes issue #11583)
  Reported by: sobomax
  Patches:
   patch-apps__app_dial.c uploaded by sobomax (license 359)
   11583.latest-patch uploaded by murf (license 17)
   detect_disconnect.diff uploaded by dvossel (license 671)
  Tested by: sobomax, dvossel
  Review: http://reviewboard.digium.com/r/195/
........

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

14 years agoAdd HTTP URI log, use ast_debug for console logging
Andrew Latham [Tue, 22 Feb 2011 15:37:29 +0000 (15:37 +0000)] 
Add HTTP URI log, use ast_debug for console logging

Guessed the log levels based on info that level 3
is the soft roof.  Can we create a page / document
to define the levels?

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

14 years agoMerged revisions 308413 via svnmerge from
Matthew Nicholson [Mon, 21 Feb 2011 15:00:22 +0000 (15:00 +0000)] 
Merged revisions 308413 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r308413 | mnicholson | 2011-02-21 08:57:15 -0600 (Mon, 21 Feb 2011) | 5 lines

  Properly check the bounds of arrays when decoding UDPTL packets.  Also, remove broken support for receiving UDPTL packets larger than 16k.  That shouldn't ever happen anyway.

  AST-2011-002
  FAX-281
........

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

14 years agoAdd CSS MIME Type
Andrew Latham [Sat, 19 Feb 2011 14:03:15 +0000 (14:03 +0000)] 
Add CSS MIME Type

Modern browsers are checking for the MIME Type of pages
and in some cases will not load a file if the type is
wrong.

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

14 years agoMerged revisions 308002 via svnmerge from
Jason Parker [Tue, 15 Feb 2011 23:33:24 +0000 (23:33 +0000)] 
Merged revisions 308002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r308002 | qwell | 2011-02-15 17:32:20 -0600 (Tue, 15 Feb 2011) | 10 lines

  Fix regression that changed behavior of queues when ringing a queue member.

  This reverts r298596, which was to fix a highly bizarre and contrived issue
  with a queue member that called into his own queue being transferred back
  into his own queue.  I couldn't reproduce that issue in any way.  I think one
  of the other recent transfer fixes actually fixed this.

  (closes issue #18747)
  Reported by: vrban
........

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

14 years agoNeed to retrieve the rows affected before using the associated variable.
Tilghman Lesher [Tue, 15 Feb 2011 07:01:37 +0000 (07:01 +0000)] 
Need to retrieve the rows affected before using the associated variable.

(closes issue #18795)
 Reported by: irroot
 Patches:
       20110211__issue18795.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman

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

14 years agoIncrement usage count at first reference, to avoid a race condition with many threads...
Tilghman Lesher [Mon, 14 Feb 2011 20:10:28 +0000 (20:10 +0000)] 
Increment usage count at first reference, to avoid a race condition with many threads creating connections all at once.

(issue #18156)
 Reported by: asgaroth
 Patches:
       20110214__issue18156.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman

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

14 years agoMerged revisions 307623 via svnmerge from
Richard Mudgett [Fri, 11 Feb 2011 01:02:22 +0000 (01:02 +0000)] 
Merged revisions 307623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r307623 | rmudgett | 2011-02-10 18:29:17 -0600 (Thu, 10 Feb 2011) | 13 lines

  Reentrancy problem if outgoing call gets different B channel than requested.

  The chan_dahdi pri_fixup_principle() routine needs to protect the Asterisk
  channel with the channel lock when it changes the technology private
  pointer to a new private structure.

  * Added lock protection while pri_fixup_principle() moves a call from one
  private structure to another.

  * Made some pri_fixup_principle() messages more meaningful.

  Partial backport from v1.8 -r300714.
........

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

14 years agoMerged revisions 307534 via svnmerge from
Jason Parker [Thu, 10 Feb 2011 22:35:49 +0000 (22:35 +0000)] 
Merged revisions 307534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r307534 | qwell | 2011-02-10 16:33:09 -0600 (Thu, 10 Feb 2011) | 8 lines

  Remove color when executing commands via a remote console.

  Essentially this makes '-x' imply '-n' on rasterisk.  This was done in a
  different and incomplete way previously, which I'm reverting here.

  (issue #18776)
  Reported by: alecdavis
........

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

14 years agoDisable color during running test
Andrew Latham [Wed, 9 Feb 2011 21:48:45 +0000 (21:48 +0000)] 
Disable color during running test

(closes issue #18776)
Reported by: alecdavis
Patches:
     ast_deb_init.diff uploaded by lathama (license 1028)
Tested by: andrel, lathama

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

14 years agoMake sure to set parking dial context for non-default parking lots.
Jeff Peeler [Wed, 9 Feb 2011 19:52:12 +0000 (19:52 +0000)] 
Make sure to set parking dial context for non-default parking lots.

Since parking_con_dial isn't settable, set all parking lots to "park-dial".

(closes issue #17946)
Reported by: bluecrow76
Patches:
      asterisk-1.8.0-beta4-multipark-fixes-2010SEP02.diff uploaded by bluecrow76 (license 270)
      modified by me

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

14 years agoMerged revisions 306972 via svnmerge from
Terry Wilson [Tue, 8 Feb 2011 20:14:09 +0000 (20:14 +0000)] 
Merged revisions 306972 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306972 | twilson | 2011-02-08 12:05:13 -0800 (Tue, 08 Feb 2011) | 2 lines

  Fix comparison for REFER Replaces tags with pedantic=yes
........

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

14 years agoMerged revisions 306965 via svnmerge from
Jeff Peeler [Tue, 8 Feb 2011 19:41:21 +0000 (19:41 +0000)] 
Merged revisions 306965 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306965 | jpeeler | 2011-02-08 13:40:58 -0600 (Tue, 08 Feb 2011) | 1 line

  fix this line again
........

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

14 years agoMerged revisions 306960 via svnmerge from
Jeff Peeler [Tue, 8 Feb 2011 19:25:10 +0000 (19:25 +0000)] 
Merged revisions 306960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306960 | jpeeler | 2011-02-08 13:18:50 -0600 (Tue, 08 Feb 2011) | 9 lines

  Backup file storing message duration is not used with IMAP_STORAGE, remove code.

  The message duration is stored in the body of the email when using IMAP_STORAGE,
  so nothing needs to happen with the backup file.

  (closes issue #18718)
  Reported by: kerframil
........

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

14 years agoMerged revisions 306864 via svnmerge from
Jeff Peeler [Tue, 8 Feb 2011 16:21:25 +0000 (16:21 +0000)] 
Merged revisions 306864 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306864 | jpeeler | 2011-02-08 10:19:17 -0600 (Tue, 08 Feb 2011) | 1 line

  make this safer and fully correct, pointed out by Steve Davis
........

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

14 years agoMerged revisions 306672 via svnmerge from
Terry Wilson [Mon, 7 Feb 2011 22:40:20 +0000 (22:40 +0000)] 
Merged revisions 306672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306672 | twilson | 2011-02-07 14:35:20 -0800 (Mon, 07 Feb 2011) | 10 lines

  Don't try to pickup a call in the middle of a masquerade

  If A calls B which doesn't answer and C & D both try to do a call pickup, it is
  possible for ast_pickup_call to answer the call, then fail to masquerade one of
  the calls because the other one is already in the process of masquerading. This
  patch checks to see if the channel is in the process of masquerading before
  call before selecting it for a pickup.

  Review: https://reviewboard.asterisk.org/r/1094/
........

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

14 years agoMerged revisions 306617 via svnmerge from
Terry Wilson [Mon, 7 Feb 2011 21:59:54 +0000 (21:59 +0000)] 
Merged revisions 306617 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306617 | twilson | 2011-02-07 13:51:43 -0800 (Mon, 07 Feb 2011) | 10 lines

  Don't allow a REFER w/replaces to replace its own dialog

  Asterisk currently accepts a REFER with a Refer-To with an embedded Replaces
  header that matches the dialog of the REFER. This would be a situation like A
  calls B, A calls C, A transfers B to A, which is just silly. This patch makes
  the transfer fail instead of making Asterisk freak out and forget to hang other
  channels up.

  Review: https://reviewboard.asterisk.org/r/1093/
........

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

14 years agoDon't fallthrough to 'unknown' in the 'ringing' case.
Jason Parker [Fri, 4 Feb 2011 19:21:43 +0000 (19:21 +0000)] 
Don't fallthrough to 'unknown' in the 'ringing' case.

This could cause improper exits from the queue.

(closes issue #18499)
Reported by: zaltar
Patches:
      app_queue.patch uploaded by zaltar (license 1148)

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

14 years agoMerged revisions 306119 via svnmerge from
Terry Wilson [Thu, 3 Feb 2011 20:56:00 +0000 (20:56 +0000)] 
Merged revisions 306119 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r306119 | twilson | 2011-02-03 12:36:34 -0800 (Thu, 03 Feb 2011) | 9 lines

  Set hangup cause in local_hangup

  When a call involves a local channel (like SIP -> Local -> SIP), the hangup
  cause was not being set. This resulted in SIP channels sometimes getting a
  503 error instead of a 486 when the far side sent a busy. In Asterisk 1.8+
  this also can cause issues with CCSS that involve a local channel. This patch
  sets the hangupcause for one side of the local channel to the other in
  local_hangup for outbound calls.
........

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

14 years agoSet exception on channel in parking thread when POLLPRI event detected.
Jeff Peeler [Thu, 3 Feb 2011 20:49:48 +0000 (20:49 +0000)] 
Set exception on channel in parking thread when POLLPRI event detected.

This is done just to make the code be equivalent to the old select code. As
noted in 303106 the same issue was already fixed in this branch, but the
exception was not set on the channel in the case of POLLPRI. The reason that
this did not cause a problem here is because in 122923 the check in __ast_read
to check the exception flag was removed.

(related to #18637)

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

14 years agores_phoneprov add snom 300, 320, 360, 370, 820, 821, 870 support
Andrew Latham [Thu, 3 Feb 2011 15:41:30 +0000 (15:41 +0000)] 
res_phoneprov add snom 300, 320, 360, 370, 820, 821, 870 support

(issue #18713)
Reported by: lathama
Patches:
      snom_dir.diff uploaded by lathama (license 1028)
Tested by: lathama

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

14 years agoMerged revisions 305888 via svnmerge from
Richard Mudgett [Thu, 3 Feb 2011 00:15:07 +0000 (00:15 +0000)] 
Merged revisions 305888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305888 | rmudgett | 2011-02-02 18:02:43 -0600 (Wed, 02 Feb 2011) | 8 lines

  Minor AST_FRAME_TEXT related issues.

  * Include the null terminator in the buffer length.  When the frame is
  queued it is copied.  If the null terminator is not part of the frame
  buffer length, the receiver could see garbage appended onto it.

  * Add channel lock protection with ast_sendtext().

  * Fixed AMI SendText action ast_sendtext() return value check.
........

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

14 years agoReplace link to old doc with new wiki page.
Andrew Latham [Wed, 2 Feb 2011 14:40:09 +0000 (14:40 +0000)] 
Replace link to old doc with new wiki page.

Link to https://wiki.asterisk.org/wiki/display/AST/SIP+Retransmissions

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

14 years agoSIP Configuration Documentation
Andrew Latham [Tue, 1 Feb 2011 21:08:59 +0000 (21:08 +0000)] 
SIP Configuration Documentation

sip show settings reports qualifyfreq in milliseconds.
sip.conf configures qualifyfreg in seconds.

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

14 years agoMerged revisions 305471 via svnmerge from
Jason Parker [Tue, 1 Feb 2011 17:02:09 +0000 (17:02 +0000)] 
Merged revisions 305471 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305471 | qwell | 2011-02-01 11:00:55 -0600 (Tue, 01 Feb 2011) | 9 lines

  Close file descriptor for timing source when a MOH class gets destroyed.

  (closes issue #18457)
  Reported by: mcallist
  Patches:
        18457-closetimer.diff uploaded by qwell (license 4)
        18457-closetimer_trunk.diff uploaded by qwell (license 4)
  Tested by: qwell, loloski
........

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

14 years agoMerged revisions 305341 via svnmerge from
Richard Mudgett [Mon, 31 Jan 2011 23:50:10 +0000 (23:50 +0000)] 
Merged revisions 305341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305341 | rmudgett | 2011-01-31 17:45:58 -0600 (Mon, 31 Jan 2011) | 7 lines

  Obtain the pri lock for PRI queue counters.

  Need to obtain the pri lock when calling pri_dump_info_str() to avoid a
  reentrancy problem when calculating the Q.921 Q count statistic.

  JIRA AST-484
........

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

14 years agoMerged revisions 305252 via svnmerge from
Jason Parker [Mon, 31 Jan 2011 22:59:34 +0000 (22:59 +0000)] 
Merged revisions 305252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305252 | qwell | 2011-01-31 16:56:54 -0600 (Mon, 31 Jan 2011) | 10 lines

  Prevent a crash when dialing a technology with no destination (ex: Dial(SIP/))

  chan_iax2 and other channel drivers already had code to prevent this.  The
  attempt that app_dial was making to prevent it was not correct, so I fixed that.

  (closes issue #18371)
  Reported by: gbour
  Patches:
        18371.patch uploaded by gbour (license 1162)
........

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

14 years agoMerged revisions 305129 via svnmerge from
Jason Parker [Mon, 31 Jan 2011 20:59:37 +0000 (20:59 +0000)] 
Merged revisions 305129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r305129 | qwell | 2011-01-31 14:56:25 -0600 (Mon, 31 Jan 2011) | 2 lines

  Set file descriptors to -1 on creation, so that we don't see weirdness later.
........

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

14 years agoAsterisk HTTP response Content-type
Andrew Latham [Mon, 31 Jan 2011 13:52:33 +0000 (13:52 +0000)] 
Asterisk HTTP response Content-type

Address content type for BSD and other platforms

(closes issue #18456)
Reported by: alexo
Patches:
      asterisk18_http.patch uploaded by alexo (license 1175)
Tested by: alexo

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

14 years agoMerged revisions 304952 via svnmerge from
Tilghman Lesher [Mon, 31 Jan 2011 07:25:14 +0000 (07:25 +0000)] 
Merged revisions 304952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304952 | tilghman | 2011-01-31 00:54:45 -0600 (Mon, 31 Jan 2011) | 2 lines

  Fix compilation when ODBC_STORAGE is defined.
........

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

14 years agoPlug some memory leaks in the LDAP realtime driver.
Sean Bright [Sat, 29 Jan 2011 23:05:25 +0000 (23:05 +0000)] 
Plug some memory leaks in the LDAP realtime driver.

(closes issue #18435)
Reported by: zaltar
Patches:
      res_config_ldap.patch uploaded by zaltar (license 1148)

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

14 years agoIf we fail to allocate our announcement objects, make sure we don't leak objects.
Sean Bright [Sat, 29 Jan 2011 18:08:14 +0000 (18:08 +0000)] 
If we fail to allocate our announcement objects, make sure we don't leak objects.

The majority of this patch was committed already in r304726 and r304729.

(issue #18225)
Reported by: kenji

(issue #18444)
Reported by: junky

(closes issue #18343)
Reported by: kobaz
Patches:
      meetme-refs.diff uploaded by kobaz (license 834)

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

14 years agoWhen we pass the S() or L() options to MeetMe, make sure that we honor C as well.
Sean Bright [Sat, 29 Jan 2011 17:51:28 +0000 (17:51 +0000)] 
When we pass the S() or L() options to MeetMe, make sure that we honor C as well.

Without this patch, if the user was kicked from the conference via the S() or L()
mechanism, we would just hang up on them even if we also passed C (continue in
dialplan when kicked).  With this patch we honor the C flag in those cases.

(closes issue #17317)
Reported by: var

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

14 years agoMake sure that we unref the correct object when ejecting the most recent caller.
Sean Bright [Sat, 29 Jan 2011 17:01:51 +0000 (17:01 +0000)] 
Make sure that we unref the correct object when ejecting the most recent caller.

Currently, when we kick the last user to enter, we decrement our own reference
count which results in a crash when we kick another user or when we exit the
conference ourselves.

This will fix #18225 in 1.8 and trunk, but that particular bug does not exist in
1.6.2.

(closes issue #18225)
Reported by: kenji
Patches:
      issue18225.patch uploaded by seanbright (license 71)
Tested by: seanbright

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

14 years agoFix user reference leak in MeetMe.
Sean Bright [Sat, 29 Jan 2011 16:26:57 +0000 (16:26 +0000)] 
Fix user reference leak in MeetMe.

We were unlinking the user from the conferences user container, but not
decrementing the reference count of the user as well, resulting in a leak.

(closes issue #18444)
Reported by: junky
Tested by: seanbright

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

14 years agoRevert part of the previous commit that snuck in.
Sean Bright [Fri, 28 Jan 2011 22:38:05 +0000 (22:38 +0000)] 
Revert part of the previous commit that snuck in.

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

14 years agoDon't leak references if we can't create a pseudo channel for mixing in MeetMe.
Sean Bright [Fri, 28 Jan 2011 21:22:09 +0000 (21:22 +0000)] 
Don't leak references if we can't create a pseudo channel for mixing in MeetMe.

If there was a problem allocating a pseudo channel when building our meetme, we
weren't destroying our user container or destroying the mutexes that we created.

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

14 years agoMerged revisions 304464 via svnmerge from
Jason Parker [Thu, 27 Jan 2011 17:01:24 +0000 (17:01 +0000)] 
Merged revisions 304464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304464 | qwell | 2011-01-27 10:57:46 -0600 (Thu, 27 Jan 2011) | 9 lines

  Fix default prefix=/usr regression on non-Linux systems.

  This partially reverts a change made in branches/1.4/ r267759, which will
  cause issue #17013 to be reopened.  This issue was pointed out by a user
  on #asterisk, who helpfully discovered that paths were being set incorrectly.

  To truly understand what was wrong, one should run:
      svn diff --force -c<this revision> configure
........

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

14 years agoMerged revisions 304460 via svnmerge from
Jason Parker [Thu, 27 Jan 2011 16:48:00 +0000 (16:48 +0000)] 
Merged revisions 304460 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304460 | qwell | 2011-01-27 10:47:03 -0600 (Thu, 27 Jan 2011) | 1 line

  Rerun bootstrap.sh with no changes, so that it is more obvious what my next commit changes.
........

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

14 years agoChange delimiter used internally for GOTO_ON_BLINDXFR to commas to match 76703.
Jeff Peeler [Wed, 26 Jan 2011 22:26:37 +0000 (22:26 +0000)] 
Change delimiter used internally for GOTO_ON_BLINDXFR to commas to match 76703.

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

14 years agoMerged revisions 304242 via svnmerge from
Mark Michelson [Wed, 26 Jan 2011 21:02:10 +0000 (21:02 +0000)] 
Merged revisions 304242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304242 | mmichelson | 2011-01-26 14:38:37 -0600 (Wed, 26 Jan 2011) | 3 lines

  Get rid of unused 'verbose' field in ast_udptl
........

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

14 years agoMerged revisions 304247 via svnmerge from
Matthew Nicholson [Wed, 26 Jan 2011 21:01:13 +0000 (21:01 +0000)] 
Merged revisions 304247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304247 | mnicholson | 2011-01-26 15:00:15 -0600 (Wed, 26 Jan 2011) | 2 lines

  Convert from network to host byte ordering before checking if an IP is a multicast address.
........

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

14 years agoMerged revisions 304241 via svnmerge from
Matthew Nicholson [Wed, 26 Jan 2011 20:42:16 +0000 (20:42 +0000)] 
Merged revisions 304241 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304241 | mnicholson | 2011-01-26 14:38:22 -0600 (Wed, 26 Jan 2011) | 6 lines

  This patch modifies chan_sip to route responses to the address the request came from.  It also modifies chan_sip to respect the maddr parameter in the Via header.

  ABE-2664

  Review: https://reviewboard.asterisk.org/r/1059/
........

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

14 years agoMerged revisions 304159 via svnmerge from
Sean Bright [Wed, 26 Jan 2011 20:22:47 +0000 (20:22 +0000)] 
Merged revisions 304159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304159 | seanbright | 2011-01-26 15:18:29 -0500 (Wed, 26 Jan 2011) | 1 line

  Make sure the sample queues.conf is properly commented.
........

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

14 years agoMerged revisions 304148 from
Richard Mudgett [Wed, 26 Jan 2011 19:38:38 +0000 (19:38 +0000)] 
Merged revisions 304148 from
https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

..........
  r304148 | rmudgett | 2011-01-26 13:23:46 -0600 (Wed, 26 Jan 2011) | 2 lines

  Update documentation for DAHDISendCallreroutingFacility() application.
..........

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

14 years agoPer the man page, setvbuf() must be called before any other operation on an open...
Sean Bright [Wed, 26 Jan 2011 01:24:58 +0000 (01:24 +0000)] 
Per the man page, setvbuf() must be called before any other operation on an open file.

We use setvbuf() to associate a buffer with a stream, but we have already written
to the open file.  This works (by chance) on Linux, but fails on other platforms,
such as OpenSolaris.

(closes issue #16610)
Reported by: bklang
Patches:
      setvbuf.patch uploaded by crjw (license 963)
Tested by: bklang, asgaroth, efutch

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

14 years agoMerged revisions 304005 via svnmerge from
Richard Mudgett [Tue, 25 Jan 2011 23:25:32 +0000 (23:25 +0000)] 
Merged revisions 304005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r304005 | rmudgett | 2011-01-25 17:21:09 -0600 (Tue, 25 Jan 2011) | 8 lines

  DTMF attended transfers sometimes fail for no apparent reason.

  The loop in feature_request_and_dial() can exit when Party C has answered
  without processing an AST_CONTROL_ANSWER.  Also sometimes an
  AST_CONTROL_ANSWER never happens even though Party C has answered.

  Don't hangup Party C if he is up or we receive an AST_CONTROL_ANSWER.
........

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

14 years agoMerged revisions 303906 via svnmerge from
Terry Wilson [Tue, 25 Jan 2011 22:02:42 +0000 (22:02 +0000)] 
Merged revisions 303906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303906 | twilson | 2011-01-25 14:50:59 -0600 (Tue, 25 Jan 2011) | 16 lines

  Guard against retransmitting BYEs indefinitely

  In the case of an attended transfer (A calls B, A atxfers to C) where
  A becomes unreachable before replying to Asterisk's BYE, Asterisk can
  sometimes retransmit the BYE indefinitely. This is because
  __sip_autodestruct tests p->refer && !ast_test_flag(&p->flags[0],
  SIP_ALREADYGONE and will then transmit a BYE. When this BYE times out,
  it will not ever be marked as ALREADYGONE, so when __sip_autodestruct
  is called again, we end up starting the cycle over.

  This patch adds a call to sip_alreadygone(pkt->owner) in retrans_pkt
  in the case of a BYE that has timed out. This should prevent Asterisk
  from trying to transmit new BYE messages in the future.

  Review: https://reviewboard.asterisk.org/r/1077/
........

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

14 years agoFix "sip show user <tab>", so that it actually shows results, instead of just complet...
Tilghman Lesher [Tue, 25 Jan 2011 18:41:26 +0000 (18:41 +0000)] 
Fix "sip show user <tab>", so that it actually shows results, instead of just completing the last entry.

(closes issue #16675)
Reported by: pj

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

14 years agoMerged revisions 303765 via svnmerge from
Richard Mudgett [Tue, 25 Jan 2011 17:42:42 +0000 (17:42 +0000)] 
Merged revisions 303765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303765 | rmudgett | 2011-01-25 11:36:50 -0600 (Tue, 25 Jan 2011) | 40 lines

  Sending out unnecessary PROCEEDING messages breaks overlap dialing.

  Issue #16789 was a good idea.  Unfortunately, it breaks overlap dialing
  through Asterisk.  There is not enough information available at this point
  to know if dialing is complete.  The ast_exists_extension(),
  ast_matchmore_extension(), and ast_canmatch_extension() calls are not
  adequate to detect a dial through extension pattern of "_9!".

  Workaround is to use the dialplan Proceeding() application early in
  non-dial through extensions.

  * Effectively revert issue #16789.

  * Allow outgoing overlap dialing to hear dialtone and other early media.
  A PROGRESS "inband-information is now available" message is now sent after
  the SETUP_ACKNOWLEDGE message for non-digital calls.  An
  AST_CONTROL_PROGRESS is now generated for incoming SETUP_ACKNOWLEDGE
  messages for non-digital calls.

  * Handling of the AST_CONTROL_CONGESTION in chan_dahdi/sig_pri was
  inconsistent with the cause codes.

  * Added better protection from sending out of sequence messages by
  combining several flags into a single enum value representing call
  progress level.

  * Added diagnostic messages for deferred overlap digits handling corner
  cases.

  (closes issue #17085)
  Reported by: shawkris

  (closes issue #18509)
  Reported by: wimpy
  Patches:
        issue18509_early_media_v1.8_v3.patch uploaded by rmudgett (license 664)
        Expanded upon issue18509_early_media_v1.8_v3.patch to include analog
        and SS7 because of backporting requirements.
  Tested by: wimpy, rmudgett
........

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

14 years agoMerged revisions 303676 via svnmerge from
Jeff Peeler [Tue, 25 Jan 2011 16:59:28 +0000 (16:59 +0000)] 
Merged revisions 303676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303676 | jpeeler | 2011-01-25 10:58:29 -0600 (Tue, 25 Jan 2011) | 20 lines

  Fix voicemail sequencing for file based storage.

  A previous change was made to account for when the number of voicemail messages
  exceeds the max limit to be handled properly, but it caused gaps in the messages
  to not be properly handled. This has now been resolved.

  In later non 1.4 branches, it appears that resequencing wasn't even occurring
  due from what appears and accidental code removal.

  (closes issue #18498)
  Reported by: JJCinAZ
  Patches:
        bug18498v2.patch uploaded by jpeeler (license 325)

  (closes issue #18486)
  Reported by: bluefox
  Patches:
        bug18486.patch uploaded by jpeeler (license 325)
........

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

14 years agoMerged revisions 303546 via svnmerge from
Russell Bryant [Mon, 24 Jan 2011 20:49:53 +0000 (20:49 +0000)] 
Merged revisions 303546 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303546 | russell | 2011-01-24 14:32:21 -0600 (Mon, 24 Jan 2011) | 31 lines

  Fix channel redirect out of MeetMe() and other issues with channel softhangup.

  Mantis issue #18585 reports that a channel redirect out of MeetMe() stopped
  working properly.  This issue includes a patch that resolves the issue by
  removing a call to ast_check_hangup() from app_meetme.c.  I left that in my
  patch, as it doesn't need to be there.  However, the rest of the patch fixes
  this problem with or without the change to app_meetme.

  The key difference between what happens before and after this patch is the
  effect of the END_OF_Q control frame.  After END_OF_Q is hit in ast_read(),
  ast_read() will return NULL.  With the ast_check_hangup() removed, app_meetme
  sees this which causes it to exit as intended.  Checking ast_check_hangup()
  caused app_meetme to exit earlier in the process, and the target of the
  redirect saw the condition where ast_read() returned NULL.

  Removing ast_check_hangup() works around the issue in app_meetme, but doesn't
  solve the issue if another application did the same thing.  There are also
  other edge cases where if an application finishes at the same time that a
  redirect happens, the target of the redirect will think that the channel hung
  up.  So, I made some changes in pbx.c to resolve it at a deeper level.  There
  are already places that unset the SOFTHANGUP_ASYNCGOTO flag in an attempt to
  abort the hangup process.  My patch extends this to remove the END_OF_Q frame
  from the channel's read queue, making the "abort hangup" more complete.  This
  same technique was used in every place where a softhangup flag was cleared.

  (closes issue #18585)
  Reported by: oej
  Tested by: oej, wedhorn, russell

  Review: https://reviewboard.asterisk.org/r/1082/
........

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

14 years agoMerged revisions 303284 via svnmerge from
Jason Parker [Fri, 21 Jan 2011 21:48:09 +0000 (21:48 +0000)] 
Merged revisions 303284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r303284 | qwell | 2011-01-21 15:45:34 -0600 (Fri, 21 Jan 2011) | 8 lines

  Reset configuration before parsing users.conf.

  Some values configured in chan_dahdi.conf were able to leak in to users.conf
  configuration.  This was surprising users, and potentially setting non-sane
  "defaults".

  ASTNOW-125
........

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

14 years agoFix changes to L() flag in Dial().
Leif Madsen [Fri, 21 Jan 2011 16:12:54 +0000 (16:12 +0000)] 
Fix changes to L() flag in Dial().

Tony Mountifield pointed out an error I had in my patch. I was a bit too aggressive
on changing 'seconds' to 'milliseconds'. So I decided to do some additioanl testing
and have no changed just the appropriate lines. One line says milliseconds, and the
other says seconds. Probably should change this to be either just seconds or
milliseconds, but I've spent too much time on this already :)

(issue #18264)

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