[asterisk-commits] simon.perreault: branch group/v6 r85646 - in /team/group/v6/trunk: ./ apps/ c...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Oct 15 13:44:25 CDT 2007
Author: simon.perreault
Date: Mon Oct 15 13:44:24 2007
New Revision: 85646
URL: http://svn.digium.com/view/asterisk?view=rev&rev=85646
Log:
Merged revisions 85140,85176-85177,85196-85197,85234,85254,85278-85279,85281,85317,85357,85398,85431,85444,85460,85474,85485,85496-85499,85516,85518-85519,85522,85524-85527,85534-85535,85537,85539,85541-85542,85544,85546-85547,85549-85551,85553-85555,85557-85558,85560,85562,85578,85605,85633 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r85140 | tilghman | 2007-10-09 12:04:41 -0400 (Tue, 09 Oct 2007) | 2 lines
Remove redundant includes (patch by snuffy) (Closes issue #10922)
................
r85176 | tilghman | 2007-10-09 18:21:49 -0400 (Tue, 09 Oct 2007) | 13 lines
Merged revisions 85158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85158 | tilghman | 2007-10-09 16:55:06 -0500 (Tue, 09 Oct 2007) | 5 lines
This commit fixes the following issues:
- Deadlock in ast_write (issue #10406)
- Deadlock in ast_read (issue #10406)
- Possible mutex initialization error in lock.h (issue #10571)
........
................
r85177 | mmichelson | 2007-10-09 18:35:11 -0400 (Tue, 09 Oct 2007) | 5 lines
Patch to add one-touch parking for queues.
(closes issue #10869, reported and patched by bluecrow76)
................
r85196 | kpfleming | 2007-10-10 02:41:51 -0400 (Wed, 10 Oct 2007) | 10 lines
Merged revisions 85195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85195 | kpfleming | 2007-10-10 08:24:41 +0200 (Wed, 10 Oct 2007) | 2 lines
use a macro instead of an inline function, so that backtraces will report the caller of ast_frame_free() properly
........
................
r85197 | rizzo | 2007-10-10 02:48:50 -0400 (Wed, 10 Oct 2007) | 4 lines
Adapt the autotools names to different versions of FreeBSD
(and open the way to better adaptation for other platforms as well).
................
r85234 | file | 2007-10-10 09:46:57 -0400 (Wed, 10 Oct 2007) | 4 lines
Process outstanding log messages before shutting down the logger thread.
(closes issue #10933)
Reported by: sperreault
................
r85254 | file | 2007-10-10 10:17:08 -0400 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85242 | file | 2007-10-10 11:14:56 -0300 (Wed, 10 Oct 2007) | 6 lines
Close voicemail message description file if duration did not meet the minimum, or else we will eventually run out of file descriptors.
(closes issue #10918)
Reported by: brak2718
Patches:
vm1.4.12.1.patch uploaded by brak2718 (license 279)
........
................
r85278 | file | 2007-10-10 10:30:05 -0400 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85277 | file | 2007-10-10 11:28:18 -0300 (Wed, 10 Oct 2007) | 6 lines
Add support for handling a 182 Queued response.
(closes issue #10924)
Reported by: ramonpeek
Patches:
queued-182.diff uploaded by ramonpeek (license 266)
........
................
r85279 | mmichelson | 2007-10-10 10:38:15 -0400 (Wed, 10 Oct 2007) | 13 lines
Merged revisions 85276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85276 | mmichelson | 2007-10-10 09:26:31 -0500 (Wed, 10 Oct 2007) | 5 lines
A bunch of changes from sprintf to snprintf.
See security advisory AST-2002-022
........
................
r85281 | file | 2007-10-10 10:43:37 -0400 (Wed, 10 Oct 2007) | 12 lines
Merged revisions 85280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85280 | file | 2007-10-10 11:42:00 -0300 (Wed, 10 Oct 2007) | 4 lines
If devicestate is passed a port number strip it out.
(closes issue #10930)
Reported by: ibc
........
................
r85317 | russell | 2007-10-10 12:01:31 -0400 (Wed, 10 Oct 2007) | 14 lines
Merged revisions 85316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85316 | russell | 2007-10-10 10:56:23 -0500 (Wed, 10 Oct 2007) | 6 lines
I introduced a new member to the ast_filestream struct in 1.4.12, but put it
in the middle of the struct, instead of at the end. One of the Debian folks,
paravoid, pointed out that this breaks binary compatability with modules
compiled against older headers. So, I'm moving the new member to the end
of the struct to resolve the situation.
........
................
r85357 | tilghman | 2007-10-11 00:40:56 -0400 (Thu, 11 Oct 2007) | 10 lines
Merged revisions 85356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85356 | tilghman | 2007-10-10 23:35:33 -0500 (Wed, 10 Oct 2007) | 2 lines
A dollar sign by itself, not indicating a start of a variable or expression prematurely ends substitution (closes issue #10939)
........
................
r85398 | file | 2007-10-11 11:29:14 -0400 (Thu, 11 Oct 2007) | 13 lines
Blocked revisions 85397 via svnmerge
........
r85397 | file | 2007-10-11 12:26:20 -0300 (Thu, 11 Oct 2007) | 6 lines
When creating a new packet don't try to stop retransmission of it. It was just allocated/created so it's impossible for it to have already been scheduled.
(closes issue #10945)
Reported by: flefoll
Patches:
chan_sip.c.br14.85280.xmit_reliable-patch uploaded by flefoll (license 244)
........
................
r85431 | mattf | 2007-10-11 13:09:31 -0400 (Thu, 11 Oct 2007) | 1 line
Make sure we are clean to build without libpri
................
r85444 | mattf | 2007-10-11 13:17:58 -0400 (Thu, 11 Oct 2007) | 1 line
Let's hard code this until I fix it
................
r85460 | russell | 2007-10-11 15:03:06 -0400 (Thu, 11 Oct 2007) | 33 lines
Merge a ton of NEW_CLI conversions. Thanks to everyone that helped out! :)
(closes issue #10724)
Reported by: eliel
Patches:
chan_skinny.c.patch uploaded by eliel (license 64)
chan_oss.c.patch uploaded by eliel (license 64)
chan_mgcp.c.patch2 uploaded by eliel (license 64)
pbx_config.c.patch uploaded by seanbright (license 71)
iax2-provision.c.patch uploaded by eliel (license 64)
chan_gtalk.c.patch uploaded by eliel (license 64)
pbx_ael.c.patch uploaded by seanbright (license 71)
file.c.patch uploaded by seanbright (license 71)
image.c.patch uploaded by seanbright (license 71)
cli.c.patch uploaded by moy (license 222)
astobj2.c.patch uploaded by moy (license 222)
asterisk.c.patch uploaded by moy (license 222)
res_limit.c.patch uploaded by seanbright (license 71)
res_convert.c.patch uploaded by seanbright (license 71)
res_crypto.c.patch uploaded by seanbright (license 71)
app_osplookup.c.patch uploaded by seanbright (license 71)
app_rpt.c.patch uploaded by seanbright (license 71)
app_mixmonitor.c.patch uploaded by seanbright (license 71)
channel.c.patch uploaded by seanbright (license 71)
translate.c.patch uploaded by seanbright (license 71)
udptl.c.patch uploaded by seanbright (license 71)
threadstorage.c.patch uploaded by seanbright (license 71)
db.c.patch uploaded by seanbright (license 71)
cdr.c.patch uploaded by moy (license 222)
pbd_dundi.c.patch uploaded by moy (license 222)
app_osplookup-rev83558.patch uploaded by moy (license 222)
res_clioriginate.c.patch uploaded by moy (license 222)
................
r85474 | mattf | 2007-10-11 16:49:04 -0400 (Thu, 11 Oct 2007) | 1 line
Add CCR test support #10916
................
r85485 | mattf | 2007-10-11 17:57:26 -0400 (Thu, 11 Oct 2007) | 1 line
Add SS7 ANI2 support tx and rx. #10916
................
r85496 | mattf | 2007-10-11 18:20:02 -0400 (Thu, 11 Oct 2007) | 1 line
Add ANI2 support to func_callerid
................
r85497 | mattf | 2007-10-11 18:27:32 -0400 (Thu, 11 Oct 2007) | 1 line
Make sure we set the ANI2 field for PRI
................
r85498 | mattf | 2007-10-11 18:33:57 -0400 (Thu, 11 Oct 2007) | 1 line
See if I can fix this borked ANI2 code I added
................
r85499 | mattf | 2007-10-11 18:42:44 -0400 (Thu, 11 Oct 2007) | 1 line
Make sure we propogate ANI2 to the outbound channel
................
r85516 | russell | 2007-10-12 11:41:27 -0400 (Fri, 12 Oct 2007) | 15 lines
Merged revisions 85515 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85515 | russell | 2007-10-12 10:40:35 -0500 (Fri, 12 Oct 2007) | 7 lines
Fix the potential use of an uninitialized buffer in a log message.
(closes issue #10958)
Reported by: dimas
Patches:
realtime.patch uploaded by dimas (license 88)
........
................
r85518 | russell | 2007-10-12 11:45:41 -0400 (Fri, 12 Oct 2007) | 11 lines
Merged revisions 85517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85517 | russell | 2007-10-12 10:45:09 -0500 (Fri, 12 Oct 2007) | 3 lines
Fix a spelling error in a log message. SMDI, not SDMI.
(closes issue #10959)
........
................
r85519 | russell | 2007-10-12 11:50:29 -0400 (Fri, 12 Oct 2007) | 15 lines
Many doc directory improvements, including:
- Added development section (backtrace.tex)
- Correct filesystem path formating
- Replace all "|" argument separator to ","
- Endless count of spaces at the end of line
- Using astlisting to make listings do not take so much place
- Take back ASTRISKVERSION on first page
- Make localchannel.tex readable by inserting extra end of lines
(closes issue #10962)
Reported by: IgorG
Patches:
texdoc-85177-1.patch uploaded by IgorG (license 20)
................
r85522 | tilghman | 2007-10-12 13:32:38 -0400 (Fri, 12 Oct 2007) | 2 lines
Enable ranges, hexadecimal, octal, and special backslashed characters for the FILTER function
................
r85524 | tilghman | 2007-10-12 14:37:34 -0400 (Fri, 12 Oct 2007) | 10 lines
Merged revisions 85523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85523 | tilghman | 2007-10-12 13:30:55 -0500 (Fri, 12 Oct 2007) | 2 lines
Change Digium address
........
................
r85525 | mattf | 2007-10-12 14:37:35 -0400 (Fri, 12 Oct 2007) | 1 line
Add support for receive charge number in dialplan #10916
................
r85526 | mattf | 2007-10-12 15:41:39 -0400 (Fri, 12 Oct 2007) | 1 line
Trying to finish the last of the charge_number patch up #10916
................
r85527 | mmichelson | 2007-10-12 16:06:37 -0400 (Fri, 12 Oct 2007) | 6 lines
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)
................
r85534 | russell | 2007-10-13 01:53:19 -0400 (Sat, 13 Oct 2007) | 20 lines
Merged revisions 85533 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85533 | russell | 2007-10-13 01:48:10 -0400 (Sat, 13 Oct 2007) | 12 lines
Fix an issue with console verbosity when running asterisk -rx to execute a command
and retrieve its output. The issue was that there was no way for the main Asterisk
process to know that the remote console was connecting in the -rx mode. The way that
James has fixed this is to have all remote consoles muted by default. Then, regular
remote consoles automatically execute a CLI command to unmute themselves when they
first start up.
(closes issue #10847)
Reported by: atis
Patches:
asterisk-consolemute.diff.txt uploaded by jamesgolovich (license 176)
........
................
r85535 | jamesgolovich | 2007-10-13 04:38:50 -0400 (Sat, 13 Oct 2007) | 3 lines
Fix compiling cli.c due to differences with new cli system (closes issue
0010966)
................
r85537 | tilghman | 2007-10-13 11:34:39 -0400 (Sat, 13 Oct 2007) | 11 lines
Blocked revisions 85536 via svnmerge
........
r85536 | tilghman | 2007-10-13 10:26:01 -0500 (Sat, 13 Oct 2007) | 4 lines
Remove deprecated syntax from sample ael file
Reported and patched by: dimas
Closes issue #10967
........
................
r85539 | russell | 2007-10-14 11:15:40 -0400 (Sun, 14 Oct 2007) | 4 lines
When merging the last documentation update, I forgot to "svn add" a file.
Here it is.
(closes issue #10962)
................
r85541 | russell | 2007-10-14 11:34:54 -0400 (Sun, 14 Oct 2007) | 15 lines
Merged revisions 85540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85540 | russell | 2007-10-14 10:24:52 -0500 (Sun, 14 Oct 2007) | 7 lines
Don't create the context for users in users.conf until we know at least one user exists.
(closes issue #10971)
Reported by: dimas
Patches:
pbxconfig.patch uploaded by dimas (license 88)
........
................
r85542 | russell | 2007-10-14 11:47:01 -0400 (Sun, 14 Oct 2007) | 2 lines
Change the configure script to check for a function that was recently added to libss7.
................
r85544 | russell | 2007-10-15 08:49:31 -0400 (Mon, 15 Oct 2007) | 16 lines
Merged revisions 85543 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85543 | russell | 2007-10-15 07:48:10 -0500 (Mon, 15 Oct 2007) | 8 lines
Make sure that the base64 decoder returns a terminated string.
(closes issue #10979)
Reported by: ys
Patches:
util.c.diff uploaded by ys (license 281)
- small mods by me
........
................
r85546 | russell | 2007-10-15 09:07:48 -0400 (Mon, 15 Oct 2007) | 15 lines
Merged revisions 85545 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85545 | russell | 2007-10-15 08:05:45 -0500 (Mon, 15 Oct 2007) | 7 lines
Make sure remote consoles unmute themselves again after reconnecting.
(closes issue #10847)
Reported by: atis
Patches:
console_unmute_on_reconnect.patch uploaded by atis (license 242)
........
................
r85547 | russell | 2007-10-15 09:12:51 -0400 (Mon, 15 Oct 2007) | 12 lines
Another major doc directory update from IgorG. This patch includes
- Many uses of the astlisting environment around verbatim text to ensure that
it gets properly formatted and doesn't run off the page.
- Update some things that have been deprecated.
- Add escaping as needed
- and more ...
(closes issue #10978)
Reported by: IgorG
Patches:
texdoc-85542-1.patch uploaded by IgorG (license 20)
................
r85549 | russell | 2007-10-15 09:17:02 -0400 (Mon, 15 Oct 2007) | 14 lines
Blocked revisions 85548 via svnmerge
........
r85548 | russell | 2007-10-15 08:16:23 -0500 (Mon, 15 Oct 2007) | 7 lines
Suppress a LOG_DEBUG message if debug is not enabled.
(closes issue #10980)
Reported by: casper
Patches:
db.c.84633.diff uploaded by casper (license 55)
........
................
r85550 | russell | 2007-10-15 09:44:53 -0400 (Mon, 15 Oct 2007) | 9 lines
Move the CLI commands that were in builtins[] into the cli_cli[] array of CLI
commands and remove the cli_iterator struct. This gets tab completion working
again.
(closes issue #10970)
Reported by: jamesgolovich
Patches:
asterisk-clicomplete.diff.txt uploaded by jamesgolovich (license 176)
................
r85551 | phsultan | 2007-10-15 09:51:21 -0400 (Mon, 15 Oct 2007) | 5 lines
Allocate more space for the base64 output we need to generate.
Closes issue #10913, reported by tootai, who graciously granted us access
to his Asterisk server, thanks! Daniel, feel free to reopen the bug in
case you can reproduce this on 1.4.
................
r85553 | file | 2007-10-15 10:57:44 -0400 (Mon, 15 Oct 2007) | 12 lines
Merged revisions 85552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85552 | file | 2007-10-15 11:55:04 -0300 (Mon, 15 Oct 2007) | 4 lines
If Monitor or a spy was added to a P2P or native bridged channel bring the channel back to the generic bridging core so the monitor or spy operations work.
(closes issue #10943)
Reported by: julianjm
........
................
r85554 | file | 2007-10-15 11:07:37 -0400 (Mon, 15 Oct 2007) | 6 lines
Add packetization data for G.722.
(closes issue #10900)
Reported by: andrew
Patches:
frame.diff uploaded by andrew (license 240)
................
r85555 | phsultan | 2007-10-15 11:26:58 -0400 (Mon, 15 Oct 2007) | 1 line
Allow RTP structure registration
................
r85557 | russell | 2007-10-15 11:47:46 -0400 (Mon, 15 Oct 2007) | 17 lines
Merged revisions 85556 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85556 | russell | 2007-10-15 10:40:45 -0500 (Mon, 15 Oct 2007) | 9 lines
Ensure the buffer passed to ast_canmatch_extension() is properly initialized so
that it is null terminated.
(issue #10977)
Reported by: dimas
Patches:
pbxdundi.patch uploaded by dimas (license 88)
- small mods by me
........
................
r85558 | russell | 2007-10-15 11:55:23 -0400 (Mon, 15 Oct 2007) | 8 lines
Simplify buffer handling in dundi-parser.c. This also makes the code a bit
safer by removing various assumptions about sizes. (No vulnerabilities, though)
(closes issue #10977)
Reported by: dimas
Patches:
dundiparser.patch uploaded by dimas (license 88)
................
r85560 | file | 2007-10-15 12:23:41 -0400 (Mon, 15 Oct 2007) | 12 lines
Merged revisions 85559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85559 | file | 2007-10-15 13:22:02 -0300 (Mon, 15 Oct 2007) | 4 lines
Bring both DTMF begin and end frames up through to the core for DTMF feature handling.
(closes issue #10826)
Reported by: dimas
........
................
r85562 | russell | 2007-10-15 12:36:48 -0400 (Mon, 15 Oct 2007) | 12 lines
Merged revisions 85561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85561 | russell | 2007-10-15 11:34:13 -0500 (Mon, 15 Oct 2007) | 4 lines
Make a few changes so that characters in the upper half of the ISO-8859-1
character set don't get stripped when reading configuration.
(closes issue #10982, dandre)
........
................
r85578 | file | 2007-10-15 12:41:56 -0400 (Mon, 15 Oct 2007) | 12 lines
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
........
................
r85605 | russell | 2007-10-15 12:59:53 -0400 (Mon, 15 Oct 2007) | 14 lines
Merged revisions 85604 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85604 | russell | 2007-10-15 11:54:57 -0500 (Mon, 15 Oct 2007) | 6 lines
Make the default for the srvlookup option to be yes. It doesn't really make
sense for it to default to off. The default configuration file has it on, and
proper RFC behavior, as indicated by a comment in the code, is for it to be on.
So, let's have it on by default to make lives easier.
(closes issue #10954, suggested by jtodd)
........
................
r85633 | tilghman | 2007-10-15 13:51:05 -0400 (Mon, 15 Oct 2007) | 2 lines
Document my changes from Friday
................
Added:
team/group/v6/trunk/doc/tex/backtrace.tex
- copied unchanged from r85633, trunk/doc/tex/backtrace.tex
Modified:
team/group/v6/trunk/ (props changed)
team/group/v6/trunk/LICENSE
team/group/v6/trunk/apps/app_adsiprog.c
team/group/v6/trunk/apps/app_dial.c
team/group/v6/trunk/apps/app_festival.c
team/group/v6/trunk/apps/app_minivm.c
team/group/v6/trunk/apps/app_mixmonitor.c
team/group/v6/trunk/apps/app_osplookup.c
team/group/v6/trunk/apps/app_queue.c
team/group/v6/trunk/apps/app_rpt.c
team/group/v6/trunk/apps/app_voicemail.c
team/group/v6/trunk/apps/app_zapateller.c
team/group/v6/trunk/apps/app_zapras.c
team/group/v6/trunk/bootstrap.sh
team/group/v6/trunk/channels/chan_gtalk.c
team/group/v6/trunk/channels/chan_jingle.c
team/group/v6/trunk/channels/chan_mgcp.c
team/group/v6/trunk/channels/chan_misdn.c
team/group/v6/trunk/channels/chan_oss.c
team/group/v6/trunk/channels/chan_sip.c
team/group/v6/trunk/channels/chan_skinny.c
team/group/v6/trunk/channels/chan_zap.c
team/group/v6/trunk/channels/iax2-provision.c
team/group/v6/trunk/configs/features.conf.sample
team/group/v6/trunk/configs/queues.conf.sample
team/group/v6/trunk/configure
team/group/v6/trunk/configure.ac
team/group/v6/trunk/doc/PEERING
team/group/v6/trunk/doc/asterisk-mib.txt
team/group/v6/trunk/doc/tex/ael.tex
team/group/v6/trunk/doc/tex/ajam.tex
team/group/v6/trunk/doc/tex/app-sms.tex
team/group/v6/trunk/doc/tex/asterisk.tex
team/group/v6/trunk/doc/tex/billing.tex
team/group/v6/trunk/doc/tex/cdrdriver.tex
team/group/v6/trunk/doc/tex/channelvariables.tex
team/group/v6/trunk/doc/tex/cliprompt.tex
team/group/v6/trunk/doc/tex/configuration.tex
team/group/v6/trunk/doc/tex/dundi.tex
team/group/v6/trunk/doc/tex/enum.tex
team/group/v6/trunk/doc/tex/extensions.tex
team/group/v6/trunk/doc/tex/ices.tex
team/group/v6/trunk/doc/tex/imapstorage.tex
team/group/v6/trunk/doc/tex/jitterbuffer.tex
team/group/v6/trunk/doc/tex/localchannel.tex
team/group/v6/trunk/doc/tex/manager.tex
team/group/v6/trunk/doc/tex/misdn.tex
team/group/v6/trunk/doc/tex/odbcstorage.tex
team/group/v6/trunk/doc/tex/privacy.tex
team/group/v6/trunk/doc/tex/queuelog.tex
team/group/v6/trunk/doc/tex/queues-with-callback-members.tex
team/group/v6/trunk/doc/tex/realtime.tex
team/group/v6/trunk/doc/tex/security.tex
team/group/v6/trunk/doc/tex/sla.tex
team/group/v6/trunk/funcs/func_callerid.c
team/group/v6/trunk/funcs/func_strings.c
team/group/v6/trunk/include/asterisk/file.h
team/group/v6/trunk/include/asterisk/frame.h
team/group/v6/trunk/include/asterisk/lock.h
team/group/v6/trunk/include/asterisk/logger.h
team/group/v6/trunk/include/asterisk/strings.h
team/group/v6/trunk/main/asterisk.c
team/group/v6/trunk/main/astobj2.c
team/group/v6/trunk/main/cdr.c
team/group/v6/trunk/main/channel.c
team/group/v6/trunk/main/cli.c
team/group/v6/trunk/main/db.c
team/group/v6/trunk/main/file.c
team/group/v6/trunk/main/frame.c
team/group/v6/trunk/main/image.c
team/group/v6/trunk/main/logger.c
team/group/v6/trunk/main/pbx.c
team/group/v6/trunk/main/rtp.c
team/group/v6/trunk/main/threadstorage.c
team/group/v6/trunk/main/translate.c
team/group/v6/trunk/main/udptl.c
team/group/v6/trunk/main/utils.c
team/group/v6/trunk/pbx/dundi-parser.c
team/group/v6/trunk/pbx/pbx_ael.c
team/group/v6/trunk/pbx/pbx_config.c
team/group/v6/trunk/pbx/pbx_dundi.c
team/group/v6/trunk/pbx/pbx_realtime.c
team/group/v6/trunk/res/res_clioriginate.c
team/group/v6/trunk/res/res_convert.c
team/group/v6/trunk/res/res_crypto.c
team/group/v6/trunk/res/res_jabber.c
team/group/v6/trunk/res/res_limit.c
team/group/v6/trunk/res/res_smdi.c
team/group/v6/trunk/utils/astman.c
team/group/v6/trunk/utils/check_expr.c
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 15 13:44:24 2007
@@ -1,1 +1,1 @@
-/trunk:1-85108
+/trunk:1-85634
Modified: team/group/v6/trunk/LICENSE
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/LICENSE?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/LICENSE (original)
+++ team/group/v6/trunk/LICENSE Mon Oct 15 13:44:24 2007
@@ -57,14 +57,13 @@
If you have any questions regarding our licensing policy, please
contact us:
-+1.877.546.8963 (via telephone in the USA)
++1.877.344.4861 (via telephone in the USA)
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
IAX2/misery.digium.com/6000 (via IAX2)
licensing at digium.com (via email)
Digium, Inc.
-150 West Park Loop
-Suite 100
+445 Jan Davis Drive
Huntsville, AL 35806
USA
Modified: team/group/v6/trunk/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_adsiprog.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_adsiprog.c (original)
+++ team/group/v6/trunk/apps/app_adsiprog.c Mon Oct 15 13:44:24 2007
@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
Modified: team/group/v6/trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_dial.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_dial.c (original)
+++ team/group/v6/trunk/apps/app_dial.c Mon Oct 15 13:44:24 2007
@@ -33,7 +33,6 @@
#include <errno.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
#include <sys/time.h>
#include <sys/signal.h>
@@ -1406,6 +1405,7 @@
tc->cid.cid_pres = chan->cid.cid_pres;
tc->cid.cid_ton = chan->cid.cid_ton;
tc->cid.cid_tns = chan->cid.cid_tns;
+ tc->cid.cid_ani2 = chan->cid.cid_ani2;
tc->adsicpe = chan->adsicpe;
tc->transfercapability = chan->transfercapability;
Modified: team/group/v6/trunk/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_festival.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_festival.c (original)
+++ team/group/v6/trunk/apps/app_festival.c Mon Oct 15 13:44:24 2007
@@ -36,15 +36,12 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <stdio.h>
#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <fcntl.h>
#include <ctype.h>
Modified: team/group/v6/trunk/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_minivm.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_minivm.c (original)
+++ team/group/v6/trunk/apps/app_minivm.c Mon Oct 15 13:44:24 2007
@@ -145,7 +145,6 @@
#include <errno.h>
#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
#include <stdio.h>
#include <ctype.h>
#include <sys/time.h>
Modified: team/group/v6/trunk/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_mixmonitor.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_mixmonitor.c (original)
+++ team/group/v6/trunk/apps/app_mixmonitor.c Mon Oct 15 13:44:24 2007
@@ -362,46 +362,44 @@
return 0;
}
-static int mixmonitor_cli(int fd, int argc, char **argv)
+static char *handle_cli_mixmonitor(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ast_channel *chan;
- if (argc < 3)
- return RESULT_SHOWUSAGE;
-
- if (!(chan = ast_get_channel_by_name_prefix_locked(argv[2], strlen(argv[2])))) {
- ast_cli(fd, "No channel matching '%s' found.\n", argv[2]);
- return RESULT_SUCCESS;
- }
-
- if (!strcasecmp(argv[1], "start")) {
- mixmonitor_exec(chan, argv[3]);
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "mixmonitor [start|stop]";
+ e->usage =
+ "Usage: mixmonitor <start|stop> <chan_name> [args]\n"
+ " The optional arguments are passed to the MixMonitor\n"
+ " application when the 'start' command is used.\n";
+ return NULL;
+ case CLI_GENERATE:
+ return ast_complete_channels(a->line, a->word, a->pos, a->n, 2);
+ }
+
+ if (a->argc < 3)
+ return CLI_SHOWUSAGE;
+
+ if (!(chan = ast_get_channel_by_name_prefix_locked(a->argv[2], strlen(a->argv[2])))) {
+ ast_cli(a->fd, "No channel matching '%s' found.\n", a->argv[2]);
+ /* Technically this is a failure, but we don't want 2 errors printing out */
+ return CLI_SUCCESS;
+ }
+
+ if (!strcasecmp(a->argv[1], "start")) {
+ mixmonitor_exec(chan, a->argv[3]);
ast_channel_unlock(chan);
} else {
ast_channel_unlock(chan);
ast_audiohook_detach_source(chan, mixmonitor_spy_type);
}
- return RESULT_SUCCESS;
-}
-
-static char *complete_mixmonitor_cli(const char *line, const char *word, int pos, int state)
-{
- char *options[] = {"start", "stop", NULL};
-
- if (pos == 1)
- return ast_cli_complete (word, options, state);
-
- return ast_complete_channels(line, word, pos, state, 2);
+ return CLI_SUCCESS;
}
static struct ast_cli_entry cli_mixmonitor[] = {
- { { "mixmonitor", NULL, NULL },
- mixmonitor_cli, "Execute a MixMonitor command.",
- "mixmonitor <start|stop> <chan_name> [args]\n\n"
- "The optional arguments are passed to the\n"
- "MixMonitor application when the 'start' command is used.\n",
- complete_mixmonitor_cli },
+ NEW_CLI(handle_cli_mixmonitor, "Execute a MixMonitor command")
};
static int unload_module(void)
Modified: team/group/v6/trunk/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_osplookup.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_osplookup.c (original)
+++ team/group/v6/trunk/apps/app_osplookup.c Mon Oct 15 13:44:24 2007
@@ -1861,10 +1861,7 @@
return 0;
}
-static int osp_show(
- int fd,
- int argc,
- char* argv[])
+static char *handle_cli_osp_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int i;
int found = 0;
@@ -1872,12 +1869,21 @@
const char* provider = NULL;
const char* tokenalgo;
- if ((argc < 2) || (argc > 3)) {
- return RESULT_SHOWUSAGE;
- }
- if (argc > 2) {
- provider = argv[2];
- }
+ switch (cmd) {
+ case CLI_INIT:
+ e->command = "osp show";
+ e->usage =
+ "Usage: osp show\n"
+ " Displays information on Open Settlement Protocol support\n";
+ return NULL;
+ case CLI_GENERATE:
+ return NULL;
+ }
+
+ if ((a->argc < 2) || (a->argc > 3))
+ return CLI_SHOWUSAGE;
+ if (a->argc > 2)
+ provider = a->argv[2];
if (!provider) {
switch (osp_tokenformat) {
case TOKEN_ALGO_BOTH:
@@ -1891,7 +1897,7 @@
tokenalgo = "Signed";
break;
}
- ast_cli(fd, "OSP: %s %s %s\n",
+ ast_cli(a->fd, "OSP: %s %s %s\n",
osp_initialized ? "Initialized" : "Uninitialized", osp_hardware ? "Accelerated" : "Normal", tokenalgo);
}
@@ -1900,25 +1906,25 @@
while(p) {
if (!provider || !strcasecmp(p->name, provider)) {
if (found) {
- ast_cli(fd, "\n");
- }
- ast_cli(fd, " == OSP Provider '%s' == \n", p->name);
- ast_cli(fd, "Local Private Key: %s\n", p->privatekey);
- ast_cli(fd, "Local Certificate: %s\n", p->localcert);
+ ast_cli(a->fd, "\n");
+ }
+ ast_cli(a->fd, " == OSP Provider '%s' == \n", p->name);
+ ast_cli(a->fd, "Local Private Key: %s\n", p->privatekey);
+ ast_cli(a->fd, "Local Certificate: %s\n", p->localcert);
for (i = 0; i < p->cacount; i++) {
- ast_cli(fd, "CA Certificate %d: %s\n", i + 1, p->cacerts[i]);
+ ast_cli(a->fd, "CA Certificate %d: %s\n", i + 1, p->cacerts[i]);
}
for (i = 0; i < p->spcount; i++) {
- ast_cli(fd, "Service Point %d: %s\n", i + 1, p->srvpoints[i]);
- }
- ast_cli(fd, "Max Connections: %d\n", p->maxconnections);
- ast_cli(fd, "Retry Delay: %d seconds\n", p->retrydelay);
- ast_cli(fd, "Retry Limit: %d\n", p->retrylimit);
- ast_cli(fd, "Timeout: %d milliseconds\n", p->timeout);
- ast_cli(fd, "Source: %s\n", strlen(p->source) ? p->source : "<unspecified>");
- ast_cli(fd, "Auth Policy %d\n", p->authpolicy);
- ast_cli(fd, "Default protocol %s\n", p->defaultprotocol);
- ast_cli(fd, "OSP Handle: %d\n", p->handle);
+ ast_cli(a->fd, "Service Point %d: %s\n", i + 1, p->srvpoints[i]);
+ }
+ ast_cli(a->fd, "Max Connections: %d\n", p->maxconnections);
+ ast_cli(a->fd, "Retry Delay: %d seconds\n", p->retrydelay);
+ ast_cli(a->fd, "Retry Limit: %d\n", p->retrylimit);
+ ast_cli(a->fd, "Timeout: %d milliseconds\n", p->timeout);
+ ast_cli(a->fd, "Source: %s\n", strlen(p->source) ? p->source : "<unspecified>");
+ ast_cli(a->fd, "Auth Policy %d\n", p->authpolicy);
+ ast_cli(a->fd, "Default protocol %s\n", p->defaultprotocol);
+ ast_cli(a->fd, "OSP Handle: %d\n", p->handle);
found++;
}
p = p->next;
@@ -1927,12 +1933,12 @@
if (!found) {
if (provider) {
- ast_cli(fd, "Unable to find OSP provider '%s'\n", provider);
+ ast_cli(a->fd, "Unable to find OSP provider '%s'\n", provider);
} else {
- ast_cli(fd, "No OSP providers configured\n");
- }
- }
- return RESULT_SUCCESS;
+ ast_cli(a->fd, "No OSP providers configured\n");
+ }
+ }
+ return CLI_SUCCESS;
}
static const char* app1= "OSPAuth";
@@ -1993,14 +1999,8 @@
" OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n"
" SUCCESS | FAILED | ERROR \n";
-static const char osp_usage[] =
-"Usage: osp show\n"
-" Displays information on Open Settlement Protocol support\n";
-
static struct ast_cli_entry cli_osp[] = {
- { {"osp", "show", NULL},
- osp_show, "Displays OSP information",
- osp_usage },
+ NEW_CLI(handle_cli_osp_show, "Displays OSF information")
};
static int load_module(void)
Modified: team/group/v6/trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_queue.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_queue.c (original)
+++ team/group/v6/trunk/apps/app_queue.c Mon Oct 15 13:44:24 2007
@@ -150,6 +150,10 @@
" 'T' -- allow the calling user to transfer the call.\n"
" 'w' -- allow the called user to write the conversation to disk via Monitor.\n"
" 'W' -- allow the calling user to write the conversation to disk via Monitor.\n"
+" 'k' -- Allow the called party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
+" 'K' -- Allow the calling party to enable parking of the call by sending\n"
+" the DTMF sequence defined for call parking in features.conf.\n"
" In addition to transferring the call, a call may be parked and then picked\n"
"up by another user.\n"
" The optional URL will be sent to the called party if the channel supports\n"
@@ -368,6 +372,7 @@
unsigned int wrapped:1;
unsigned int timeoutrestart:1;
unsigned int announceholdtime:2;
+ unsigned int announceposition:1;
unsigned int strategy:3;
unsigned int maskmemberstatus:1;
unsigned int realtime:1;
@@ -799,6 +804,7 @@
q->announcefrequency = 0;
q->minannouncefrequency = DEFAULT_MIN_ANNOUNCE_FREQUENCY;
q->announceholdtime = 0;
+ q->announceholdtime = 1;
q->roundingseconds = 0; /* Default - don't announce seconds */
q->servicelevel = 0;
q->ringinuse = 1;
@@ -1009,6 +1015,8 @@
q->announceholdtime = ANNOUNCEHOLDTIME_ALWAYS;
else
q->announceholdtime = 0;
+ } else if (!strcasecmp(param, "announce-position")) {
+ q->announceposition = ast_true(val);
} else if (!strcasecmp(param, "periodic-announce")) {
if (strchr(val, ',')) {
char *s, *buf = ast_strdupa(val);
@@ -1528,23 +1536,25 @@
} else {
ast_moh_stop(qe->chan);
}
- /* Say we're next, if we are */
- if (qe->pos == 1) {
- res = play_file(qe->chan, qe->parent->sound_next);
- if (res)
- goto playout;
- else
- goto posout;
- } else {
- res = play_file(qe->chan, qe->parent->sound_thereare);
- if (res)
- goto playout;
- res = ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */
- if (res)
- goto playout;
- res = play_file(qe->chan, qe->parent->sound_calls);
- if (res)
- goto playout;
+ if (qe->parent->announceposition) {
+ /* Say we're next, if we are */
+ if (qe->pos == 1) {
+ res = play_file(qe->chan, qe->parent->sound_next);
+ if (res)
+ goto playout;
+ else
+ goto posout;
+ } else {
+ res = play_file(qe->chan, qe->parent->sound_thereare);
+ if (res)
+ goto playout;
+ res = ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */
+ if (res)
+ goto playout;
+ res = play_file(qe->chan, qe->parent->sound_calls);
+ if (res)
+ goto playout;
+ }
}
/* Round hold time to nearest minute */
avgholdmins = abs(((qe->parent->holdtime + 30) - (now - qe->start)) / 60);
@@ -1599,8 +1609,10 @@
}
posout:
- ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
+ if (qe->parent->announceposition) {
+ ast_verb(3, "Told %s in %s their queue position (which was %d)\n",
qe->chan->name, qe->parent->name, qe->pos);
+ }
res = play_file(qe->chan, qe->parent->sound_thanks);
playout:
@@ -2636,6 +2648,12 @@
case 'H':
ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT);
break;
+ case 'k':
+ ast_set_flag(&(bridge_config.features_callee), AST_FEATURE_PARKCALL);
+ break;
+ case 'K':
+ ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_PARKCALL);
+ break;
case 'n':
if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY)
(*tries)++;
Modified: team/group/v6/trunk/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_rpt.c?view=diff&rev=85646&r1=85645&r2=85646
==============================================================================
--- team/group/v6/trunk/apps/app_rpt.c (original)
+++ team/group/v6/trunk/apps/app_rpt.c Mon Oct 15 13:44:24 2007
@@ -299,7 +299,6 @@
#ifdef OLD_ASTERISK
STANDARD_LOCAL_USER;
#endif
-
#define MSWAIT 200
#define HANGTIME 5000
@@ -699,60 +698,20 @@
*/
/* Debug mode */
-static int rpt_do_debug(int fd, int argc, char *argv[]);
-static int rpt_do_dump(int fd, int argc, char *argv[]);
-static int rpt_do_stats(int fd, int argc, char *argv[]);
-static int rpt_do_lstats(int fd, int argc, char *argv[]);
-static int rpt_do_reload(int fd, int argc, char *argv[]);
-static int rpt_do_restart(int fd, int argc, char *argv[]);
-
-static char debug_usage[] =
-"Usage: rpt debug level {0-7}\n"
-" Enables debug messages in app_rpt\n";
-
-static char dump_usage[] =
-"Usage: rpt dump <nodename>\n"
-" Dumps struct debug info to log\n";
-
-static char dump_stats[] =
-"Usage: rpt stats <nodename>\n"
-" Dumps node statistics to console\n";
-
-static char dump_lstats[] =
-"Usage: rpt lstats <nodename>\n"
-" Dumps link statistics to console\n";
-
-static char reload_usage[] =
-"Usage: rpt reload\n"
-" Reloads app_rpt running config parameters\n";
-
-static char restart_usage[] =
-"Usage: rpt restart\n"
-" Restarts app_rpt\n";
+static char *handle_cli_rpt_debug_level(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_dump(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_rpt_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
[... 13870 lines stripped ...]
More information about the asterisk-commits
mailing list