Commit Graph

1449 Commits

Author SHA1 Message Date
Richard Mudgett ae2926b5d0 Add Device State Information CCSS for Generic Devices.
Add Asterisk Device State information and callbacks to the Call Completion
Supplemental Services for generic agents.

There are currently not many devices that have native support for CCSS.
Even as the devices become available there may be other reasons why one
may choose to not take advantage of the native abilities and stick with
the generic implementation.  The generic implementation is quite capable
and could be greatly enhanced by adding device state capabilities.  A
phone could then subscribe to the device state with a BLF key in
conjunction with Asterisk hints.

The advantages of the device state information would allow a single button
to: request CCSS, cancel a CCSS request, and display the current state of
a CCSS request.

For example, you may have a single button that when not lit, there is no
active CCSS request.  When you press that button, the dialplan can query
the DEVICE_STATE() associated with that caller to determine whether they
should be calling CallCompletionRequest() or CallCompletionCancel().  If
there is currently a pending request, then the dialplan would cancel it.
This also has the advantage of showing the true state of a request, which
is an asynchronous call, even when CallCompletionRequest() thinks it was
successful.  The actual request could ultimately fail.  Once lit, further
feedback can be provided to the caller about the current state of their
request since it will be updated by the CCSS State Machine as appropriate.

The DEVICE_STATE mapping is configurable since the BLF being used on a
given phone type may vary.  The idea is to allow some level of
customization as to the phone's behavior.

As an example, you may want the BLF key to go solid once you have
requested a callback.  You may then want the LED to blink (typically
ringing) when either the callback is in process, which is a visual
indication that the incoming call is the desired callback.  You may want
it to blink when the callee is ready but you are busy, giving you a visual
indication that the target is available as you may want to get off the
line so that the callback can be successful.

Device state information is sent back via the ast_devstate_prov_add()
callback for any generic CCSS device as it traverses through the state
machine.  You simply provide a map between CC_STATE values and the
corresponding AST_DEVICE state values.

You could then generate hints against these states similar to what is
possible today with Custom Devstates or MeetMe states.  For example, you
may have an extension 3000 that is currently associated with device
SIP/3000.  You could then create a feature code for that extension that
may look something like:

exten => *823000,hint,ccss:sip/3000

You would then subscribe a BLF button to *823000 which would point to the
dialplan that handled CCSS requests/cancels using the available
DEVICE_STATE() information about ccss:sip/3000 to make the decision about
what to do.

