Commit Graph

1102 Commits

Author SHA1 Message Date
Tilghman Lesher 0b97554307 Add contributed script for separation of database access from Asterisk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-11 20:58:42 +00:00
Tilghman Lesher 8a411ccf83 Create a centralized configuration option for silencethreshold
(closes issue #11236)
 Reported by: philipps
 Patches: 
       20080218__bug11236.diff.txt uploaded by Corydon76 (license 14)
 Tested by: philipps


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106072 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-03-05 16:23:44 +00:00
Joshua Colp 7422f0ee37 Add documentation for setting username/password in SIP dial string.
(closes issue #11587)
Reported by: sobomax
Patches:
      dialstring_doc.diff uploaded by sobomax (license 359)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-29 18:34:46 +00:00
Tilghman Lesher 4aff24881b Bring Voicetronix driver up to date with current drivers
(closes issue #12084)
 Reported by: mmickan
 Patches: 
       chan_vpb.cc.diff uploaded by mmickan (license 400)
       module.h.diff uploaded by mmickan (license 400)
       vpb.conf.sample uploaded by mmickan (license 400)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-27 08:20:15 +00:00
Russell Bryant 3a8756c9b4 Merged revisions 104119 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r104119 | russell | 2008-02-25 18:25:29 -0600 (Mon, 25 Feb 2008) | 33 lines

Merge changes from team/russell/smdi-1.4

This commit brings in a significant set of changes to the SMDI support in Asterisk.
There were a number of bugs in the current implementation, most notably being that
it was very likely on busy systems to pop off the wrong message from the SMDI message
queue.  So, this set of changes fixes the issues discovered as well as introducing
some new ways to use the SMDI support which are required to avoid the bugs with
grabbing the wrong message off of the queue.

This code introduces a new interface to SMDI, with two dialplan functions.  First,
you get an SMDI message in the dialplan using SMDI_MSG_RETRIEVE() and then you access
details in the message using the SMDI_MSG() function.  A side benefit of this is that
it now supports more than just chan_zap.

For example, with this implementation, you can have some FXO lines being terminated 
on a SIP gateway, but the SMDI link in Asterisk.

Another issue with the current implementation is that it is quite common that the
station ID that comes in on the SMDI link is not necessarily the same as the Asterisk
voicemail box.  There are now additional directives in the smdi.conf configuration
file which let you map SMDI station IDs to Asterisk voicemail boxes.

Yet another issue with the current SMDI support was related to MWI reporting over
the SMDI link.  The current code could only report a MWI change when the change
was made by someone calling into voicemail.  If the change was made by some other
entity (such as with IMAP storage, or with a web interface of some kind), then the
MWI change would never be sent.  The SMDI module can now poll for MWI changes if
configured to do so.

This work was inspired by and primarily done for the University of Pennsylvania.

(also related to issue #9260)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104120 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-26 00:31:40 +00:00
Brett Bryant 55aaa80d15 Adding more tls configuration details to sip.conf sample, with a list of valid ciphers provided in both files. .. First commit since July, woot
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-25 19:00:16 +00:00
Mark Michelson 44810652d6 Change the queue holdtime announcement to happen at any interval (not just greater than two minutes). Remove
the saying of less-than for holdtime announcements since it can lead to awkward holdtime announcements. Using
'1' as a queue-round-seconds value is no longer valid.

(closes issue #9736)
Reported by: caio1982
Patches:
      queue_announce5.diff uploaded by caio1982 (license 22)
	  Tested by: caio1982, putnopvut


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-14 20:46:00 +00:00
Kevin P. Fleming a33932047d Merged revisions 103315 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103315 | kpfleming | 2008-02-11 11:05:22 -0600 (Mon, 11 Feb 2008) | 2 lines

improve 2BCT documentation a bit (thanks Jared)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-11 17:09:04 +00:00
Kevin P. Fleming cdff02c08f Merged revisions 102807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102807 | kpfleming | 2008-02-07 10:41:55 -0600 (Thu, 07 Feb 2008) | 2 lines

document usage of 'transfer' configuration option for ISDN PRI switch-side transfers

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-07 16:47:52 +00:00
Russell Bryant 31d411d393 Merged revisions 102651 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r102651 | russell | 2008-02-06 09:19:41 -0600 (Wed, 06 Feb 2008) | 3 lines

Clarify setting DYNAMIC_FEATURES so that it gets inherited by outbound channels.
(due to a discussion between me and a user via email)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-06 15:20:31 +00:00
Jason Parker f910cb5cb9 Change examples to use G here also.
Closes issue #11875


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-04 14:37:11 +00:00
Tilghman Lesher de0d0ad137 Clarify the pooling functionality by changing the config file keyword
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-01 18:08:44 +00:00
Olle Johansson 9d07e7e9ee Clarify configuration file that can be misunderstood
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-30 20:08:58 +00:00
Olle Johansson a1bf177286 Removing applications that wasn't ready for svn trunk, as trunk now has
pre-release status.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-30 17:12:06 +00:00
Jason Parker 0065508b25 Merged revisions 101219 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11875)
........
r101219 | qwell | 2008-01-30 09:34:37 -0600 (Wed, 30 Jan 2008) | 5 lines

Change default config to use descending channel order of groups, rather than ascending.
Fixes a potential source of confusion in glare-type situations.

Issue 11875, reported by JimVanM.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-30 15:35:28 +00:00
Olle Johansson 11455c0898 Add rtppage() application to do multicast or unicast RTP paging to SIP phones.
(closes issue #11797)
Reported by: macbrody
Patches: 
      app_rtppage-20080130.c uploaded by macbrody (license 352)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-30 15:30:38 +00:00
Jason Parker 7928888ecd Reintroduce more chan_vpb stuff that was removed in r100421 and r100422
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-28 21:11:24 +00:00
Jason Parker 838310187b Remove more remnants of chan_vpb
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-25 22:47:52 +00:00
Joshua Colp 3bf7daa0c0 Merge in strictrtp branch. This adds a strictrtp option to rtp.conf which drops packets that do not come from the remote party.
(closes issue #8952)
Reported by: amorsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@100206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-24 17:47:50 +00:00
Tilghman Lesher cfa0ec1f97 Add res_config_ldap for realtime LDAP engine.
(closes issue #5768)
 Reported by: mguesdon
 Patches: 
       res_config_ldap-v0.7.tar.gz uploaded by mguesdon (license 121)
       res_ldap.conf.sample uploaded by suretec (license 70)
       asterisk-v3.1.4.ldif uploaded by suretec (license 70)
       asterisk-v3.1.4.schema uploaded by suretec (license 70)
 Tested by: oej, mguesdon, suretec, cthorner


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-22 22:33:20 +00:00
Russell Bryant d1ba37f1c9 Change the Asterisk CLI startup commands feature to read commands to run from cli.conf
after a discussion on the -dev list.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-22 20:33:16 +00:00
Olle Johansson c85b71bf72 Documentation updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-22 09:57:16 +00:00
Mark Michelson 6d57a8c873 Adding the QUEUENAME variable to the variables set using the setqueuevar option
in queues.conf.

Suggestion comes from Shaun2222 on IRC.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-21 22:32:13 +00:00
Tilghman Lesher 6181e386b5 Merged revisions 99341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99341 | tilghman | 2008-01-21 12:11:07 -0600 (Mon, 21 Jan 2008) | 8 lines

Permit the user to specify number of seconds that a connection may remain idle,
which fixes a crash on reconnect with the MyODBC driver.
(closes issue #11798)
 Reported by: Corydon76
 Patches: 
       20080119__res_odbc__idlecheck.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-21 18:15:57 +00:00
Russell Bryant 12a6e88d8c correct the name of a CLI command for getting available device names
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-20 06:13:22 +00:00
Russell Bryant f20450ea03 Merge changes from team/russell/console_devices
- Add support for multiple devices.  All devices are configured in console.conf.
 - Add "console list devices" CLI command to show configured devices.  Also, changed
 the old "list devices" to be "list available", which queries PortAudio for all
 audio devices that are available for use.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-20 06:11:49 +00:00
Russell Bryant b995c78c31 Merge changes from team/group/sip-tcptls
This set of changes introduces TCP and TLS support for chan_sip.  There are various
new options in configs/sip.conf.sample that are used to enable these features.  Also,
there is a document, doc/siptls.txt that describes some things in more detail.

This code was implemented by Brett Bryant and James Golovich.  It was reviewed
by Joshua Colp and myself.  A number of other people participated in the testing
of this code, but since it was done outside of the bug tracker, I do not have their
names.  If you were one of them, thanks a lot for the help!

(closes issue #4903, but with completely different code that what exists there.)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-18 22:04:33 +00:00
Jason Parker 8dc5e09ccb Add several busy detection related defines to menuselect.
Allow better busy detect debugging (with BUSYDETECT_DEBUG).

Remove very old BUSYDETECT and BUSY_DETECT_MARTIN defines.

(closes issue #11107)
Patches:
      busydetect_enhancement.patch uploaded by agx (license 298)
      busydetect-r94975.diff uploaded by sergee (license 138)

Additional changes/cleanup by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98998 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-17 20:51:26 +00:00
Jason Parker 4346a37106 Merged revisions 98991 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #11784)
........
r98991 | qwell | 2008-01-17 10:19:46 -0600 (Thu, 17 Jan 2008) | 4 lines

Add a clarification about the immediate= option of zapata.conf

Issue 11784, patch by klaus3000.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-17 16:21:38 +00:00
Kevin P. Fleming cd4cc27c93 major reliability and performance improvement in VWMI monitoring for FXO ports (code by markster, me and dbailey)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-17 16:17:52 +00:00
Terry Wilson 417c6dcb1d Update res_phoneprov to default to setting the SERVER variable to the IP
the HTTP request for the config came in on and the SERVER_PORT to the
bindport setting in sip.conf.  I've left in the ability to override these
options, because I can't always guess how someone might decide to do something
weird with what is available to them--although needing to is pretty unlikely.

Documentation was updated to reflect preference for not setting serveraddr,
serveriface, or serverport.  Tested on Linux and OS X.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-17 03:09:32 +00:00
Russell Bryant 6aaa992301 Merge the changes from issue #10665 from the team/group/sip_session_timers branch.
This set of changes introduces SIP session timers support (RFC 4028).  In short,
this prevents stuck SIP sessions that were not properly torn down due to network
or endpoint failures during an established SIP session.

To quote some of the documentation supplied with the patch:
"The SIP Session-Timers is an extension of the SIP protocol that allows end-points and proxies to
refresh a session periodically. The sessions are kept alive by sending a RE-INVITE or UPDATE
request at a negotiated interval. If a session refresh fails then all the entities that support Session-
Timers clear their internal session state. In addition, UAs generate a BYE request in order to clear
the state in the proxies and the remote UA (this is done for the benefit of SIP entities in the path
that do not support Session-Timers)."

(closes issue #10665)
Reported by: rjain
Patches:
      chan_sip.c.1.diff uploaded by rjain (license 226)
      chan_sip.c.diff uploaded by rjain (license 226)
      sip.conf.sample.diff uploaded by rjain (license 226)
      proc_422_rsp_comment.diff uploaded by rjain (license 226)
      chan_sip.c.cache.diff uploaded by rjain (license 226)
      chan_sip.memalloc uploaded by rjain (license 226)
      chan_sip.memalloc.bugfix uploaded by rjain (license 226)

      Patches tracked in team/group/sip_session_timers, with some additional fixes
      by russell and oej.

Tested by: jtodd, rjain, loloski


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-16 21:53:10 +00:00
Tilghman Lesher 799246dae3 Add the "filter" keyword
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-15 23:52:11 +00:00
Jason Parker b875d0df01 Add backupdeleted option to app_voicemail
(closes issue #10740)
Reported by: ruffle
Patches:
      app_voicemail.diff uploaded by ruffle (license 201)
      10740-voicemail.diff uploaded by qwell (license 4)
      20080113_bug10740.diff.txt uploaded by mvanbaak (license 7)
Tested by: blitzrage, mvanbaak, qwell


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-14 22:19:40 +00:00
Kevin P. Fleming 138799091c Add 'auto' signalling mode for Zaptel channels.
(closes issue #11690)
Reported by: tzafrir
Patches:
      signaling_to_signalling.diff uploaded by tzafrir (license 46)
      signalling_cleanup.diff uploaded by tzafrir (license 46)
      zap_auto_default.diff uploaded by tzafrir (license 46)
      zap_no_default_sig.diff uploaded by tzafrir (license 46)
      zap_signal_auto.diff uploaded by tzafrir (license 46)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-11 23:10:57 +00:00
Russell Bryant 5c2beee6c3 Add a new global and per-peer option to chan_sip, qualifyfreq, which allows you
to set the qualify frequency.

(closes issue #11597)
Reported by: wilder
Patches:
      qualifyfreq5.patch uploaded by wilder (license 362)
	   -- with some mods by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-11 00:38:23 +00:00
Russell Bryant 234b856d17 Merged revisions 97753 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97753 | russell | 2008-01-10 10:19:47 -0600 (Thu, 10 Jan 2008) | 2 lines

Remove other remnants of pbx_kdeconsole

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-10 16:22:10 +00:00
Tilghman Lesher 857e3412f4 Several manager changes:
1) Add the Dialplan class, for NewExten and VarSet events, which should cut
down on the volume of traffic in the Call class.
2) Permit some commands to be run from multiple classes, such as allowing
DBGet to be run from either the System or the Reporting class.
3) Heavily document each class in the sample config, as there were several
that made no sense to be in the write= line, and two that made no sense to be
in the read= line (since they controlled no permissions there).

(Closes issue #10386)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-10 00:12:35 +00:00
Terry Wilson 3570ad103d Added a new module, res_phoneprov, which allows auto-provisioning of phones
based on configuration templates that use Asterisk dialplan function and
variable substitution.  It should be possible to create phone profiles and
templates that work for the majority of phones provisioned over http. It
is currently only intended to provision a single user account per phone.
An example profile and set of templates for Polycom phones is provided.
NOTE: Polycom firmware is not included, but should be placed in
AST_DATA_DIR/phoneprov/configs to match up with the included templates.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-09 21:37:26 +00:00
Mark Michelson 427f17fd9d Adding the option of specifying a second interface in a member definition for a queue. app_queue
will monitor this second device's state for the member, even though it actually calls the first
interface. This ability has been added for statically defined queue members, realtime queue members,
and dynamic queue members added through the CLI, dialplan, or manager.

(closes issue #11603, reported by acidv)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-08 21:18:32 +00:00
Russell Bryant ef0dd2e184 Merged revisions 96932 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r96932 | russell | 2008-01-07 14:47:52 -0600 (Mon, 07 Jan 2008) | 10 lines

Merged revisions 96931 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

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

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

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-07 20:48:23 +00:00
Russell Bryant d27b5d9648 Add a note about viewing the default set of documentation using the built-in http server
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-07 17:15:11 +00:00
Kevin P. Fleming 9d3ee005b0 another checkpoint... chan_zap can now use the new ZT_ECHOCAN_PARAMS ioctl if it is present, but doesn't parse any supplied parameters yet
(this implementation is not very memory efficient as the parameters and their values will be duplicated for each channel that has the same settings, but we can worry about that later once it is working)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-02 21:51:37 +00:00
Russell Bryant 4e99cc88e2 Merge the main set of changes from team/russell/chan_console.
Add a new console channel driver, chan_console, which is a console channel
driver that uses portaudio as a cross platform audio interface.  It was written
to provide a console channel driver that works with Mac CoreAudio, but it
supports a number of other audio interfaces, as well, including OSS and ALSA.
It could one day be the single console channel driver, but does not yet have
as many features as chan_oss.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-31 16:13:26 +00:00
Mark Michelson 00d848c94e Adding support for storing the queue log entries in a realtime backend.
(closes issue #11625, reported and patched by sergee)

Thank you very much to sergee for adding this new feature!



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-26 15:58:17 +00:00
Tilghman Lesher 27f8b5bc2d Change the abbreviated TON from 'A' to 'V', since 'A' is a legitimate DTMF
character.  Also, fix the documentation to match the code.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-25 03:34:09 +00:00
Luigi Rizzo 67a704503b Change the name of config file entries for keypad regions
from 'keypad_entry' to 'region'. Fix the example file accordingly.
Also make some fixes in the code do reset entries on reload of the keypad.

The recently committed kpad2.jpg has the correct names.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-22 22:44:31 +00:00
Mark Michelson b489558138 Merging the queue-penalty branch. In short, this allows one to dynamically adjust
the QUEUE_MAX_PENALTY and the newly introduced QUEUE_MIN_PENALTY during a call depending
on the amount of time passed. The purpose is to allow the call to open up to more (or maybe
just different) members without the caller's losing his place in the queue. See 
configs/queuerules.conf.sample for an example of how to set up queue rules and configs/queues.conf.sample
for how to associate a rule with a queue.

Along with the functional changes, new CLI and manager commands exist to show the rules defined and
there is an additional CLI command to reload the queue rules.

Future enhancements that may be made: support for realtime queue rules and support for dynamically adding
a rule through the manager or CLI. Also a manager command to reload the queue rules (I'll probably write
this myself very soon).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-21 00:44:17 +00:00
Russell Bryant a9616a7153 Add a bit more to the description of the "mwimonitor" option.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 22:39:39 +00:00
Olle Johansson 1d6b192ce0 Adding the ability to specify the To: header in an outbound INVITE
by adding an exclamation mark to the dial string.

This patch also exists for 1.4 in the fixtoheader-1.4 branch
and has been in production for quite some time.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-19 08:57:45 +00:00
Olle Johansson 17afebc1a6 HUGE improvements to QoS/CoS handling by IgorG
- Refer to the proper documentation
- Implement separate signalling/media QoS/CoS in many channels using RTP
- Improve warnings and verbose messages
- Deprecate some old settings

Minor modifications by me, a big effort from IgorG.
Thanks!


Reported by: IgorG
Patches: 
      qoscleanup-89394-4-trunk.patch uploaded by IgorG (license 20)
Tested by: IgorG
(closes issue #11145)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-16 10:51:53 +00:00
Olle Johansson 00647ff5f7 Update documentation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-16 08:19:38 +00:00
Olle Johansson d8795b4542 Make more timers settable in SIP so that we can force timeout earlier on non-responsive SIP servers.
Thanks, jcmoore, for the patch!

Reported by: jcmoore
Patches: 
      peer_t1_timerb_trunk_v3.patch.txt uploaded by jcmoore (license 9)
(closes issue #9771)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-16 08:15:31 +00:00
Luigi Rizzo 94a6c12129 configuration options related to video support.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-15 00:44:34 +00:00
Tilghman Lesher 70cd3d0037 Remove use of privacy.conf by the Privacy app.
Reported by: eliel
Patch by: eliel
(Closes issue #11344)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-14 19:27:54 +00:00
Jason Parker fc607d5be4 Update documentation for pbx_lua.
Closes issue #11492, patch by mnicholson.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-07 21:28:49 +00:00
Tilghman Lesher ce2f670228 Change cdr_manager to use a "CDR" level, rather than the (overcrowded) "call" level.
(Closes issue #11015)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-05 16:46:47 +00:00
Joshua Colp fd4f9d55e8 Remove second prefix line. Only need it documented once in the same file.
(closes issue #11472)
Reported by: eserra
Patches:
      http.conf.sample.diff uploaded by eserra (license 45)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-05 16:14:06 +00:00
Olle Johansson 0cc002a48a Rename "username" to "defaultuser" to match with "defaultip".
"Username" still works, but is deprecated.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-05 13:09:47 +00:00
Russell Bryant f15be28fb0 Add support for monitoring MWI on FXO lines.
This introduces two new options for zapata.conf: mwimonitor and mwimonitornotify.
The mwimonitor option enables MWI monitoring.  When the MWI state on a line changes,
then the script specified by mwimonitornotify will be executed for custom handling
of the state change, similar to the externnotify option of voicemail.conf.

Also, when the MWI state on an FXO line changes, an internal Asterisk event is
generated to indicate the new state of the associated mailbox.  That may, any
module that cares about MWI information will get notified and can handle it
just as if app_voicemail had sent this notification.

(BE-253, original patch from markster, with some minor modifications by me to
 add comments, documentation, and internal event support)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-04 19:08:30 +00:00
Mark Michelson 18259c2318 Updating sample queues.conf file to show how multiple periodic announcements
may be specified since this was not documented previously

(closes issue #11432, reported and patched by Laureano)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-03 16:46:01 +00:00
Mark Michelson 6b08c442c7 Adding support for the "automixmonitor" dial and queue options.
This works in much the same way as the automonitor, except that instead of using the monitor
app, it uses the mixmonitor app. By providing an 'x' or 'X' as a dial or queue option, a DTMF
sequence may be entered (as defined in features.conf) to start the one-touch mixmonitor.

This patch also introduces some new API calls to the audiohooks code for searching for an audiohook
by type and for searching for a running audiohook by type.

Big thanks to joetester for writing the initial patch, testing it and patiently waiting for it to 
be committed.

(closes issue #10185, reported and patched by xmarksthespot)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-30 21:19:57 +00:00
Kevin P. Fleming 57c2bcca86 Merged revisions 90098 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90098 | kpfleming | 2007-11-28 16:30:46 -0600 (Wed, 28 Nov 2007) | 2 lines

it is impossible to set permissions for manager accounts created by users.conf (reported internally, patched by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-28 22:44:38 +00:00
Mark Michelson a42259c3ff Adding support for realtime music on hold. The following are the main points:
1. When moh is started, we search first in memory to find the class. If we do not
   find it in memory, we search realtime instead.

2. When moh is restarted (as in, it had been started on this particular channel, stopped,
   and now we're starting it again), if using the "files" mode, then realtime will always
   be rechecked. If you are using other modes, however, we will simply reattach to the external
   running process which was playing moh earlier in the call. This is a necessary compromise so that
   we don't end up with too many background processes.

3. musiconhold.conf has a general section now. It has one option: cachertclasses. If set to yes,
   then moh classes found in realtime will be added to the in-memory list. This has the advantage
   of not requiring database lookups each time moh is started, but it has the disadvantage of not
   truly being realtime.

I have tested this for functionality, and it passes. I also tested this under valgrind and there
are no memory problems reported under typical use.

Special thanks to Sergee for implementing this feature and enduring my complaints on the bugtracker!

(closes issue #11196, reported and patched by sergee)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-28 00:47:22 +00:00
Russell Bryant df1689e927 Merged revisions 89634 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89634 | russell | 2007-11-27 10:12:33 -0600 (Tue, 27 Nov 2007) | 3 lines

Add a note to the sample voicemail config noting that when using IMAP storage,
only the first format specified will be attached to the message.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-27 16:13:14 +00:00
Olle Johansson b1c0c67e76 Merged revisions 89624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89624 | oej | 2007-11-27 08:34:19 +0100 (Tis, 27 Nov 2007) | 6 lines

Clarify limitonpeers=yes

(closes issue #11304)
Reported by: pj


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-27 07:36:54 +00:00
Steve Murphy 4d8932a6dc Merged revisions 89622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89622 | murf | 2007-11-26 23:24:02 -0700 (Mon, 26 Nov 2007) | 1 line

closes issue #11379; OK, this is an attempt to make both sides happy. To the cdr.conf file, I added the option 'unanswered', which defaults to 'no'. In this mode, you will see a cdr for a call, whether it was answered or not. The disposition will be NO ANSWER or ANSWERED, as appropriate. The src is as you'd expect, the destination channel will be one of the channels from the Dial() call, usually the last in the list if more than one chan was specified. With unanswered set to 'yes', you will still see this cdr entry in both cases. But in the case where the dial timed out, you will also see a cdr for each line attempted, marked NO ANSWER, with no destination channel name. The new option defaults to 'no', so you don't see the pesky extra cdr's by default, and you will not see the irritating 'not posted' messages.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-27 06:47:08 +00:00
Olle Johansson 11df6a9119 Rename "limitonpeer" to "counteronpeer" since the call-limit is deprecated.
Both still works in this version.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-26 21:23:48 +00:00
Steve Murphy 2ec4b57622 Thanks to pnlarsson for noting the spelling error in the cli commands. Also, added some verbage about the new algorithm to CHANGES.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89583 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-26 16:24:27 +00:00
Tilghman Lesher f1de129e5f Merged revisions 89559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89559 | tilghman | 2007-11-25 11:17:10 -0600 (Sun, 25 Nov 2007) | 14 lines

We previously attempted to use the ESCAPE clause to set the escape delimiter to
a backslash.  Unfortunately, this does not universally work on all databases,
since on databases which natively use the backslash as a delimiter, the
backslash itself needs to be delimited, but on other databases that have no
delimiter, backslashing the backslash causes an error.

So the only solution that I can come up with is to create an option in res_odbc
that explicitly specifies whether or not backslash is a native delimiter.  If
it is, we use it natively; if not, we use the ESCAPE clause to make it one.

Reported by: elguero
Patch by: tilghman
(Closes issue #11364)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-25 17:50:07 +00:00
Olle Johansson 07cb09ad86 - Deprecate "call-limit" in chan_sip. No other channel driver enforces call-limits
and we now have the groupcount system to implement call-limits in the dialplan. You
  can use the "setvar" option in realtime/sip.conf to set limits per device.

- Implement "callcounter" as a new option to enable the call counting we need to
  report device status to queue, manager and SIP subscriptions.

The call counter setting is now enabled in the code by setting the device call-limit
to 999. When we remove the call limit, we can simply enable this with a boolean
setting.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-25 11:46:17 +00:00
Steve Murphy a63f6be669 closes issue #11363; where the pattern _20x. buried in an included context, didn't match 2012; There were a small set of problems to fix: 1. I needed NOT to score patterns unless you are at the end of the data string. 2. Capital N,X,Z and small n,x,z are OK in patterns. I canonicalize the patterns in the trie to caps. 3. When a pattern ends with dot or exclamation, CANMATCH/MATCHMORE should always report this pattern, no matter the length. With this commit, I also supplied the wish of Luigi, where the user can select which pattern matching algorithm to use, the old (legacy) pattern matcher, or the new, trie based matcher. The OLD matcher is the default. A new [general] section variable, extenpatternmatchnew, is added to the extensions.conf, and the example config has it set to false. If true, the new matcher is used. In all other respects, the context/exten structs are the same; the tries and hashtabs are formed, but in the new mode the tries are not used. A new CLI command 'dialplan set extenpatternmatch true/false' is provided to allow switching at run time. I beg users that are forced to return to the old matcher to please report the reason in the bug tracker. Measured the speed benefit of the new matcher against an impossibly large context with 10,000 extensions: the new matcher is 374 times faster.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-24 21:00:26 +00:00
Russell Bryant f0780d2b47 Merged revisions 89527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89527 | russell | 2007-11-22 12:29:41 -0500 (Thu, 22 Nov 2007) | 3 lines

mvanbaak pointed out a spelling error in this sample configuration file.  While
I was at it, I went ahead and tweaked it a little bit more.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-23 02:37:38 +00:00
Mark Michelson f5e5a443cf Changed occurrences of "busy-level" to "busylevel" in sip.conf.sample
in light of commit 89441. Thanks to pj for pointing out the need for this

(closes issue #11307, reported by pj)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-20 16:11:19 +00:00
Olle Johansson eab6b00904 Add support for application/dtmf SIP INFO dtmf handling. Yep, another
way of handling DTMF in SIP. Totally undocumented, but implemented
in enough devices so we have to support it. 

Code by sergee, small changes by oej.

Closes issue #11049


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15 10:21:41 +00:00
Christian Richter 2a0b16b663 Merged revisions 89173 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89173 | crichter | 2007-11-12 12:26:48 +0100 (Mo, 12 Nov 2007) | 1 line

if we're NT and no number was dialed and overlapdial is set, we wait for the ISDN timeout instead of starting our own timer. added a comment for the misdn.conf.sample for the overlapdial config option.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-12 13:36:45 +00:00
Christian Richter c9b8afb447 Merged revisions 89169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89169 | crichter | 2007-11-12 10:45:36 +0100 (Mo, 12 Nov 2007) | 1 line

aded ntkeepcalls option, to avoid droÃpping calls when the L2 goes down on a PTP link. There are some pbx which do turn off the L1 for a very short while and restart it immediately. normally T310 should be started and after 10 seconds or so the calls should be dropped, this is a simple fix wihtout this timer.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-12 12:49:19 +00:00
Jason Parker a442780a75 Add usbradio.conf.sample from branches/1.4/configs - r84162.
It was mistakenly deleted in 1.4 without ever being merged to trunk.

Reported by eliel on #asterisk-dev.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-09 18:57:21 +00:00
Jason Parker b436362b19 Fix a few potential deadlocks in cdr_sqlite3_custom.
(also rename sample config to .sample)

Closes issue #11208, patch by Laureano.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-09 16:32:01 +00:00
Jason Parker e03cb6a721 Merged revisions 89115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11195)
........
r89115 | qwell | 2007-11-08 12:45:15 -0600 (Thu, 08 Nov 2007) | 4 lines

Avoid warnings on load when using sample configuration files.

Issue 11195, patch by eliel.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 18:48:15 +00:00
Tilghman Lesher 6a9fbeaf68 Merged revisions 89079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89079 | tilghman | 2007-11-06 22:07:49 -0600 (Tue, 06 Nov 2007) | 5 lines

Suppress AEL warnings on load.
Reported by: eliel
Patch by: eliel
Closes issue #11178

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 04:11:32 +00:00
Tilghman Lesher 37166d9a1a Provide the ability to directly manipulate the TON/NPI bits in the dialstring.
Reported by: thetatag
Patch by: thetatag/stevens/tilghman
Closes issue #5331


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 02:14:40 +00:00
Mark Michelson 0cd3118a62 Adding the queue strategy wrandom
(closes issue #10942, reported and patched by julianjm, documentation changes by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 22:36:55 +00:00
Joshua Colp e9e78af981 Merged revisions 88994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88994 | file | 2007-11-06 12:24:56 -0400 (Tue, 06 Nov 2007) | 6 lines

Fix improbable but possible memory leaks in chan_zap.
(closes issue #11166)
Reported by: eliel
Patches:
      chan_zap.c.patch uploaded by eliel (license 64)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 16:29:16 +00:00
Russell Bryant b164d5a675 Add jitterbuffer support to chan_unistim.
(closes issue #11168)
Reported by: IgorG
Patches: 
      unistimjb-88863-1.patch uploaded by IgorG (license 20)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 14:11:34 +00:00
Russell Bryant 267683eb19 Merge the code from asterisk/team/group/chan_unistim:
This introduces a new channel driver, chan_unistim, that supports the Unistim
VoIP protocol for Nortel phones.  The following models have been confirmed 
to work: i2002, i2004 and i2050.

(closes issue #8864)
Reported by: c_hans
Patches: 
      chan_unistim.patch uploaded by c (license 304)
      ustm_no_conf.diff uploaded by junky (license 177)
Tested by: c_hans, dbowerman, math, junky, loloski


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 20:56:12 +00:00
Tilghman Lesher e8c781b215 Add pbx_lua as a method of doing extensions
Reported by: mnicholson
Patch by: mnicholson
Closes issue #11140


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-02 15:36:34 +00:00
Mark Michelson cf861b38c7 Added queue strategy "linear". This strategy is useful for those who always wish for their
phones to be rung in a specific order.

(closes issue #7279, reported and initially patched by diLLec, patch reworked by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-26 15:19:46 +00:00
Mark Michelson 6cd5e1aee6 Remove information about the roundrobin strategy from trunk's queues.conf.sample
since it no longer exists



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-26 14:59:31 +00:00
Mark Michelson a8cc80e36d Adding the general option "shared_lastcall" to queues so that a member's wrapuptime
may be used across multiple queues.

(closes issue #9777, reported and patched by eliel)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-24 21:26:27 +00:00
Kevin P. Fleming 0c14c47523 resetinterval defaulting to something other than 'never' doesn't seem to accomplish any good and causes problems for plenty of people...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22 14:59:27 +00:00
Matthew Fredrickson c5bb538818 Improved comments and organization for zapata.conf (#10904)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-20 19:56:26 +00:00
Tilghman Lesher 6998be1b3b Document the changes made earlier today to meetme
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-17 20:42:20 +00:00
Mark Michelson cd1e6873aa Merged revisions 86032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86032 | mmichelson | 2007-10-16 18:35:31 -0500 (Tue, 16 Oct 2007) | 3 lines

Since monitor-join is deprecated now, remove the example from the sample queues.conf file


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-16 23:36:35 +00:00
Jason Parker ed690fc348 Switch dundi to new tos config format.
Remove old unused defines for old style.

Closes issue 10860, patch by IgorG.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15 23:20:40 +00:00
Joshua Colp fb9855eba1 Merged revisions 85571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85571 | file | 2007-10-15 13:39:59 -0300 (Mon, 15 Oct 2007) | 4 lines

Document that DTMF based features only work when two channels are bridged together.
(closes issue #10773)
Reported by: pbayley

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15 16:41:56 +00:00
Mark Michelson fbcd884e1b Allow for the position announcement to be turned off if desired.
(closes issue #8515, reported by bruno_rocha, initial patch by bruno_rocha, final patch by qwell)




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-12 20:06:37 +00:00
Philippe Sultan 510430a6a2 Make the status and priority configurable.
Closes issue #10785, patch by Luke-Jr, thanks!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07 16:28:25 +00:00
Russell Bryant df30de142c Add a new option for files-based music on hold to ensure that the sort order
of the files is alphabetical.

(closes issue #10855)
Reported by: jamesgolovich
Patches: 
      asterisk-mohsortalpha.diff.txt uploaded by jamesgolovich (license 176)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-01 14:43:56 +00:00
Dwayne M. Hubbard 0f53904918 merged jcmoore's patch for configurable SDP origin-field username and session field, closes issue# 10795
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-24 17:10:14 +00:00
Jason Parker 0c8381a1f5 (closes issue #10739)
Reported by: ruffle
Patches:
      app_voicemail.c.diff uploaded by ruffle (license 201)
      10739-moveheard.diff uploaded by qwell (license 4)
Tested by: callguy, ruffle

Add an option to disable the automatic moving of "heard" messages to the Old folder.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 21:07:08 +00:00
Jason Parker 9a5f7c5764 (closes issue #10755)
Reported by: snar
Patches:
      app-queue-cdr-trunk.patch uploaded by snar (license 245)
      queues.conf.patch uploaded by snar (license 245)

Add an updatecdr option to queues.conf, so that if a "member name" is specified,
 the cdr record will be updated with that, rather than the channel.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 16:16:36 +00:00
Jason Parker a9c2f441d3 Merged revisions 82751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(Closes issue #10753)
........
r82751 | qwell | 2007-09-18 10:28:21 -0500 (Tue, 18 Sep 2007) | 4 lines

Correct the allowexternaldomains option in SIP sample config.

Issue 10753

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 15:29:26 +00:00
Jason Parker cb8c4122bc Fix the sample redirect to point to a valid file in the Asterisk GUI.
Closes issue #10748, patch by bkruse


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 21:44:38 +00:00
Russell Bryant da5930c234 Merged revisions 82435 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82435 | russell | 2007-09-14 16:17:08 -0500 (Fri, 14 Sep 2007) | 3 lines

Add a note to help clarify the value set with the echocancel option.
(inspired by Malcolm's blog post on blogs.digium.com about HPEC)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 21:21:23 +00:00
Jason Parker 4baba7c951 Add support in chan_skinny for sending RTP directly to the endpoints.
Closes issue #9154, patch by DEA


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 19:49:05 +00:00
Joshua Colp 5460e72015 Add setvar support to chan_zap. Just like you can in chan_sip and chan_iax2 you can now use it with zaptel channels. (done while in Montreal at the Asterisk bootcamp!)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 16:58:59 +00:00
Russell Bryant 1282de797d Various code and documentation cleanups for res_config_sqlite
(closes issue #10711, rbraun_proformatique)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 15:26:40 +00:00
Joshua Colp 9bd4b3e353 Lil' bit more documentation to keep folks happy.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 18:37:39 +00:00
Joshua Colp 9642d93117 (closes issue #9433)
Reported by: junky
Patches:
      register_trying.diff.txt uploaded by jcmoore
Disable sending 100 Trying on REGISTER attempts and make it an option. This has been signed off by oej.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-11 17:58:48 +00:00
Mark Michelson 6ed072cb5a Merged revisions 82091 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82091 | mmichelson | 2007-09-10 10:02:12 -0500 (Mon, 10 Sep 2007) | 5 lines

Removing non-existent options from misdn configuration sample.

(closes issue #10678, reported and patched by IgorG)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-10 15:05:13 +00:00
Mark Michelson 144b090ddb Merged revisions 81886 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81886 | mmichelson | 2007-09-07 10:25:19 -0500 (Fri, 07 Sep 2007) | 3 lines

Moving the explanation for joinempty to a more appropriate place


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-07 15:29:23 +00:00
Russell Bryant 235417dbd0 Fix the syntax of declaring a hint with a name to be compatible with trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06 20:05:50 +00:00
Jason Parker a087396798 Merged revisions 81453 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10644)
........
r81453 | qwell | 2007-09-04 14:56:06 -0500 (Tue, 04 Sep 2007) | 4 lines

Change default followme config file to point to the correct files.

Issue 10644, patch by pabelanger

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-04 19:56:46 +00:00
Joshua Colp 944352251d (closes issue #10633)
Reported by: pabelanger
Patches:
      extensions.ael.sample.patch uploaded by pabelanger (license 224)
Update extensions.ael.sample with voicemail and | changes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-04 14:28:13 +00:00
Mark Michelson 54170b94e0 Added note to sample queues.conf file to line up with most recent change regarding setinterfacevar.
MEMBERREALTIME indicates whether a member is realtime.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-30 18:52:44 +00:00
Russell Bryant 4b2095bdd3 Merged revisions 81379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81379 | russell | 2007-08-30 10:33:48 -0500 (Thu, 30 Aug 2007) | 3 lines

Fix a typo, update a reload command, and remove an unused configuration file.
(closes issue #10606, casper)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-30 15:34:18 +00:00
Tilghman Lesher f5a14167f3 Support better rotation of log files to be more like system logging (closes issue #10398)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-28 20:03:48 +00:00
Russell Bryant 01490ecd70 Merged revisions 81226 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81226 | russell | 2007-08-28 10:41:15 -0500 (Tue, 28 Aug 2007) | 2 lines

Add Russian tones.  (closes issue #7953, hanabana)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-28 15:42:08 +00:00
Joshua Colp 7c760f67c3 (closes issue #10569)
Reported by: IgorG
Patches:
      sip_conf-80933-1.patch uploaded by IgorG (license 20)
Fix up sip.conf sample configuration.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-27 12:18:13 +00:00
Jason Parker 31c82ec1e0 Merged revisions 80130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80130 | qwell | 2007-08-21 10:03:45 -0500 (Tue, 21 Aug 2007) | 7 lines

(closes issue #10510)
Reported by: casper
Patches:
      cdr.conf.diff uploaded by casper (license 55)

Fix a few errors in sample cdr config file.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 15:04:37 +00:00
Jason Parker 3105a37a3d Merged revisions 80047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80047 | qwell | 2007-08-20 11:08:49 -0500 (Mon, 20 Aug 2007) | 7 lines

(closes issue #10499)
Reported by: casper
Patches:
      extensions.conf.sample.diff uploaded by casper (license 55)

Update CLI examples in extensions.conf.sample to reflect command changes.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 16:12:29 +00:00
Tilghman Lesher 782b662898 Documentation for %q in logger.conf, as suggested by jtodd (closes issue #10475)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 16:39:41 +00:00
Joshua Colp 8d9b63884c Merged revisions 78951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78951 | file | 2007-08-10 10:49:19 -0300 (Fri, 10 Aug 2007) | 4 lines

(closes issue #10422)
Reported by: bhowell
Add note to sample configuration about module load order and how it can cause perfectly good queue members to be marked as invalid.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-10 13:50:58 +00:00
Joshua Colp afceb3e4aa Merged revisions 78569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78569 | file | 2007-08-08 10:51:01 -0300 (Wed, 08 Aug 2007) | 4 lines

(closes issue #10335)
Reported by: adamgundy
Update sip.conf to include another scenario where directrtpsetup will fail.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-08 13:52:13 +00:00
Jason Parker bb700d82ce Implement setvar functionality in chan_skinny
Closes issue #10379, patch by mvanbaak.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-06 16:08:11 +00:00
Jason Parker 1064b75ab7 Merged revisions 77996 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9779)
........
r77996 | qwell | 2007-08-02 16:53:39 -0500 (Thu, 02 Aug 2007) | 5 lines

Make sure we actually allow 6 chars to be sent.
Also make note of the "A" option of date format.

Issue 9779, modifications by DEA, wedhorn, and myself.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-02 21:54:54 +00:00
Luigi Rizzo 2286afa3af Enhance NAT support as discussed on the -dev list, i.e.:
+ extensive documentation changes both in sip.conf.sample and in the source;

+ allow "externip" and "externhost" to include a port number as well;

+ allow "bindaddr" to have a port number (making bindport unnecessary,
  even though it is still present for backward compatibility);

+ introduce the new "stunaddr" parameter to specify an STUN server to
  be used from the main SIP socket;

+ extend the "sip show settings" output to show all the above.

Internally:

+ change related data structures from struct in_addr to struct sockaddr_in
  to store the port numbers as well;

+ reorganize ast_sip_ouraddrfor() (should also be renamed to sip_ouraddrfor()
  because it is not a generic API, though it might become so if called with
  a socket as an additional argument, in which case it can be moved elsewhere).

As mentioned in the documentation, media sessions still do not use STUN so the
port numbers may still be incorrect when Asterisk is behind a NAT

On passing, some of the debugging messages printing media addresses are
probably using the wrong values, but this will be checked/fixed in a
subsequent commit if needed.

Part of the following chunk in the function that handles a "sip reload" is
probably needed on previous versions as well, to avoid leaking the memory
used for the "localaddr" list:

@@ -17244,13 +17274,17 @@
 
        /* Reset IP addresses  */
        memset(&bindaddr, 0, sizeof(bindaddr));
+       memset(&stunaddr, 0, sizeof(stunaddr));
+       memset(&internip, 0, sizeof(internip));
+       /* Free memory for local network address mask */
+ --->  ast_free_ha(localaddr);					<-----
        memset(&localaddr, 0, sizeof(localaddr));
        memset(&externip, 0, sizeof(externip));
        memset(&default_prefs, 0 , sizeof(default_prefs));



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-21 01:01:10 +00:00
Jason Parker b928d1a0f3 Add support for default "say mode" (whether to use the "old" method or "new" method. "new" method being config file)
Add support for autocomplete of "say load" CLI command.

Patch by IgorG
(closes issue #10243)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-20 22:25:41 +00:00
Christian Richter 090cbd2945 added general Jitterbuffer Implementation. #9960
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-05 07:45:21 +00:00
Jason Parker 8a9bc541ee Add support for regcontext and regexten to chan_skinny
Issue 9762, patch by mvanbaak.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-29 21:37:43 +00:00
Mark Michelson 5310385315 Added ability to customize which buttons control forward, reverse, pause, and stop during message playback.
(closes issue 9474, reported and patched by jaroth with modifications by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-27 22:47:08 +00:00
Mark Michelson 4596af13fc Adding feature to support the storage and retrieval of voicemail greetings using IMAP storage.
This feature may be turned on by adding imapgreetings=yes to the general section of voicemail.conf
voicemail.conf.sample has details on the options added.

As a result, IMAP storage now has RETRIEVE and DISPOSE macros defined.

In addition to the IMAP greeting changes, I also have added an enum for the voicemail folders
and so now the code should be easier to understand and maintain when it comes to this area.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-27 19:50:21 +00:00
Jason Parker 7a1c2d94bb Add manager events for RTCP statistics.
Also adds a new "reporting" permission for manager, since it can be incredibly spammy.
  This permission was discussed on the -dev mailing list some months back.

Issue 8613, patch by johann8384, with some minor changes by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-21 23:07:20 +00:00
Steve Murphy 9c2197dc9e This enhancement provided via bug 9993, a patch to upgrade cdr_manager to have cdr_custom capabilities. Many thanks to eserra for this contribution
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-19 20:38:21 +00:00
Steve Murphy c6ed12405f These changes were submitted via bug 6683, to allow CID detection in India, with carriers that do Polarity/DTMF CID signalling.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-19 17:07:28 +00:00
Matthew Fredrickson f408a5405a Add support for setting nature of address, presentation, and other related SS7 number options (#10000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-19 15:14:23 +00:00
Jason Parker bd3de6d0f1 Change displayconnects option in manager.conf to be per-user.
Issue 9932, patch by eliel


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-11 22:07:50 +00:00
Joshua Colp cb55dbe8eb Update documentation for proper CLI commands. (issue #9936 reported by eserra)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-11 11:49:48 +00:00
Russell Bryant 6aec360466 Remove our little joke that was making fun of email disclaimers which nobody
else seemed to think was very funny.  Oh well ... :)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-06 22:27:18 +00:00
Russell Bryant 0b6c6b2e89 Add some more information about the SIP Disclaimer header.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-01 13:48:29 +00:00
Russell Bryant 3ce231fe95 fix a typo.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 21:23:55 +00:00
Russell Bryant 3d2b58751f To satisfy some legal concerns, add an option for chan_sip to include a
disclaimer along with SIP messages in the header, X-Disclaimer.  This is off by
default.  Also, the text of the disclaimer can be customized in sip.conf.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 19:41:03 +00:00
Russell Bryant 8d0124aba3 Add support for configuring named groups of custom call features in
features.conf.  This allows you to create a feature one time, and then map it
into groups for various different key mappings for the same feature, as well
as easy access control to groups of features.
(patch from bbryant)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 18:21:47 +00:00
Russell Bryant cc35dc8999 Revert changes that snuck in with revision 66724.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 18:09:50 +00:00
Tilghman Lesher e9251f42df Issue 9799 - Multirow results for func_odbc
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 15:05:56 +00:00
Russell Bryant 8ea9dcc221 Fix a crash on reload by using calloc() instead of malloc() to ensure that
data is properly initialized.
(issue #9765, reported by MatsK, patch from eliel)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 14:52:30 +00:00
Russell Bryant 90d6885701 Add a new feature for Music on Hold. If you set the "digit" option for a
class in musiconhold.conf, a caller on hold may press this digit to switch
to listening to that music class.
  This involved adding a new callback for generators, which allow generators
to get notified of DTMF from the channel they are running on.  Then, a callback
was implemented for the music on hold generators.
(patch from bbryant)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-22 18:52:59 +00:00
Tilghman Lesher 6fbadb4325 Merge cdr_adaptive_odbc from developer branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-18 20:21:11 +00:00
Russell Bryant 7ee1303796 Add an option that lets you only allow one connection at a time for each
manager user.  (issue #8664, reported and original patch by ssokol, patch
updated by bkruse, and further updated by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-17 17:12:23 +00:00