Commit graph

1020 commits

Author SHA1 Message Date
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
Olle Johansson
90bad9d2f5 Issue #6789 - Marquis - Add option to support regexten removal when host becomes unreachable
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-16 07:35:56 +00:00
Matthew Fredrickson
9b5454232c XXX-XXX-XXX appears to be the standard ANSI pointcode format
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-15 20:45:20 +00:00
Jason Parker
fc9e664ccd oops - silly typo there
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-14 18:14:56 +00:00
Jason Parker
2d1b06faef Don't allow rounding seconds to weird values that may cause "unexpected" results.
Issue 9514.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-14 18:08:54 +00:00
Jason Parker
60f6a72123 Add/fix support for Redial, Speeddial, and Messages buttons.
Combined effort by DEA and mvanbaak.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-11 22:52:36 +00:00
Russell Bryant
5ad8cee6d7 Merged revisions 63329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63329 | russell | 2007-05-07 17:28:50 -0500 (Mon, 07 May 2007) | 3 lines

Add a sample configuration file and example tables for use with res_config_pgsql.
(issue #9676, suretec)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-07 22:32:50 +00:00
Pari Nannapaneni
f1ca07ea8b Merged revisions 63047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63047 | pari | 2007-05-04 11:45:29 -0500 (Fri, 04 May 2007) | 1 line

explanation for httptimeout in manager.conf
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 20:11:03 +00:00
Russell Bryant
5d0f7ea753 Add Hungarian language support to say.c and say.conf.
(issue #7077, patch by adomjan)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 23:30:07 +00:00
Russell Bryant
7df63e233c In addition to making it so attended transfers don't fail unnecessarily,
add some new options to control what happens when you hangup on an attended
transfer before the target extension answers the transferred channel.  You
can now have it send the transferee back to the transferer.
(issue #8413, patch from sergee with very minor modifications by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 22:24:51 +00:00
Russell Bryant
32ca8db474 Merged revisions 62497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r62497 | russell | 2007-05-01 11:26:48 -0500 (Tue, 01 May 2007) | 11 lines

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

........
r62496 | russell | 2007-05-01 11:26:23 -0500 (Tue, 01 May 2007) | 3 lines

Add indications.conf information for the Philippines.
(issue #9525, reported and patched by loloski)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-01 16:27:14 +00:00
Russell Bryant
b419fc1134 Add support for setting the CoS for VLAN traffic (802.1p) in Linux. The
file doc/qos.tex has been updated to document the new functionality.
(issue #9540, patch submitted by IgorG)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 16:16:26 +00:00
Jason Parker
b942fe3d89 Merged revisions 62371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62371 | qwell | 2007-04-30 09:52:31 -0500 (Mon, 30 Apr 2007) | 2 lines

Remove unused (and potentially confusing) jitterbuffer options from sample config.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-30 14:56:43 +00:00
Russell Bryant
b6b1bf3213 Merge changes from team/russell/events
This set of changes introduces a new generic event API for use within Asterisk.
I am still working on a way for events to be shared between servers, but this
part is ready and can already be used inside of Asterisk.

This set of changes introduces the first use of the API, as well.  I have
restructured the way that MWI (message waiting indication) is handled.  It is
now event based instead of polling based.  For example, if there are a bunch
of SIP phones subscribed to mailboxes, then chan_sip will not have to
constantly poll the mailboxes for changes.  app_voicemail will generate events
when changes occur.

See UPGRADE.txt and CHANGES for some more information on the effects of these
changes from the user perspective.  For developer information, see the text in
include/asterisk/event.h.

As always, additional feedback is welcome on the asterisk-dev mailing list.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-28 21:01:44 +00:00
Russell Bryant
672fbc1f81 Add a min-announce-frequency option to queues.conf which allows you to control the
minimum amount of time between queue announcements for use when the caller's queue
position changes frequently.
(issue #9604, patch by Matthew Roth)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-27 22:08:54 +00:00
Olle Johansson
c72efe27be Mini-voicemail - an embryo for a new voicemail system based on building
blocks instead of one large monolithic app. Supports multiple templates
and is designed mostly for voicemail delivery over e-mail.

There's a todo with a list of ideas in the source code if you want
to contribute. Feedback is appreciated!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-18 07:57:18 +00:00
Tilghman Lesher
47dd5a15af Issue 6082 - New DTMF event for manager
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-10 23:55:26 +00:00
Russell Bryant
0a9750ef9f Merged revisions 60603 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60603 | russell | 2007-04-06 15:58:43 -0500 (Fri, 06 Apr 2007) | 13 lines

To be able to achieve the things that we would like to achieve with the
Asterisk GUI project, we need a fully functional HTTP interface with access
to the Asterisk manager interface.  One of the things that was intended to be
a part of this system, but was never actually implemented, was the ability for
the GUI to be able to upload files to Asterisk.  So, this commit adds this in
the most minimally invasive way that we could come up with.

A lot of work on minimime was done by Steve Murphy.  He fixed a lot of bugs in
the parser, and updated it to be thread-safe.  The ability to check
permissions of active manager sessions was added by Dwayne Hubbard.  Then,
hacking this all together and do doing the modifications necessary to the HTTP
interface was done by me.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60604 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-06 21:16:38 +00:00
Steve Murphy
cd88d132ce Merged revisions 60323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r60323 | murf | 2007-04-05 16:35:11 -0600 (Thu, 05 Apr 2007) | 1 line

Added some clarification to the example configs for CDRs, on how to select a backend. Also, made cdr-csv the default if you 'make samples', and no other changes.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-05 22:40:42 +00:00
Steve Murphy
684527fcfd Merged revisions 59452 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59452 | murf | 2007-03-29 18:56:36 -0600 (Thu, 29 Mar 2007) | 1 line

A small clarification to keep bugs from being filed, and confusion from rising, if clearglobalvars is set, and globals are set in the AEL file. (9419)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-30 01:16:22 +00:00
Tilghman Lesher
7b905e1282 Merged revisions 59040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59040 | tilghman | 2007-03-19 10:42:26 -0500 (Mon, 19 Mar 2007) | 2 lines

Fix unescaped semicolon (reported via -dev list)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-19 15:43:15 +00:00
Russell Bryant
79a3c3b9e1 Merged revisions 58957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58957 | russell | 2007-03-15 20:42:37 -0500 (Thu, 15 Mar 2007) | 1 line

fix a couple SLA documentation references
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-16 01:43:41 +00:00
Russell Bryant
2ea01c893c Merged revisions 58894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58894 | russell | 2007-03-14 11:33:01 -0500 (Wed, 14 Mar 2007) | 8 lines

By default, don't attempt to do any CallerID handling at all with SLA because
it is known to not work properly in some situations.  However, add an option to
enable it for those that would like to use it anyway.

The short story behind this is that to properly handle CallerID with SLA, we
need the ability to change the CallerID on an existing call, and we are not
ready to handle that.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58895 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-14 16:34:03 +00:00
Russell Bryant
2e2c6e52ee Merged revisions 58870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58870 | russell | 2007-03-13 18:11:08 -0500 (Tue, 13 Mar 2007) | 1 line

fix the reference to the SLA documentation
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-13 23:11:30 +00:00
Russell Bryant
5bea998a55 Merge changes from team/russell/sqlite:
* Add new module, cdr_sqlite3_custom which allows logging custom CDRs into a
  SQLite3 database.  (issue #7149, alerios)
* Add new module, res_config_sqlite, which adds realtime database configuration
  support for SQLite version 2.  I decided that this was ok since we didn't have
  any realtime support for version 3.  If someone ports this to version 3, then
  version 2 support can be removed or marked deprecated.
  (issue #7790, rbarun_proformatique)
* Mark cdr_sqlite as deprecated in favor of cdr_sqlite3_custom.

Also, note that there were other modules on the bug tracker that did not make
the cut because they provided some duplicated functionality.  Those are:

* cdr_sqlite3 (issue #6754, moy)
* cdr_sqlite3 (issue #8694, bsd)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-13 21:22:33 +00:00
Joshua Colp
ea226e9d77 Merged revisions 58779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58779 | file | 2007-03-11 20:51:16 -0400 (Sun, 11 Mar 2007) | 2 lines

Add matchexterniplocally setting which only substitutes your externip/externhost setting if it matches the localnet setting. I know of at least two people who need opposite settings, so I made it an option! (issue #8821 reported by kokoskarokoska)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-12 00:54:13 +00:00
Russell Bryant
32e03f9e4a Add the ability to dynamically specify weights for responses to DUNDi queries.
This can be done using a global variable or a dialplan function.  Using the
SHELL() function will allow you to use an external script to determine what the
weight in the response should be.  This can be very useful in load balancing
applications.
(inspired by discussions with blitzrage and jsmith in #asterisk-bugs)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-07 22:30:52 +00:00
Russell Bryant
ba432b7319 Merged revisions 58119 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58119 | russell | 2007-03-06 17:00:57 -0600 (Tue, 06 Mar 2007) | 3 lines

Clarify the documentation of the dialout and sendvoicemail options.
(issue #9000, caio1982 and serge-v)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58120 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-06 23:01:30 +00:00
Joshua Colp
1dd8e4b0b5 Remove no longer present CLI commands from sample extensions.conf. (issue #9193 reported by junky)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-05 03:41:48 +00:00
Russell Bryant
746f3fcdb2 Add the missing configuration template to the sample config file.
Thanks to Lacy Moore on the asterisk-users list for pointing out that this
was missing!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-03 00:01:25 +00:00
Russell Bryant
3d6e6e07ef Merged revisions 57364 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57364 | russell | 2007-03-01 17:42:53 -0600 (Thu, 01 Mar 2007) | 16 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Originally, I put in the documentation that only Zap interfaces would be
  supported on the trunk side.  However, after a discussion with Qwell, we came
  up with a way to make IP trunks work as well, using some things already in
  Asterisk.  So, here it is, this now officially supports IP trunks.
* Update the SLA documentation to reflect how to setup IP trunks.
* Add a section in sla.txt that describes how to set up an SLA system with
  voicemail.
* Simplify the way DTMF passthrough is handled in MeetMe.
* Fix a bug that exposed itself when using a Local channel on the trunk side
  in SLA.  The station's channel needs to be passed to the dial API when
  dialing the trunk.
* Change a WARNING message to DEBUG in channel.h.  This message is of no use
  to users.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-01 23:44:09 +00:00
Russell Bryant
ae8c0f3fcb Merged revisions 57207 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57207 | russell | 2007-02-28 17:01:52 -0600 (Wed, 28 Feb 2007) | 2 lines

minor tweaks to the sla docs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 23:02:49 +00:00
Russell Bryant
9c58ead89b Merged revisions 57203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57203 | russell | 2007-02-28 16:07:05 -0600 (Wed, 28 Feb 2007) | 7 lines

Merge more changes from svn/asterisk/team/russell/sla_updates

* Add support for private hold.  By setting "hold=private" for a trunk, only
  the station that put the call on hold will be able to retrieve it from hold.
  Also, by setting "hold=private" for a station, any call that station puts
  on hold can only be retrieved by that station.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 22:09:33 +00:00
Russell Bryant
69b0eb24ed Merged revisions 57144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57144 | russell | 2007-02-28 13:56:20 -0600 (Wed, 28 Feb 2007) | 6 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 19:57:41 +00:00
Russell Bryant
4fd59356ef Merged revisions 57089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57089 | russell | 2007-02-28 12:20:05 -0600 (Wed, 28 Feb 2007) | 8 lines

Merge current set of changes from svn/asterisk/team/russell/sla_updates

* Add support for station ring delays.  Ring delays can be set globally for a
  station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 18:21:47 +00:00
Tilghman Lesher
a3da18c244 Issue 7789 - some telcos want the TON set based on the number, but without the NANP prefix removed
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-27 00:11:32 +00:00
Jason Parker
97ab07a9e8 Allow a Skinny device to monitor a dialplan hint (w00t!).
See skinny.conf.sample for configuration example.


Note: Some devices (seen on 12SP+/30VIP) will lock up if they monitor too many hints.
This seems to be a hardware limitation - there isn't anything we can do about it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 02:23:43 +00:00
Russell Bryant
9138e53bc9 Merged revisions 56277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56277 | russell | 2007-02-22 17:08:36 -0600 (Thu, 22 Feb 2007) | 18 lines

Merge changes from team/russell/sla_updates.

This batch of changes to the SLA code does a few different things.

* I made the SLA code event driven instead of having to act in a lot of busy
  loops while dialing things to wait for state changes.  This makes the code
  more efficient and readable at the same time.

* I have implemented a couple of new features.  The first is inbound trunk
  ringing timeouts.  This is an option that defines how long to let an incoming
  call on a trunk to ring.

* I have also implemented ring timeouts for stations.  They may be specified
  for the entire station, meaning it is how long to let the station ring before
  giving up.  You can also specify a ring timeout for a specific trunk on a
  station.  So, you can say that you only want a specific station to ring 5
  seconds if it is line1 ringing, but otherwise, there is no timeout.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-22 23:12:26 +00:00
Russell Bryant
006817c0e7 Merged revisions 55553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55553 | russell | 2007-02-20 10:41:57 -0600 (Tue, 20 Feb 2007) | 3 lines

Change the formatting of sla.conf.sample to make it more readable.  
(issue #9112, blitzrage)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 16:42:33 +00:00
Joshua Colp
6ad66e51ae Allow both an external application and SMDI to do voicemail notification at the same time. (issue #8625 reported by lters)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-19 15:57:24 +00:00
Russell Bryant
f11d0b3d54 Merged revisions 55006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines

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

........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines

Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4, 
and trunk.  I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away.  I also added a note in meetme.conf to describe this
behavior.

We still have another issue in 1.4 and trunk where some conferences with no
users don't go away.  That is the real bug that needs to be addressed here.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 22:50:22 +00:00
Joshua Colp
b8ab0abb83 Allow the user to specify where to enable the respective features for when a parked call is picked up. (ie: transfers and parking)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 18:08:34 +00:00
Joshua Colp
ae6898cbe5 Add option to features.conf that enables parking via DTMF on picked up parked calls. (issue #9082 reported by francesco_r)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 17:41:27 +00:00
Olle Johansson
1f52d1cc81 Issue #7443 - amdtech - Optionally SIP registrations in another
realtime family. 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-15 12:10:55 +00:00
Olle Johansson
88928f67ed Make documentation match the source code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-14 17:02:16 +00:00
Russell Bryant
1bf40c4da3 Merged revisions 54002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54002 | russell | 2007-02-12 10:38:39 -0500 (Mon, 12 Feb 2007) | 2 lines

Fix a typo where "vmpassword" should be "vmsecret"

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54004 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-12 15:48:28 +00:00
Olle Johansson
32495f91f0 Add support for outbound proxy for peers and [general]
This replaces the older, broken, implementation where a setting in
[general] did not do anything and the [peer] part was broken.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-11 19:42:55 +00:00
Russell Bryant
5715b49c30 Merged revisions 53810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53810 | russell | 2007-02-09 18:35:09 -0600 (Fri, 09 Feb 2007) | 24 lines

Merge team/russell/sla_rewrite

This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4.  It is now functional and ready for testing.  However, I will be
adding some additional features over the next week, as well.

For information on how to set this up, see configs/sla.conf.sample 
and doc/sla.txt.

In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:

chan_sip:
 - Add the ability to indicate HOLD state in NOTIFY messages.
 - Queue HOLD and UNHOLD control frames even if the channel is not bridged to
   another channel.

linkedlists.h:
 - Add support for rwlock based linked lists.

dial.c:
 - Add the ability to run ast_dial_start() without a reference channel to
   inherit information from.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-10 00:40:57 +00:00
Kevin P. Fleming
44c6630e4d rename busy-limit to busy-level, since it is not a limit
actually parse the busy-limit option from sip.conf, instead of ignoring it


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-08 16:41:23 +00:00
Olle Johansson
cfe66e6b26 Patch based on this patch with small changes for trunk...
Merged revisions 53109 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53109 | oej | 2007-02-02 01:24:03 +0100 (Fri, 02 Feb 2007) | 4 lines

Disable the direct p2p RTP call setup in SIP. You can enable it in sip.conf, but it is now
considered experimental until we solve the AST_CONTROL_ANSWER with payload and videocaps
stuff.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-02 00:26:25 +00:00
Olle Johansson
0b84b386b9 Implementing "busy-limit".
If you set call limit and busy limit, chan_sip will indicate BUSY for a device
that has reached the busy limit and allow calls up to the call limit, allowing
for call transfers (that generate a new call).

If you only set call limit, chan_sip will not indicate BUSY until that limit
is filled. 

This affects SIP subscriptions, call queues and manager applications.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01 20:43:49 +00:00
Olle Johansson
064e6cff1a Merged revisions 53062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53062 | oej | 2007-02-01 17:35:12 +0100 (Thu, 01 Feb 2007) | 2 lines

Add explanation of port= in combination with defaultip= (thanks jsmith)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01 16:42:24 +00:00
Russell Bryant
174606b4bd Merged revisions 52160 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r52160 | russell | 2007-01-24 19:37:16 -0600 (Wed, 24 Jan 2007) | 2 lines

By suggestion from kpfleming last week, change "vmpassword" to "vmsecret".

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-25 01:38:05 +00:00
Joshua Colp
34df128519 Add SRV Lookup support on outbound calls to chan_iax2. It's listed in the RFC so we might want to support it and please don't hurt me Marko ... (issue #7812 reported by drorlb)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-23 03:15:04 +00:00
Jason Parker
641f38105a Merged revisions 51350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51350 | qwell | 2007-01-20 00:53:49 -0600 (Sat, 20 Jan 2007) | 5 lines

Fix Italian numeral support in say.conf for "_[2-9]00" case.

"2131" would've translated to something along the lines of (pardon my..Italian {or lack thereof})
  "duecentocentotrentuno", which makes no sense at all.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-20 06:54:45 +00:00
Jason Parker
9e220dfd97 Merged revisions 51348 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51348 | qwell | 2007-01-20 00:16:06 -0600 (Sat, 20 Jan 2007) | 8 lines

Fix German language support in say.conf

Properly support 21, 31, 41, 51, 61, 71, 81, and 91.
  einundzwanzig has the same format as zweiundzwanzig (as do all other "_ZX" spoken numerals)

Fix support for numbers in the 10,000,000 to 99,999,999 range.
Add support for numbers in the 100,000,000 to 999,999,999 range.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-20 06:18:09 +00:00
Joshua Colp
10e3cba61e Add parkedcalltransfers option for res_features. This basically enables/disables DTMF based transfers. If you want to get former behavior you will have to make sure it is enabled.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 17:50:25 +00:00
Joshua Colp
04426fab2c Add support for G729 passthrough with Sigma Designs boards. (issue #8829 reported by ywalther)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 17:23:31 +00:00
Russell Bryant
b7ebcec300 Fix a couple of typos in the sample osp.conf.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 01:20:06 +00:00
Matt O'Gorman
a4640ee9d8 Patch allows for changing voicemail password in users.conf from voicemail main, written by AnthonyL bug #8436
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-16 00:29:25 +00:00
Joshua Colp
fea98f6a44 Clarify what the trunkmaxsize value is in (bytes).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-13 04:07:04 +00:00
Joshua Colp
033d849bda Drop trunkrealloc option and just have the maximum size be a configurable option. This is per Kevin's comments on -dev and my own thoughts after I put the previous option in.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-13 04:04:04 +00:00
Joshua Colp
c4b4615dcd Merge in trunkrealloc option for chan_iax2. (issue #8267 reported by marcodmb, branch by anthonyl)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-13 03:26:04 +00:00
Jason Parker
cece8001dd Merged revisions 50647 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50647 | qwell | 2007-01-12 13:24:40 -0600 (Fri, 12 Jan 2007) | 2 lines

Update documentation to state that you shouldn't use realtime static with voicemail.conf

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-12 19:25:26 +00:00
TransNexus OSP Development
8c4c8b6648 1. Update osp module configuration file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-04 19:46:07 +00:00
Christian Richter
1fe0e3d192 Merged revisions 49313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r49313 | crichter | 2007-01-03 10:06:50 +0100 (Mi, 03 Jan 2007) | 41 lines

Merged revisions 48319,48321,48467,48552,48576,49135,49303 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48319 | crichter | 2006-12-06 15:35:25 +0100 (Mi, 06 Dez 2006) | 1 line

changed a few debugs to higher debug levels
........
r48321 | crichter | 2006-12-06 16:48:45 +0100 (Mi, 06 Dez 2006) | 1 line

added the export and import of the MISDN_ADDRESS_COMPLETE Variable to inidcate wether the extension is already completely dialed or if there might come additional digits by information elements. also added some docs for that.
........
r48467 | crichter | 2006-12-14 14:03:49 +0100 (Do, 14 Dez 2006) | 1 line

removed FIXUP state. added check for channel allocation conflict when we create a setup while the other site creates a setup on the same channel, besides the check we resolve this conflict.
........
r48552 | crichter | 2006-12-18 11:19:39 +0100 (Mo, 18 Dez 2006) | 1 line

when our PTP Partner sends us a SETUP with a preselected channel we just accept it, even when we're NT. added some checks for segfaults.
........
r48576 | crichter | 2006-12-19 14:08:51 +0100 (Di, 19 Dez 2006) | 1 line

when we reject a channel, because it's in use already, we shouldn't process the setup anymore. made the channel allocation a bit easier and more understandable, removed a few unused lines
........
r49135 | crichter | 2007-01-02 11:07:22 +0100 (Di, 02 Jan 2007) | 1 line

added check for channel ranges in the set/empty channel functions. set pmp_l1_check default to no. added misdn restart pid cli command. added cleaning of channel when we send a RELEASE_COMPLETE. 
........
r49303 | crichter | 2007-01-03 09:24:00 +0100 (Mi, 03 Jan 2007) | 9 lines

* Added check for bridging in misdn_call to avoid setting echocancellation
  when 2 mISDN channels are involved and when bridging is set. That lead
  to a kernel panic before under different situations, because we switched 
  about 2 times between hardware bridging and echocancelation
* readded MISDN_URATE variable which got lost before, this should make app_v110
  work again
* fixed typo


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-03 11:15:02 +00:00
Olle Johansson
0c3298a573 Update sample config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-02 13:50:51 +00:00
Olle Johansson
0375227e5c Added some docs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-31 09:34:11 +00:00
Tilghman Lesher
94d71436ec 1. Rename 'maxmessage' to 'maxsecs' to differentiate from 'maxmsg'.
2. Rename 'minmessage' to 'minsecs' for parity.
3. Make 'maxsecs' a per-user option, in addition to global.
(Issue # 8624)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-31 04:54:20 +00:00
Tilghman Lesher
1e1fd3c3e0 Integrate functionality tested on svncommunity users back into trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-28 20:13:00 +00:00
Olle Johansson
29ed493b40 Be politically correct
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-27 18:02:10 +00:00
Olle Johansson
da7a35a1cc Add support for buggy Cisco MWI firmware > 8.0.3 (issue 8575 - flewid)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-27 16:56:11 +00:00
Russell Bryant
850dd4ea61 Use spaces as a separator for the redirect option to improve readability
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-24 21:01:02 +00:00
Russell Bryant
2c5071a006 - Convert the list of URI handlers to use the linked list macros. While doing
this, implementing locking of this list to make it thread-safe.

- Add a "redirect" option to http.conf that allows redirecting one URI to
  another.  I was inspired to do this while playing with the Asterisk GUI.  I
  got tired of typing this URL to get to the GUI:
     
     http://localhost:8088/asterisk/static/config/cfgadvanced.html

  So, now I have the following line in http.conf:

     redirect=/=/asterisk/static/config/cfgadvanced.html

  Now, I can type the following into my browser and go to the GUI:

     http://localhost:8088


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-23 20:13:14 +00:00
Steve Murphy
9327720c37 As per bug 7978, this version introduces the jittertargetextra option in config files
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-21 00:24:08 +00:00
Luigi Rizzo
437f4288cd - Generalize the function ssl_setup() so that the certificate info
are passed as an argument.

- Update the code in main/http.c to use the new interface
  (the diff is large but mostly mechanical, due to the name change of
  several variables);

- And since now it is trivial, implement "AMI over TLS", and document
  the possible options in manager.conf

- And since the test client (openssl s_client -connect host:port )
  does not generate \r\n as a line terminator, make get_input()
  also accept just a \n as a line terminator (Mac users: do you
  also need the \r-only version ?)
 
The option parsing in manager.conf is not very efficient, and needs
to be cleaned up and made similar to what we have in http.conf



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48351 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-07 16:42:29 +00:00
Russell Bryant
c7efdf6759 Merged revisions 48323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48323 | russell | 2006-12-06 11:15:45 -0500 (Wed, 06 Dec 2006) | 11 lines

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

........
r48322 | russell | 2006-12-06 11:05:54 -0500 (Wed, 06 Dec 2006) | 3 lines

Fix the name of the rtignoreregexpire option in the sample configuration file.
(issue #8526, arkadia)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-06 16:19:01 +00:00
Olle Johansson
d1b621c6a5 Adding docs on t.38
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-05 16:48:15 +00:00
Jason Parker
3e8669595e Merged revisions 48230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48230 | qwell | 2006-12-04 11:54:46 -0600 (Mon, 04 Dec 2006) | 4 lines

Add documentation to voicemail.conf.sample for ODBC storage.

Issue 8499 - patch by blitzrage.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-04 17:55:38 +00:00
Olle Johansson
c23bc46089 - Disable RTP timeouts during T.38 transmission
- Encapsulate RTP timers to the RTP structure, so we have one set for video and one for audio
- Document RTP keepalive configuration option
- Cleanup and document the monitor support function to hangup on RTP timeouts
- Add RTP keepalive to SIP show settings

Imported from 1.4 with modifications for trunk.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-02 12:05:40 +00:00
Jason Parker
97614cb6b4 Merged revisions 48186 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48186 | qwell | 2006-12-01 14:25:51 -0600 (Fri, 01 Dec 2006) | 10 lines

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

........
r48183 | qwell | 2006-12-01 14:19:10 -0600 (Fri, 01 Dec 2006) | 2 lines

Fix a small typo - issue 8848, reported by pabelanger

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 20:26:44 +00:00
Olle Johansson
4ce5b7c080 - Remove T.38 early media, since T.38 requires two way communication (imported from 1.4)
- Small fixes to limitonpeer


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 18:16:16 +00:00
Joshua Colp
c946e3b3fb Merged revisions 48143 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r48143 | file | 2006-11-30 12:57:35 -0500 (Thu, 30 Nov 2006) | 10 lines

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

........
r48142 | file | 2006-11-30 12:55:23 -0500 (Thu, 30 Nov 2006) | 2 lines

Document 'port' for SIP peers, came up because of the current mailing list thread. (issue #8450 reported by blitzrage)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 17:58:53 +00:00