(closes issue #18788)
Reported by: p_lindheimer
Patches:
      ccss.trunk.18788.patch uploaded by p lindheimer (license 558)
      Modified with final reviewboard comments.
Tested by: p_lindheimer, loloski

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@313744 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-14 18:22:35 +00:00
Leif Madsen b8b1d085db Add 'description' field for CLI and Manager output
(closes issue #19076)
Reported by: lmadsen
Patches: 
      __20110408-channel-description.txt uploaded by lmadsen (license 10)
Tested by: lmadsen

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@313528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 15:49:33 +00:00
Matthew Nicholson a77fd545ab Merged revisions 312766 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r312766 | mnicholson | 2011-04-05 09:14:50 -0500 (Tue, 05 Apr 2011) | 22 lines
  
  Merged revisions 312764 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r312764 | mnicholson | 2011-04-05 09:13:07 -0500 (Tue, 05 Apr 2011) | 15 lines
    
    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/trunk@312767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-05 14:16:21 +00:00
Tilghman Lesher 2176df5d83 Merged revisions 311930 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311930 | tilghman | 2011-03-31 01:43:18 -0500 (Thu, 31 Mar 2011) | 6 lines
  
  Incorrect default example; the field is actually internally named "clid", not "callerid".
  
  (closes issue #19040)
  Reported by: wcselby
  Tested by: tilghman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-31 06:44:08 +00:00
Alec L Davis 08828045b1 Merged revisions 311050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r311050 | alecdavis | 2011-03-17 23:49:41 +1300 (Thu, 17 Mar 2011) | 24 lines
  
  Merged revisions 311049 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r311049 | alecdavis | 2011-03-17 23:45:47 +1300 (Thu, 17 Mar 2011) | 17 lines
    
    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/trunk@311051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-17 10:51:57 +00:00
Mark Michelson 0a96892b04 Merged revisions 309765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309765 | mmichelson | 2011-03-06 18:13:36 -0600 (Sun, 06 Mar 2011) | 3 lines
  
  Indicate that Asterisk uses the Allow header to determine if MESSAGE requests should be sent.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309766 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-07 00:14:34 +00:00
Terry Wilson 01a453351d Add setvar option to calendaring
Adding the setvar option with variable substitution on the value allows things
like setting the outbound caller id name to the summary of a calendar event,
etc. Values could be chained together as they are appended in order to do some
scripting if necessary.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-04 23:22:39 +00:00
Matthew Nicholson b20fecdbbb Add support for defining hints from pbx_lua
(closes issue #16024)
Reported by: mnicholson


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-04 17:44:44 +00:00
Terry Wilson 5deb544d06 Merged revisions 308679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308679 | twilson | 2011-02-23 21:41:34 -0600 (Wed, 23 Feb 2011) | 15 lines
  
  Merged revisions 308678 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r308678 | twilson | 2011-02-23 21:38:22 -0600 (Wed, 23 Feb 2011) | 8 lines
    
    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/trunk@308680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-24 03:49:07 +00:00
David Vossel d760e81f37 Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff
-Functional changes
1. Dynamic global format list build by codecs defined in codecs.conf
2. SILK 8khz, 12khz, 16khz, and 24khz with custom attributes defined in codecs.conf
3. Negotiation of SILK attributes in chan_sip.
4. SPEEX 32khz with translation
5. SLINEAR 8khz, 12khz, 24khz, 32khz, 44.1khz, 48khz, 96khz, 192khz with translation
   using codec_resample.c
6. Various changes to RTP code required to properly handle the dynamic format list
   and formats with attributes.
7. ConfBridge now dynamically jumps to the best possible sample rate.  This allows
   for conferences to take advantage of HD audio (Which sounds awesome)
8. Audiohooks are no longer limited to 8khz audio, and most effects have been
   updated to take advantage of this such as Volume, DENOISE, PITCH_SHIFT.
9. codec_resample now uses its own code rather than depending on libresample.

-Organizational changes
Global format list is moved from frame.c to format.c
Various format specific functions moved from frame.c to format.c

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-22 23:04:49 +00:00
Mark Michelson 4cba13eb60 Merged revisions 307467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307467 | mmichelson | 2011-02-10 11:44:42 -0600 (Thu, 10 Feb 2011) | 5 lines
  
  Fix a gaffe in the CCSS sample configuration.
  
  Discovered by Philippe Lindheimer and pointed out on #asterisk-dev
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-10 17:45:24 +00:00
Andrew Latham a350924700 Documentation Updates
Note default polling setting in voicemail.conf
Add missing config to asterisk.conf
Update manpage

(issue #16505)
Reported by: tzafrir
Patches:
     asterisk_sgml_fixes_demo.diff uploaded by tzafrir (license 46)
Tested by: lathama, tzafrir



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-08 20:31:13 +00:00
Richard Mudgett 8b584000a9 Define the MCID acronym in chan_dahdi.conf.sample.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-08 00:43:34 +00:00
Richard Mudgett 49feb747ba Pass a MCID request to the bridged channel.
Pass a MCID request to the bridged channel so the bridged channel can send
it to the network.

The ability to send the MCID request on an ISDN span is enabled with the
new chan_dahdi.conf mcid_send option.

JIRA SWP-2845
JIRA ABE-2736


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-07 23:33:44 +00:00
Richard Mudgett a8aeb04a9f Add ISDN display ie text handling options to chan_dahdi.conf.
The display ie handling can be controlled independently in the send and
receive directions with the following options:

* Block display text data.

* Use display text in SETUP/CONNECT messages for name.

* Use display text for COLP name updates (FACILITY/NOTIFY as appropriate).

* Pass arbitrary display text during a call.  Sent in INFORMATION
messages.  Received from any message that the display text was not used as
a name.

If the display options are not set then the options default to legacy
behavior.

The arbitrary display text is exchanged between bridged channels using the
AST_FRAME_TEXT frame type.

To send display text from the dialplan use the SendText() application when
the arbitrary display text option is enabled.

JIRA SWP-2688
JIRA ABE-2693


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306396 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-04 20:30:48 +00:00
Andrew Latham 652fb64a01 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/trunk@305988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 16:13:40 +00:00
Andrew Latham 93bade5639 Replacing doc/* and asterisk.pdf with wiki links
Adding links to http(s)://wiki.asterisk.org



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-02 19:30:49 +00:00
Andrew Latham 9f1a17f137 Replacing doc/* with wiki links
Adding links to http(s)://wiki.asterisk.org



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-02 18:59:29 +00:00
Andrew Latham faf33b0d94 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/trunk@305650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-01 21:16:31 +00:00
Jason Parker 14c1585645 Merged revisions 305247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r305247 | qwell | 2011-01-31 16:25:23 -0600 (Mon, 31 Jan 2011) | 7 lines
  
  Add alternative name for config option.
  
  The SIP sample configuration had "tlscadir" as the option name, but chan_sip
  used the more correct "tlscapath".  Now both are accepted.
  
  Discovered (sort of) by a user on IRC in #asterisk
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-31 22:26:06 +00:00
Richard Mudgett ecdbb3d1d9 Merged from revision 304341
https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

..........
  r304341 | rmudgett | 2011-01-26 16:38:39 -0600 (Wed, 26 Jan 2011) | 7 lines

  Add connected line chan_dahdi.conf pricpndialplan option.

  * Added from_channel value to prilocaldialplan option.

  JIRA ABE-2731
  JIRA SWP-2842
..........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-27 00:06:27 +00:00
Sean Bright 8db5da18cf Merged revisions 304186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304186 | seanbright | 2011-01-26 15:23:48 -0500 (Wed, 26 Jan 2011) | 16 lines
  
  Merged revisions 304181 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r304181 | seanbright | 2011-01-26 15:22:47 -0500 (Wed, 26 Jan 2011) | 9 lines
    
    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/trunk@304195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-26 20:25:24 +00:00
Jeff Peeler a4fec286f8 Merged revisions 303009 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303009 | jpeeler | 2011-01-20 11:10:32 -0600 (Thu, 20 Jan 2011) | 21 lines
  
  Merged revisions 303008 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r303008 | jpeeler | 2011-01-20 11:07:44 -0600 (Thu, 20 Jan 2011) | 14 lines
    
    Merged revisions 303007 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r303007 | jpeeler | 2011-01-20 11:04:08 -0600 (Thu, 20 Jan 2011) | 8 lines
      
      Add new queue strategy to preserve behavior for when queue members moved to ao2.
      
      Add queue strategy called "rrordered" to mimic old behavior from when queue
      members were stored in a linked list.
      
      ABE-2707
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-20 17:14:01 +00:00
Sean Bright 750dff4f0f Merged revisions 302417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302417 | seanbright | 2011-01-19 10:53:20 -0500 (Wed, 19 Jan 2011) | 16 lines
  
  Merged revisions 302416 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r302416 | seanbright | 2011-01-19 10:52:44 -0500 (Wed, 19 Jan 2011) | 9 lines
    
    Remove references to priorityjumping from the sample extensions.conf.
    
    Priority jumping was removed from pbx_config in r68970.
    
    (closes issue #18622)
    Reported by: kshumard
    Patches:
          extensions.conf.sample.patch uploaded by kshumard (license 92)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302418 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 15:54:22 +00:00
Terry Wilson 29cb03ebf2 Merged revisions 302005 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302005 | twilson | 2011-01-17 09:04:59 -0600 (Mon, 17 Jan 2011) | 2 lines
  
  Document "encryption" option in sip.conf.sample
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-17 15:06:10 +00:00
Leif Madsen 89fe21382a Merged revisions 301731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301731 | lmadsen | 2011-01-13 11:01:43 -0600 (Thu, 13 Jan 2011) | 15 lines
  
  Merged revisions 301730 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301730 | lmadsen | 2011-01-13 11:01:11 -0600 (Thu, 13 Jan 2011) | 7 lines
    
    Add static entry for split Polycom 332 firmware.
    
    (closes issue #18607)
    Reported by: cjacobsen
    Patches: 
          polycom_331.diff uploaded by cjacobsen (license 1029)
    Tested by: lathama
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-13 17:02:34 +00:00
Paul Belanger ca8d5676ab Merged revisions 301311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301311 | pabelanger | 2011-01-11 14:16:06 -0500 (Tue, 11 Jan 2011) | 9 lines
  
  Merged revisions 301310 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301310 | pabelanger | 2011-01-11 14:14:31 -0500 (Tue, 11 Jan 2011) | 2 lines
    
    Fix a logic issue when passing context ARG
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-11 19:19:01 +00:00
Leif Madsen b9271a15e5 Merged revisions 300433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300433 | lmadsen | 2011-01-04 15:00:55 -0600 (Tue, 04 Jan 2011) | 15 lines
  
  Merged revisions 300431 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r300431 | lmadsen | 2011-01-04 15:00:29 -0600 (Tue, 04 Jan 2011) | 7 lines
    
    Add some documentation to users.conf.sample.
    
    (closes issue #18531)
    Reported by: lathama
    Patches: 
          users.conf.sample2.diff uploaded by lathama (license 1028)
    Tested by: lathama
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-04 21:01:30 +00:00
Richard Mudgett 90177fe708 Optional HOLD/RETRIEVE signaling for PTMP TE when the bridge goes on and off hold.
Added the moh_signaling option to specify what to do when the channel's
bridged peer puts the ISDN channel on and off of hold.

Implemented as a FSM to control libpri ISDN signaling when the bridged
peer places the channel on and off of hold with the AST_CONTROL_HOLD and
AST_CONTROL_UNHOLD control frames.

JIRA SWP-2687
JIRA ABE-2691

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-04 16:38:28 +00:00
Tilghman Lesher 96b7a9950c Support negative filters.
(closes issue #17979)
 Reported by: tilghman
 Patches: 
       20100911__for_blitzrage.diff.txt uploaded by tilghman (license 14)
 Tested by: lmadsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-31 09:29:10 +00:00
Paul Belanger 78bd19baa9 Merged revisions 299312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299312 | pabelanger | 2010-12-20 19:44:08 -0500 (Mon, 20 Dec 2010) | 8 lines
  
  Correct typo with USER_DEFINED event.
  
  (closes issue #18461)
  Reported by: joscas
  Patches:
        cel.conf.sample.diff uploaded by lathama (license 1028)
        Tested by: lathama, joscas
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-21 00:45:40 +00:00
Brad Watkins 806d69dc93 Merged revisions 298773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r298773 | marquis | 2010-12-17 12:26:31 -0500 (Fri, 17 Dec 2010) | 10 lines
  
  Fix parsing of mwi => lines in sip.conf
  
  Reworking parsing of mwi => lines to resolve a segfault.  Also add a set of unit tests for the function that does the parsing.
  
  (closes issue #18350)
  Reported by: gbour
  Tested by: Marquis, gbour
  
  Review: https://reviewboard.asterisk.org/r/1053/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-17 17:29:09 +00:00
Tilghman Lesher d01027ae49 Merged revisions 297909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines
  
  Merged revisions 297908 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines
    
    Use inheritance to get correct results for SIPFROMDOMAIN.
    
    (from an internal Digium discussion)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-08 18:08:27 +00:00
Sean Bright ba8fc4ce75 Merged revisions 295869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295869 | seanbright | 2010-11-22 15:03:49 -0500 (Mon, 22 Nov 2010) | 9 lines
  
  Merged revisions 295868 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r295868 | seanbright | 2010-11-22 15:02:37 -0500 (Mon, 22 Nov 2010) | 2 lines
    
    Change some documentation to suggest dahdi_monitor instead of ztmonitor.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-22 20:05:10 +00:00
Leif Madsen b6d0f09bc5 Merged revisions 295477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295477 | lmadsen | 2010-11-18 14:30:35 -0600 (Thu, 18 Nov 2010) | 6 lines
  
  'sip notify clear-mwi' needs terminating CRLF.
  
  (closes issue #18275)
  Reported by: klaus3000
  Patches:
        fix_body_CRLF_patch.txt uploaded by klaus3000 (license 65)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295478 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-18 20:31:23 +00:00
Paul Belanger 7c0d07b651 Merged revisions 295361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295361 | pabelanger | 2010-11-17 09:09:38 -0500 (Wed, 17 Nov 2010) | 2 lines
  
  Uncomment settings under [global], to surpress warning when loading Asterisk.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-17 14:22:42 +00:00
Terry Wilson aa0f407b8b Merged revisions 294207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294207 | twilson | 2010-11-08 13:56:10 -0600 (Mon, 08 Nov 2010) | 2 lines
  
  Set a default waittime, and make sure to convert it to milliseconds
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-08 19:59:39 +00:00
Paul Belanger 5a28a27b0b New CLI command 'gtalk show settings'.
Review: https://reviewboard.asterisk.org/r/984/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-02 15:14:12 +00:00
Mark Michelson 3162a8e558 Enable IPv6 for the built-in HTTP server.
Review: https://reviewboard.asterisk.org/r/986



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-29 20:46:06 +00:00
Leif Madsen 8de8e4a11c Merged revisions 292787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292787 | lmadsen | 2010-10-22 16:28:43 -0500 (Fri, 22 Oct 2010) | 21 lines
  
  Merged revisions 292786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r292786 | lmadsen | 2010-10-22 16:16:12 -0500 (Fri, 22 Oct 2010) | 13 lines
    
    Update the LDIF file for LDAP.
    The LDIF file asterisk.ldif was quite a bit out of date from the asterisk.ldap-schema file, so I've
    now updated that to be in sync. The asterisk.ldif file being out of sync was a problem on my systems
    where I was doing an ldapadd to import the schema into the LDAP database, and the existing file
    would cause problems and ERROR messages when registering.
    
    Additional documention has been added based on feedback in the issue I'm closing.
    
    (closes issue #13861)
    Reported by: scramatte
    Patches:
          ldap-update.txt uploaded by lmadsen (license 10)
    Tested by: lmadsen, jcovert, suretec, rgenthner
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-22 21:29:20 +00:00
Leif Madsen da7d82e783 Merged revisions 292557 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292557 | lmadsen | 2010-10-21 08:12:19 -0500 (Thu, 21 Oct 2010) | 14 lines
  
  Merged revisions 292556 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r292556 | lmadsen | 2010-10-21 08:11:52 -0500 (Thu, 21 Oct 2010) | 6 lines
    
    Change res_ldap.sample.conf to match the schema.
    
    (closes issue #17376)
    Reported by: jcovert
    Patches:
          res_ldap.conf.sample.patch uploaded by jcovert (license 551)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-21 13:17:24 +00:00
Tzafrir Cohen 4d6eac5282 Merged revisions 292050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292050 | tzafrir | 2010-10-16 12:47:00 +0200 (ש', 16 אוק 2010) | 22 lines
  
  Merged revisions 292049 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines
    
    Base directory for MOH should be ASTDATADIR
    
    If the directive 'directory' is relative, make it relative to the
    datadir, rather than to the varlibdir. In the sample configuration
    it is relative ('moh').
    
    This has no effect unless you have actively set the datadir explicitly
    (at build time or at run time).
    
    (closes issue #16906)
    Patches:
          moh_datadir uploaded by tzafrir (license 46)
    
    Review: https://reviewboard.asterisk.org/r/974/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-16 11:51:54 +00:00
Paul Belanger 5c695396a7 Merged revisions 291940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291940 | pabelanger | 2010-10-15 15:50:22 -0400 (Fri, 15 Oct 2010) | 16 lines
  
  Merged revisions 291939 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r291939 | pabelanger | 2010-10-15 15:35:20 -0400 (Fri, 15 Oct 2010) | 9 lines
    
    Merged revisions 291938 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct 2010) | 2 lines
      
      Clean up formatting.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-15 19:53:06 +00:00
Leif Madsen 67a3486fe1 Merged revisions 291284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291284 | lmadsen | 2010-10-12 12:20:43 -0500 (Tue, 12 Oct 2010) | 15 lines
  
  Merged revisions 291280 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r291280 | lmadsen | 2010-10-12 12:20:02 -0500 (Tue, 12 Oct 2010) | 7 lines
    
    Add undocumented variables to phoneprov.conf.sample
    
    
    (closes issue #18107)
    Reported by: lathama
    Patches:
          phoneprov.conf.sample.diff uploaded by lathama (license 1028)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-12 17:21:15 +00:00
Leif Madsen 5673d0855e Merged revisions 291230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291230 | lmadsen | 2010-10-12 11:08:04 -0500 (Tue, 12 Oct 2010) | 10 lines
  
  Merged revisions 291229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r291229 | lmadsen | 2010-10-12 11:07:28 -0500 (Tue, 12 Oct 2010) | 2 lines
    
    Add documention that mentions options are defined but not used.
    (Issue #18101)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-12 16:08:53 +00:00
David Vossel 0736871cc6 Merged revisions 291192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291192 | dvossel | 2010-10-11 16:38:39 -0500 (Mon, 11 Oct 2010) | 19 lines
  
  Gtalk enhancements and general code cleanup.
  
  This patch includes several chan_gtalk enhancements.
  Two new gtalk.conf options have been added, externip
  and stunadd.  Setting externip allows us to
  manually specify what the external IP address is
  outside of a NAT environment.  Setting the stunaddr
  option to a valid stun server allows for that external
  ip to be retrieved via a STUN server automatically.  This
  external IP is then advertised during call setup as
  a possible candidate.
  
  I have also attempted to clean up chan_gtalk's code
  so it meets our coding guidelines. During this cleanup
  I noticed several things that need to be done in the
  code and made a TODO section at the top of the file.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291193 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-11 21:39:37 +00:00
Tilghman Lesher a95c0f2f0d Merged revisions 291038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291038 | tilghman | 2010-10-09 18:25:37 -0500 (Sat, 09 Oct 2010) | 2 lines
  
  Add missing option to set calls to be logged in GMT/UTC.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-11 03:20:17 +00:00
Erin Spiceland 89c3bd4d13 Add option to res_config_mysql and app_mysql to specify a character set that
MySQL should use.
 (closes issue 17948)
 Reported by qmax.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@290939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-08 16:27:31 +00:00
Paul Belanger 1517166700 Merged revisions 289718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289718 | pabelanger | 2010-10-01 13:19:49 -0400 (Fri, 01 Oct 2010) | 20 lines
  
  Merged revisions 289704 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289704 | pabelanger | 2010-10-01 13:09:03 -0400 (Fri, 01 Oct 2010) | 13 lines
    
    Merged revisions 289703 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct 2010) | 6 lines
      
      Disable debugging by default
      
      and reformat .config file.
      
      Review: https://reviewboard.asterisk.org/r/929/ 
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-01 17:22:30 +00:00
Leif Madsen 06c171fb1c Merged revisions 289336 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289336 | lmadsen | 2010-09-29 15:27:25 -0500 (Wed, 29 Sep 2010) | 9 lines
  
  Merged revisions 289334 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r289334 | lmadsen | 2010-09-29 15:24:47 -0500 (Wed, 29 Sep 2010) | 1 line
    
    Update sample documentation to note md5secret requirements.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-29 20:29:11 +00:00