[svn-commits] murf: branch group/newcdr r122711 - in /team/group/newcdr: ./ apps/ build_too...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jun 13 16:29:31 CDT 2008
Author: murf
Date: Fri Jun 13 16:29:30 2008
New Revision: 122711
URL: http://svn.digium.com/view/asterisk?view=rev&rev=122711
Log:
Merged revisions 121555,121559,121597,121599,121649,121683,121716,121770,121805,121855,121857,121867,121914,121955,121993,122047,122062,122091,122128,122131,122174,122228,122232,122234,122240-122241,122243-122244,122262,122312,122315,122371,122399,122433-122434,122461,122493,122523,122526,122557,122616,122664 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r121555 | russell | 2008-06-10 08:53:40 -0600 (Tue, 10 Jun 2008) | 22 lines
Merge some more changes from team/russell/events
This commit pulls in a batch of improvements and additions to the event API.
Changes include:
- the ability to dynamically build a subscription. This is useful if you're
building a subscription based on something you receive from the network,
or from options in a configuration file.
- Add tables of event types and IE types and the corresponding string
representation for implementing text based protocols that use these
events, for showing events on the CLI, reading configuration that
references event information, among other things.
- Add a table that maps IE types and the corresponding payload type.
- an API call to get the total size of an event
- an API call to get all events from the cache that match a subscription
- a new IE payload type, raw, which I used for transporting the Entity ID in
my code for handling distributed device state.
- Code improvements to reduce code duplication
- Include the Entity ID of the server that originated the event in every event
- an additional event type, DEVICE_STATE_CHANGE, to help facilitate distributed
device state. DEVICE_STATE is a state change on one server, DEVICE_STATE_CHANGE
is the aggregate device state change across all servers.
................
r121559 | russell | 2008-06-10 09:12:17 -0600 (Tue, 10 Jun 2008) | 24 lines
Merge another big set of changes from team/russell/events
This commit merges in the rest of the code needed to support distributed device
state. There are two main parts to this commit.
Core changes:
- The device state handling in the core has been updated to understand device
state across a cluster of Asterisk servers. Every time the state of a device
changes, it looks at all of the device states on each node, and determines the
aggregate device state. That resulting device state is what is provided to
modules in Asterisk that take actions based on the state of a device.
New module, res_ais:
- A module has been written to facilitate the communication of events between
nodes in a cluster of Asterisk servers. This module uses the SAForum AIS
(Service Availability Forum Application Interface Specification) CLM and EVT
services (Cluster Management and Event) to handle this task. This module
currently supports sharing Voicemail MWI (Message Waiting Indication) and
device state events between servers. It has been tested with openais, though
other implementations of the spec do exist.
For more information on testing distributed device state, see the following doc:
- doc/distributed_devstate.txt
................
r121597 | seanbright | 2008-06-10 12:35:37 -0600 (Tue, 10 Jun 2008) | 14 lines
Merged revisions 121596 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121596 | seanbright | 2008-06-10 14:34:45 -0400 (Tue, 10 Jun 2008) | 6 lines
Fixes a problem with some buggy versions of GNU awk (3.1.3) not liking carriage returns in scripts.
(closes issue #12749)
Reported by: alinux
Tested by: Laureano (on #asterisk-dev), juggie
........
................
r121599 | juggie | 2008-06-10 13:03:11 -0600 (Tue, 10 Jun 2008) | 2 lines
Revision 117802 changed frame.data to frame.data.ptr however codec_ilbc.c was not updated. This resolves that oversight.
................
r121649 | mmichelson | 2008-06-10 13:52:21 -0600 (Tue, 10 Jun 2008) | 4 lines
Add an additional sanity check in case an event is passed between
Asterisk boxes with mismatched ie_maps.
................
r121683 | tilghman | 2008-06-10 15:14:58 -0600 (Tue, 10 Jun 2008) | 4 lines
Move the table cache routines to res_odbc, so they can be used from other
places (app_voicemail, for example).
(Related to bug #11678)
................
r121716 | russell | 2008-06-10 15:51:06 -0600 (Tue, 10 Jun 2008) | 2 lines
don't refer to asterisk-events, as that implies that the code was checked out from a branch
................
r121770 | crichter | 2008-06-11 05:52:18 -0600 (Wed, 11 Jun 2008) | 9 lines
Merged revisions 121751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121751 | crichter | 2008-06-11 11:28:04 +0200 (Mi, 11 Jun 2008) | 1 line
fixed issue with previous commit, the find_free_channel test for channels which where inuse was broken.
........
................
r121805 | jpeeler | 2008-06-11 10:11:40 -0600 (Wed, 11 Jun 2008) | 9 lines
Merged revisions 121804 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121804 | jpeeler | 2008-06-11 11:11:09 -0500 (Wed, 11 Jun 2008) | 1 line
add instructions for logging gdb output via set logging on
........
................
r121855 | tilghman | 2008-06-11 11:44:39 -0600 (Wed, 11 Jun 2008) | 3 lines
Expand CDR uniqueid field to 150 chars, to account for maximum systemname.
(Closes issue #12831)
................
r121857 | mattf | 2008-06-11 11:50:17 -0600 (Wed, 11 Jun 2008) | 1 line
Make sure we hangup any calls we have and NULL out the ss7call value when we get a reset circuit message. Fixes crash bug
................
r121867 | tilghman | 2008-06-11 12:19:24 -0600 (Wed, 11 Jun 2008) | 11 lines
Merged revisions 121861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r121861 | tilghman | 2008-06-11 13:18:16 -0500 (Wed, 11 Jun 2008) | 3 lines
Make calls to ast_assert() actually test something, so that the error message
printed is not nonsensical (reported by mvanbaak via #asterisk-bugs).
........
................
r121914 | mattf | 2008-06-11 12:53:10 -0600 (Wed, 11 Jun 2008) | 1 line
Fix pseudo channel allocation errors on startup when using SS7
................
r121955 | twilson | 2008-06-11 15:38:40 -0600 (Wed, 11 Jun 2008) | 2 lines
Initialize parkingtime to DEFAULT_PARK_TIME instead of 0
................
r121993 | twilson | 2008-06-11 17:48:38 -0600 (Wed, 11 Jun 2008) | 9 lines
Blocked revisions 121992 via svnmerge
........
r121992 | twilson | 2008-06-11 18:47:23 -0500 (Wed, 11 Jun 2008) | 2 lines
Backport fix for 11520--for some reason I didn't do this back in February when I patched for trunk.
........
................
r122047 | russell | 2008-06-12 08:06:38 -0600 (Thu, 12 Jun 2008) | 4 lines
Don't log not being able to set a default EID. Most people don't care, and
those that do can check their setup using CLI commands.
(closes issue #12839)
................
r122062 | kpfleming | 2008-06-12 08:21:32 -0600 (Thu, 12 Jun 2008) | 2 lines
add infrastructure so that timing source can be a loadable module... next steps are to convert channel.c and chan_iax2.c to use this new API, and to move all the DAHDI-specific timing source code into a new res_timing_dahdi module
................
r122091 | murf | 2008-06-12 08:28:01 -0600 (Thu, 12 Jun 2008) | 45 lines
Merged revisions 122046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122046 | murf | 2008-06-12 07:47:34 -0600 (Thu, 12 Jun 2008) | 37 lines
(closes issue #10668)
Reported by: arkadia
Tested by: murf, arkadia
Options added to forkCDR() app and the CDR() func to
remove some roadblocks for CDR applications.
The "show application ForkCDR" output was upgraded
to more fully explain the inner workings of forkCDR.
The A option was added to forkCDR to force the
CDR system to NOT change the disposition on the
original CDR, after the fork. This involves
ast_cdr_answer, _busy, _failed, and so on.
The T option was added to forkCDR to force
obedience of the cdr LOCKED flag in the
ast_cdr_end, all the disposition changing
funcs (ast_cdr_answer, etc), and in the
ast_cdr_setvar func.
The CHANGES file was updated to explain ALL
the new options added to satisfy this bug report
(and some requests made verbally and via
email, irc, etc, over the past months/year)
The 's' option was added to the CDR() func,
to force it to skip LOCKED cdr's in the
chain.
Again, the new options should be totally transparent
to existing apps! Current behavior of CDR,
forkCDR, and the rest of the CDR system should
not change one little bit. Until you add the
new options, at least!
........
................
r122128 | murf | 2008-06-12 08:56:26 -0600 (Thu, 12 Jun 2008) | 9 lines
Merged revisions 122127 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122127 | murf | 2008-06-12 08:51:44 -0600 (Thu, 12 Jun 2008) | 1 line
Arkadia tried to warn me, but the code added to ast_cdr_busy, _failed, and _noanswer was redundant. Didn't spot it until I was resolving conflicts in trunk. Ugh. Redundant code removed. It wasn't harmful. Just dumb.
........
................
r122131 | tilghman | 2008-06-12 09:14:37 -0600 (Thu, 12 Jun 2008) | 12 lines
Merged revisions 122130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122130 | tilghman | 2008-06-12 10:11:30 -0500 (Thu, 12 Jun 2008) | 4 lines
Occasionally, the alertpipe loses its nonblocking status, so detect and correct
that situation before it causes a deadlock. (Reported and tested by ctooley
via #asterisk-dev)
........
................
r122174 | tilghman | 2008-06-12 09:26:07 -0600 (Thu, 12 Jun 2008) | 16 lines
Merged revisions 122137 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122137 | tilghman | 2008-06-12 10:18:39 -0500 (Thu, 12 Jun 2008) | 8 lines
Flipflop the sections for two options, since the section for 'X' (exit context)
may otherwise absorb keypresses meant for 's' (admin/user menu).
(closes issue #12836)
Reported by: blitzrage
Patches:
20080611__bug12836.diff.txt uploaded by Corydon76 (license 14)
Tested by: blitzrage
........
................
r122228 | mmichelson | 2008-06-12 10:25:09 -0600 (Thu, 12 Jun 2008) | 12 lines
Merging the work done in the queue-log-atxfer branch. The
net result of this work is that attended transfers made
by queue members will now show up in the queue_log as a
TRANSFER message instead of COMPLETECALLER as it had been.
As far as the details go, I created a datastore which is
attached to the calling channel just prior to when the caller
is bridged with the queue member. If the calling channel
is masqueraded, then during the "fixup" portion, the TRANSFER
will be logged and the datastore will be removed.
................
r122232 | russell | 2008-06-12 11:14:32 -0600 (Thu, 12 Jun 2008) | 2 lines
Make this build under dev mode
................
r122234 | jpeeler | 2008-06-12 11:27:55 -0600 (Thu, 12 Jun 2008) | 3 lines
Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.
................
r122240 | kpfleming | 2008-06-12 11:30:55 -0600 (Thu, 12 Jun 2008) | 1 line
clarify documentation on how timer intervals should be specified
................
r122241 | russell | 2008-06-12 11:38:27 -0600 (Thu, 12 Jun 2008) | 3 lines
Get default entity ID determination working on Linux again
(closes issue #12839)
................
r122243 | jpeeler | 2008-06-12 11:39:38 -0600 (Thu, 12 Jun 2008) | 2 lines
Make sure we hangup any calls we have and NULL out the ss7call value when we get a reset circuit message. Fixes crash bug. (from mattf r121857, moving from chan_zap to chan_dahdi)
................
r122244 | jpeeler | 2008-06-12 11:49:37 -0600 (Thu, 12 Jun 2008) | 2 lines
Fix pseudo channel allocation errors on startup when using SS7. (from mattf r121914, moving from chan_zap to chan_dahdi)
................
r122262 | russell | 2008-06-12 12:23:54 -0600 (Thu, 12 Jun 2008) | 11 lines
Merged revisions 122259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122259 | russell | 2008-06-12 13:22:44 -0500 (Thu, 12 Jun 2008) | 3 lines
Fix some race conditions that cause ast_assert() to report that chan_iax2 tried
to remove an entry that wasn't in the scheduler
........
................
r122312 | mmichelson | 2008-06-12 12:53:17 -0600 (Thu, 12 Jun 2008) | 17 lines
Merged revisions 122311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r122311 | mmichelson | 2008-06-12 13:50:58 -0500 (Thu, 12 Jun 2008) | 9 lines
Properly play a holdtime message if the announce-holdtime option is
set to "once."
(closes issue #12842)
Reported by: ramonpeek
Patches:
patch001.diff uploaded by ramonpeek (license 266)
........
................
r122315 | jpeeler | 2008-06-12 13:11:23 -0600 (Thu, 12 Jun 2008) | 9 lines
Blocked revisions 122314 via svnmerge
........
r122314 | jpeeler | 2008-06-12 14:08:20 -0500 (Thu, 12 Jun 2008) | 2 lines
Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow.
........
................
r122371 | russell | 2008-06-12 14:38:52 -0600 (Thu, 12 Jun 2008) | 2 lines
Complete the documentation for the timing API.
................
r122399 | mmichelson | 2008-06-12 15:23:02 -0600 (Thu, 12 Jun 2008) | 4 lines
Recommitting revision 122228, which was accidentally reverted
as a result of commit 122234.
................
r122433 | jpeeler | 2008-06-12 17:08:37 -0600 (Thu, 12 Jun 2008) | 4 lines
(closes issue 0012193)
Reported by: davidw
Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app
................
r122434 | jpeeler | 2008-06-12 17:09:16 -0600 (Thu, 12 Jun 2008) | 12 lines
Blocked revisions 122208 via svnmerge
........
r122208 | jpeeler | 2008-06-12 10:46:08 -0500 (Thu, 12 Jun 2008) | 5 lines
(closes issue #12193)
Reported by: davidw
Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app
........
................
r122461 | mmichelson | 2008-06-12 17:58:01 -0600 (Thu, 12 Jun 2008) | 5 lines
Fix a segfault by not trying to store a stack address for
long-term use. Instead use the heap. I can't believe this
never happened *once* in my developer branch when I was testing.
................
r122493 | mvanbaak | 2008-06-13 05:20:47 -0600 (Fri, 13 Jun 2008) | 9 lines
Implement call parking in chan_skinny.
(closes issue #11342)
Reported by: DEA
Patches:
chan_skinny-park.txt uploaded by DEA (license 3)
chan_skinny-park-v2.diff.txt uploaded by mvanbaak (license 7)
Tested by: DEA, mvanbaak
................
r122523 | russell | 2008-06-13 06:45:50 -0600 (Fri, 13 Jun 2008) | 11 lines
Merge changes from timing branch
- Convert chan_iax2 to use the timing API
- Convert usage of timing in the core to use the timing API instead of
using DAHDI directly
- Make a change to the timing API to add the set_rate() function
- change the timing core to use a rwlock
- merge a timing implementation, res_timing_dahdi
Basic testing was successful using res_timing_dahdi
................
r122526 | russell | 2008-06-13 06:53:08 -0600 (Fri, 13 Jun 2008) | 3 lines
Do not allow res_timing_dahdi to be unloaded. We can re-enable this once we
add automatic use count handling for timing modules.
................
r122557 | tilghman | 2008-06-13 08:15:07 -0600 (Fri, 13 Jun 2008) | 7 lines
Convert one more delimiter to use comma.
(closes issue #12850)
Reported by: bcnit
Patches:
20080613__bug12850.diff.txt uploaded by Corydon76 (license 14)
Tested by: bcnit
................
r122616 | jpeeler | 2008-06-13 11:38:28 -0600 (Fri, 13 Jun 2008) | 13 lines
Blocked revisions 122613 via svnmerge
........
r122613 | jpeeler | 2008-06-13 12:36:56 -0500 (Fri, 13 Jun 2008) | 6 lines
(closes issue #12846)
Reported by: Netview
Tested by: jpeeler
Use correct location to search for tonezone.
........
................
r122664 | jpeeler | 2008-06-13 12:58:29 -0600 (Fri, 13 Jun 2008) | 8 lines
Blocked revisions 122663 via svnmerge
........
r122663 | jpeeler | 2008-06-13 13:57:24 -0500 (Fri, 13 Jun 2008) | 1 line
fixed dahdi compatability header from assuming either dahdi or zaptel is installed (may not have either)
........
................
Added:
team/group/newcdr/apps/app_dahdibarge.c
- copied unchanged from r122664, trunk/apps/app_dahdibarge.c
team/group/newcdr/apps/app_dahdiras.c
- copied unchanged from r122664, trunk/apps/app_dahdiras.c
team/group/newcdr/apps/app_dahdiscan.c
- copied unchanged from r122664, trunk/apps/app_dahdiscan.c
team/group/newcdr/channels/chan_dahdi.c
- copied, changed from r122664, trunk/channels/chan_dahdi.c
team/group/newcdr/codecs/codec_dahdi.c
- copied unchanged from r122664, trunk/codecs/codec_dahdi.c
team/group/newcdr/configs/ais.conf.sample
- copied unchanged from r122664, trunk/configs/ais.conf.sample
team/group/newcdr/doc/distributed_devstate.txt
- copied unchanged from r122664, trunk/doc/distributed_devstate.txt
team/group/newcdr/include/asterisk/dahdi.h
- copied unchanged from r122664, trunk/include/asterisk/dahdi.h
team/group/newcdr/include/asterisk/timing.h
- copied unchanged from r122664, trunk/include/asterisk/timing.h
team/group/newcdr/main/timing.c
- copied unchanged from r122664, trunk/main/timing.c
team/group/newcdr/res/ais/
- copied from r122664, trunk/res/ais/
team/group/newcdr/res/ais/ais.h
- copied unchanged from r122664, trunk/res/ais/ais.h
team/group/newcdr/res/ais/amf.c
- copied unchanged from r122664, trunk/res/ais/amf.c
team/group/newcdr/res/ais/ckpt.c
- copied unchanged from r122664, trunk/res/ais/ckpt.c
team/group/newcdr/res/ais/clm.c
- copied unchanged from r122664, trunk/res/ais/clm.c
team/group/newcdr/res/ais/evt.c
- copied unchanged from r122664, trunk/res/ais/evt.c
team/group/newcdr/res/ais/lck.c
- copied unchanged from r122664, trunk/res/ais/lck.c
team/group/newcdr/res/res_ais.c
- copied unchanged from r122664, trunk/res/res_ais.c
team/group/newcdr/res/res_timing_dahdi.c
- copied unchanged from r122664, trunk/res/res_timing_dahdi.c
Removed:
team/group/newcdr/apps/app_fax.c
team/group/newcdr/apps/app_zapbarge.c
team/group/newcdr/apps/app_zapras.c
team/group/newcdr/apps/app_zapscan.c
team/group/newcdr/channels/chan_zap.c
team/group/newcdr/codecs/codec_zap.c
team/group/newcdr/include/asterisk/zapata.h
Modified:
team/group/newcdr/ (props changed)
team/group/newcdr/CHANGES
team/group/newcdr/Makefile
team/group/newcdr/README
team/group/newcdr/UPGRADE.txt
team/group/newcdr/apps/app_chanisavail.c
team/group/newcdr/apps/app_chanspy.c
team/group/newcdr/apps/app_dial.c
team/group/newcdr/apps/app_flash.c
team/group/newcdr/apps/app_forkcdr.c
team/group/newcdr/apps/app_getcpeid.c
team/group/newcdr/apps/app_meetme.c
team/group/newcdr/apps/app_page.c
team/group/newcdr/apps/app_parkandannounce.c
team/group/newcdr/apps/app_queue.c
team/group/newcdr/apps/app_rpt.c
team/group/newcdr/build_tools/menuselect-deps.in
team/group/newcdr/cdr/cdr_csv.c
team/group/newcdr/channels/chan_agent.c
team/group/newcdr/channels/chan_iax2.c
team/group/newcdr/channels/chan_mgcp.c
team/group/newcdr/channels/chan_skinny.c
team/group/newcdr/channels/misdn/isdn_lib.c
team/group/newcdr/codecs/codec_ilbc.c
team/group/newcdr/configs/extensions.ael.sample
team/group/newcdr/configs/extensions.conf.sample
team/group/newcdr/configs/extensions.lua.sample
team/group/newcdr/configs/meetme.conf.sample
team/group/newcdr/configs/muted.conf.sample
team/group/newcdr/configs/queues.conf.sample
team/group/newcdr/configs/rpt.conf.sample
team/group/newcdr/configs/sla.conf.sample
team/group/newcdr/configs/smdi.conf.sample
team/group/newcdr/configs/users.conf.sample
team/group/newcdr/configs/vpb.conf.sample
team/group/newcdr/configs/zapata.conf.sample
team/group/newcdr/configure
team/group/newcdr/configure.ac
team/group/newcdr/contrib/init.d/rc.mandrake.asterisk
team/group/newcdr/contrib/init.d/rc.mandrake.zaptel
team/group/newcdr/contrib/init.d/rc.suse.asterisk
team/group/newcdr/contrib/scripts/autosupport
team/group/newcdr/contrib/scripts/get_ilbc_source.sh
team/group/newcdr/contrib/scripts/loadtest.tcl
team/group/newcdr/contrib/scripts/realtime_pgsql.sql
team/group/newcdr/contrib/utils/zones2indications.c
team/group/newcdr/doc/asterisk.8
team/group/newcdr/doc/asterisk.sgml
team/group/newcdr/doc/backtrace.txt
team/group/newcdr/doc/janitor-projects.txt
team/group/newcdr/doc/manager_1_1.txt
team/group/newcdr/doc/osp.txt
team/group/newcdr/doc/sms.txt
team/group/newcdr/doc/ss7.txt
team/group/newcdr/doc/tex/ael.tex
team/group/newcdr/doc/tex/app-sms.tex
team/group/newcdr/doc/tex/backtrace.tex
team/group/newcdr/doc/tex/channelvariables.tex
team/group/newcdr/doc/tex/configuration.tex
team/group/newcdr/doc/tex/enum.tex
team/group/newcdr/doc/tex/hardware.tex
team/group/newcdr/doc/tex/localchannel.tex
team/group/newcdr/doc/tex/manager.tex
team/group/newcdr/doc/tex/privacy.tex
team/group/newcdr/doc/tex/queues-with-callback-members.tex
team/group/newcdr/doc/tex/security.tex
team/group/newcdr/doc/tex/sla.tex
team/group/newcdr/funcs/func_cdr.c
team/group/newcdr/funcs/func_odbc.c
team/group/newcdr/include/asterisk/autoconfig.h.in
team/group/newcdr/include/asterisk/cdr.h
team/group/newcdr/include/asterisk/channel.h
team/group/newcdr/include/asterisk/doxyref.h
team/group/newcdr/include/asterisk/dsp.h
team/group/newcdr/include/asterisk/event.h
team/group/newcdr/include/asterisk/event_defs.h
team/group/newcdr/include/asterisk/network.h
team/group/newcdr/include/asterisk/options.h
team/group/newcdr/include/asterisk/res_odbc.h
team/group/newcdr/main/Makefile
team/group/newcdr/main/abstract_jb.c
team/group/newcdr/main/asterisk.c
team/group/newcdr/main/cdr.c
team/group/newcdr/main/channel.c
team/group/newcdr/main/devicestate.c
team/group/newcdr/main/dial.c
team/group/newcdr/main/event.c
team/group/newcdr/main/features.c
team/group/newcdr/main/file.c
team/group/newcdr/main/loader.c
team/group/newcdr/main/netsock.c
team/group/newcdr/main/pbx.c
team/group/newcdr/main/sched.c
team/group/newcdr/makeopts.in
team/group/newcdr/pbx/pbx_config.c
team/group/newcdr/res/Makefile
team/group/newcdr/res/res_config_odbc.c
team/group/newcdr/res/res_musiconhold.c
team/group/newcdr/res/res_odbc.c
team/group/newcdr/utils/extconf.c
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/newcdr/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 13 16:29:30 2008
@@ -1,1 +1,1 @@
-/trunk:1-121514
+/trunk:1-122664
Modified: team/group/newcdr/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/CHANGES?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/CHANGES (original)
+++ team/group/newcdr/CHANGES Fri Jun 13 16:29:30 2008
@@ -1,6 +1,17 @@
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1 -------------
------------------------------------------------------------------------------
+
+Device State Handling
+---------------------
+ * The event infrastructure in Asterisk got another big update to help support
+ distributed events. It currently supports distributed device state and
+ distributed Voicemail MWI (Message Waiting Indication). A new module has
+ been merged, res_ais, which facilitates communicating events between servers.
+ It uses the SAForum AIS (Service Availability Forum Application Interface
+ Specification) CLM (Cluster Management) and EVT (Event) services to maintain
+ a cluster of Asterisk servers, and to share events between them. For more
+ information on setting this up, see doc/distributed_devstate.txt.
Dialplan Functions
------------------
@@ -17,9 +28,9 @@
* TIMEOUT() has been modified to be accurate down to the millisecond.
* ENUM*() functions now include the following new options:
- 'u' returns the full URI and does not strip off the URI-scheme.
- - 's' triggers ISN specific rewriting
- - 'i' looks for branches into an Infrastructure ENUM tree
- - 'd' for a direct DNS lookup without any flipping of digits.
+ - 's' triggers ISN specific rewriting
+ - 'i' looks for branches into an Infrastructure ENUM tree
+ - 'd' for a direct DNS lookup without any flipping of digits.
* TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
* CHANNEL() now has options for the maximum, minimum, and standard or normal
deviation of jitter, rtt, and loss for a call using chan_sip.
@@ -82,6 +93,12 @@
* PrivacyManager now takes an option where you can specify a context where the
given number will be matched. This way you have more control over who is allowed
and it stops the people who blindly enter 10 digits.
+ * ForkCDR has new options: 'a' updates the answer time on the new CDR; 'A' locks
+ answer times, disposition, on orig CDR against updates; 'D' Copies the disposition
+ from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
+ original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
+ the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
+ obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
SIP Changes
-----------
@@ -116,9 +133,9 @@
which shows which configuration files are in use.
* New CLI commands, "pri show version" and "ss7 show version" that will
display which version of libpri and libss7 are being used, respectively.
- A new API call was added so trunk will now have to be compiled against
- a versions of libpri and libss7 that have them or it will not know that
- these libraries exist.
+ A new API call was added so trunk will now have to be compiled against
+ a versions of libpri and libss7 that have them or it will not know that
+ these libraries exist.
DNS manager changes
-------------------
@@ -443,10 +460,10 @@
a web interface of some kind).
* Added the support for marking messages as "urgent." There are two methods to accomplish
this. One is to pass the 'U' option to VoiceMail(). Another way to mark a message as urgent
- is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
- the message as urgent after he has recorded a voicemail by following the voice instructions.
- When listening to voicemails using VoiceMailMain urgent messages will be presented before other
- messages
+ is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
+ the message as urgent after he has recorded a voicemail by following the voice instructions.
+ When listening to voicemails using VoiceMailMain urgent messages will be presented before other
+ messages
Queue changes
-------------
@@ -480,18 +497,18 @@
device state reported.
* New configuration option: randomperiodicannounce. If a list of periodic announcements is
specified by the periodic-announce option, then one will be chosen randomly when it is time
- to play a periodic announcment
+ to play a periodic announcment
* New configuration options: announce-position now takes two more values in addition to "yes" and
"no." Two new options, "limit" and "more," are allowed. These are tied to another option,
- announce-position-limit. By setting announce-position to "limit" callers will only have their
- position announced if their position is less than what is specified by announce-position-limit.
- If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
- will be told that their are more than announce-position-limit callers waiting.
+ announce-position-limit. By setting announce-position to "limit" callers will only have their
+ position announced if their position is less than what is specified by announce-position-limit.
+ If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
+ will be told that their are more than announce-position-limit callers waiting.
* Two new queue log events have been added. An ADDMEMBER event will be logged
when a realtime queue member is added and a REMOVEMEMBER event will be logged
- when a realtime queue member is removed. Since there is no calling channel associated
- with these events, the string "REALTIME" is placed where the channel's unique id
- is typically placed.
+ when a realtime queue member is removed. Since there is no calling channel associated
+ with these events, the string "REALTIME" is placed where the channel's unique id
+ is typically placed.
MeetMe Changes
--------------
@@ -761,7 +778,7 @@
* iLBC source code no longer included (see UPGRADE.txt for details)
* If compiled with DETECT_DEADLOCKS enabled and if you have glibc, then if
deadlock is detected, a backtrace of the stack which led to the lock calls
- will be output to the CLI.
+ will be output to the CLI.
* If compiled with DEBUG_THREADS enabled and if you have glibc, then issuing
the "core show locks" CLI command will give lock information output as well
- as a backtrace of the stack which led to the lock calls.
+ as a backtrace of the stack which led to the lock calls.
Modified: team/group/newcdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/Makefile?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/Makefile (original)
+++ team/group/newcdr/Makefile Fri Jun 13 16:29:30 2008
@@ -682,6 +682,7 @@
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
+ echo "dahdichanname = yes" ; Set channel name as DAHDI\
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
Modified: team/group/newcdr/README
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/README?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/README (original)
+++ team/group/newcdr/README Fri Jun 13 16:29:30 2008
@@ -175,7 +175,7 @@
understand, and do not affect how it is actually parsed.
Entries of the form 'variable=value' set the value of some parameter in
-asterisk. For example, in zapata.conf, one might specify:
+asterisk. For example, in dahdi.conf, one might specify:
switchtype=national
Modified: team/group/newcdr/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/UPGRADE.txt?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/UPGRADE.txt (original)
+++ team/group/newcdr/UPGRADE.txt Fri Jun 13 16:29:30 2008
@@ -150,6 +150,11 @@
username and password parameters in cdr_odbc.conf, therefore, are no
longer used. The dsn parameter now points to an entry in res_odbc.conf.
+* The uniqueid field in the core Asterisk structure has been changed from a
+ maximum 31 character field to a 149 character field, to account for all
+ possible values the systemname prefix could be. In the past, if the
+ systemname was too long, the uniqueid would have been truncated.
+
Formats:
* format_wav: The GAIN preprocessor definition and source code that used it
Modified: team/group/newcdr/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_chanisavail.c?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/apps/app_chanisavail.c (original)
+++ team/group/newcdr/apps/app_chanisavail.c Fri Jun 13 16:29:30 2008
@@ -75,7 +75,7 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n");
+ ast_log(LOG_WARNING, "ChanIsAvail requires an argument (DAHDI/1&DAHDI/2)\n");
return -1;
}
Modified: team/group/newcdr/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_chanspy.c?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/apps/app_chanspy.c (original)
+++ team/group/newcdr/apps/app_chanspy.c Fri Jun 13 16:29:30 2008
@@ -47,6 +47,7 @@
#include "asterisk/translate.h"
#include "asterisk/module.h"
#include "asterisk/lock.h"
+#include "asterisk/options.h"
#define AST_NAME_STRLEN 256
#define NUM_SPYGROUPS 128
@@ -587,6 +588,7 @@
const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
{
struct ast_channel *next;
+ char channel_name[AST_CHANNEL_NAME];
redo:
if (!ast_strlen_zero(spec))
@@ -599,7 +601,8 @@
if (!next)
return NULL;
- if (!strncmp(next->name, "Zap/pseudo", 10)) {
+ snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name);
+ if (!strncmp(next->name, channel_name, 10)) {
ast_channel_unlock(next);
goto redo;
} else if (next == chan) {
Modified: team/group/newcdr/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_dial.c?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/apps/app_dial.c (original)
+++ team/group/newcdr/apps/app_dial.c Fri Jun 13 16:29:30 2008
@@ -171,8 +171,8 @@
" o - Specify that the CallerID that was present on the *calling* channel\n"
" be set as the CallerID on the *called* channel. This was the\n"
" behavior of Asterisk 1.0 and earlier.\n"
-" O([x]) - \"Operator Services\" mode (Zaptel channel to Zaptel channel\n"
-" only, if specified on non-Zaptel interface, it will be ignored).\n"
+" O([x]) - \"Operator Services\" mode (DAHDI channel to DAHDI channel\n"
+" only, if specified on non-DAHDI interface, it will be ignored).\n"
" When the destination answers (presumably an operator services\n"
" station), the originator no longer has control of their line.\n"
" They may hang up, but the switch will not release their line\n"
@@ -1897,9 +1897,9 @@
res = -1;
goto done;
}
- if (opermode && !strncmp(chan->name, "Zap", 3) && !strncmp(peer->name, "Zap", 3)) {
- /* what's this special handling for Zap <-> Zap ?
- * A: Zap to Zap calls are natively bridged at the kernel driver
+ if (opermode && !strncmp(chan->tech->type, "DAHDI", 3) && !strncmp(peer->name, "DAHDI", 3)) {
+ /* what's this special handling for dahdi <-> dahdi ?
+ * A: dahdi to dahdi calls are natively bridged at the kernel driver
* level, so we need to ensure that this mode gets propagated
* all the way down. */
struct oprmode oprmode;
Modified: team/group/newcdr/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_flash.c?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/apps/app_flash.c (original)
+++ team/group/newcdr/apps/app_flash.c Fri Jun 13 16:29:30 2008
@@ -18,7 +18,7 @@
/*! \file
*
- * \brief App to flash a zap trunk
+ * \brief App to flash a DAHDI trunk
*
* \author Mark Spencer <markster at digium.com>
*
@@ -26,14 +26,14 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>dahdi</depend>
***/
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/zapata.h"
+#include "asterisk/dahdi.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -45,22 +45,22 @@
static char *app = "Flash";
-static char *synopsis = "Flashes a Zap Trunk";
+static char *synopsis = "Flashes a DAHDI Trunk";
static char *descrip =
-"Performs a flash on a zap trunk. This can be used\n"
+"Performs a flash on a DAHDI trunk. This can be used\n"
"to access features provided on an incoming analogue circuit\n"
"such as conference and call waiting. Use with SendDTMF() to\n"
"perform external transfers\n";
-static inline int zt_wait_event(int fd)
+static inline int dahdi_wait_event(int fd)
{
- /* Avoid the silly zt_waitevent which ignores a bunch of events */
+ /* Avoid the silly dahdi_waitevent which ignores a bunch of events */
int i,j=0;
- i = ZT_IOMUX_SIGEVENT;
- if (ioctl(fd, ZT_IOMUX, &i) == -1) return -1;
- if (ioctl(fd, ZT_GETEVENT, &j) == -1) return -1;
+ i = DAHDI_IOMUX_SIGEVENT;
+ if (ioctl(fd, DAHDI_IOMUX, &i) == -1) return -1;
+ if (ioctl(fd, DAHDI_GETEVENT, &j) == -1) return -1;
return j;
}
@@ -68,23 +68,23 @@
{
int res = -1;
int x;
- struct zt_params ztp;
+ struct dahdi_params dahdip;
- if (strcasecmp(chan->tech->type, "Zap")) {
- ast_log(LOG_WARNING, "%s is not a Zap channel\n", chan->name);
+ if (strcasecmp(chan->tech->type, "DAHDI")) {
+ ast_log(LOG_WARNING, "%s is not a DAHDI channel\n", chan->name);
return -1;
}
- memset(&ztp, 0, sizeof(ztp));
- res = ioctl(chan->fds[0], ZT_GET_PARAMS, &ztp);
+ memset(&dahdip, 0, sizeof(dahdip));
+ res = ioctl(chan->fds[0], DAHDI_GET_PARAMS, &dahdip);
if (!res) {
- if (ztp.sigtype & __ZT_SIG_FXS) {
- x = ZT_FLASH;
- res = ioctl(chan->fds[0], ZT_HOOK, &x);
+ if (dahdip.sigtype & __DAHDI_SIG_FXS) {
+ x = DAHDI_FLASH;
+ res = ioctl(chan->fds[0], DAHDI_HOOK, &x);
if (!res || (errno == EINPROGRESS)) {
if (res) {
/* Wait for the event to finish */
- zt_wait_event(chan->fds[0]);
+ dahdi_wait_event(chan->fds[0]);
}
res = ast_safe_sleep(chan, 1000);
ast_verb(3, "Flashed channel %s\n", chan->name);
Modified: team/group/newcdr/apps/app_forkcdr.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/apps/app_forkcdr.c?view=diff&rev=122711&r1=122710&r2=122711
==============================================================================
--- team/group/newcdr/apps/app_forkcdr.c (original)
+++ team/group/newcdr/apps/app_forkcdr.c Fri Jun 13 16:29:30 2008
@@ -42,21 +42,82 @@
"Forks the Call Data Record";
static char *descrip =
" ForkCDR([options]): Causes the Call Data Record to fork an additional\n"
-"cdr record starting from the time of the fork call\n"
+"cdr record starting from the time of the fork call. This new cdr record will\n"
+"be linked to end of the list of cdr records attached to the channel. The original CDR is\n"
+"has a LOCKED flag set, which forces most cdr operations to skip it, except\n"
[... 7510 lines stripped ...]
More information about the svn-commits
mailing list