[asterisk-commits] oej: branch oej/pinedanish-copybridgeflags-trunk r379998 - in /team/oej/pined...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jan 23 02:58:52 CST 2013
Author: oej
Date: Wed Jan 23 02:58:25 2013
New Revision: 379998
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379998
Log:
Resolve conflict, reset automerge
Added:
team/oej/pinedanish-copybridgeflags-trunk/UPGRADE-11.txt
- copied unchanged from r379966, trunk/UPGRADE-11.txt
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_empty.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_empty.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_inactive.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_inactive.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_multi.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_multi.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_multi_marked.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_multi_marked.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_single.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_single.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_state_single_marked.c
- copied unchanged from r379966, trunk/apps/confbridge/conf_state_single_marked.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/include/conf_state.h
- copied unchanged from r379966, trunk/apps/confbridge/include/conf_state.h
team/oej/pinedanish-copybridgeflags-trunk/build_tools/find_missing_support_level
- copied unchanged from r379966, trunk/build_tools/find_missing_support_level
team/oej/pinedanish-copybridgeflags-trunk/build_tools/get_documentation.py
- copied unchanged from r379966, trunk/build_tools/get_documentation.py
team/oej/pinedanish-copybridgeflags-trunk/build_tools/post_process_documentation.py
- copied unchanged from r379966, trunk/build_tools/post_process_documentation.py
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_motif.c
- copied unchanged from r379966, trunk/channels/chan_motif.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/security_events.h
- copied unchanged from r379966, trunk/channels/sip/include/security_events.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/security_events.c
- copied unchanged from r379966, trunk/channels/sip/security_events.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/utils.c
- copied unchanged from r379966, trunk/channels/sip/utils.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_abstract_jb.c
- copied unchanged from r379966, trunk/tests/test_abstract_jb.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_astobj2_thrash.c
- copied unchanged from r379966, trunk/tests/test_astobj2_thrash.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_config.c
- copied unchanged from r379966, trunk/tests/test_config.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_hashtab_thrash.c
- copied unchanged from r379966, trunk/tests/test_hashtab_thrash.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_jitterbuf.c
- copied unchanged from r379966, trunk/tests/test_jitterbuf.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_json.c
- copied unchanged from r379966, trunk/tests/test_json.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_scoped_lock.c
- copied unchanged from r379966, trunk/tests/test_scoped_lock.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_taskprocessor.c
- copied unchanged from r379966, trunk/tests/test_taskprocessor.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_threadpool.c
- copied unchanged from r379966, trunk/tests/test_threadpool.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_uuid.c
- copied unchanged from r379966, trunk/tests/test_uuid.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_voicemail_api.c
- copied unchanged from r379966, trunk/tests/test_voicemail_api.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_xml_escape.c
- copied unchanged from r379966, trunk/tests/test_xml_escape.c
Removed:
team/oej/pinedanish-copybridgeflags-trunk/apps/app_rpt.c
team/oej/pinedanish-copybridgeflags-trunk/apps/rpt_flow.pdf
team/oej/pinedanish-copybridgeflags-trunk/build_tools/make_version_h
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_usbradio.c
team/oej/pinedanish-copybridgeflags-trunk/channels/xpmr/
Modified:
team/oej/pinedanish-copybridgeflags-trunk/ (props changed)
team/oej/pinedanish-copybridgeflags-trunk/CREDITS
team/oej/pinedanish-copybridgeflags-trunk/README-SERIOUSLY.bestpractices.txt
team/oej/pinedanish-copybridgeflags-trunk/UPGRADE-10.txt
team/oej/pinedanish-copybridgeflags-trunk/agi/Makefile
team/oej/pinedanish-copybridgeflags-trunk/agi/agi.xml
team/oej/pinedanish-copybridgeflags-trunk/apps/Makefile
team/oej/pinedanish-copybridgeflags-trunk/apps/app_adsiprog.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_alarmreceiver.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_cdr.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_celgenuserevent.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_channelredirect.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_chanspy.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_confbridge.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_controlplayback.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_dahdiras.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_dial.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_dictate.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_directed_pickup.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_dumpchan.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_echo.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_festival.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_forkcdr.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_getcpeid.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_ices.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_ivrdemo.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_jack.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_macro.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_meetme.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_milliwatt.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_minivm.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_mixmonitor.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_morsecode.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_mp3.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_nbscat.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_page.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_parkandannounce.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_playtones.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_read.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_readexten.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_saycounted.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_sayunixtime.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_senddtmf.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_setcallerid.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_skel.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_sms.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_softhangup.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_stack.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_talkdetect.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_test.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_verbose.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_voicemail.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_waitforsilence.c
team/oej/pinedanish-copybridgeflags-trunk/apps/app_zapateller.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/ (props changed)
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/conf_config_parser.c
team/oej/pinedanish-copybridgeflags-trunk/apps/confbridge/include/confbridge.h
team/oej/pinedanish-copybridgeflags-trunk/bootstrap.sh
team/oej/pinedanish-copybridgeflags-trunk/bridges/Makefile
team/oej/pinedanish-copybridgeflags-trunk/bridges/bridge_builtin_features.c (contents, props changed)
team/oej/pinedanish-copybridgeflags-trunk/bridges/bridge_multiplexed.c (contents, props changed)
team/oej/pinedanish-copybridgeflags-trunk/bridges/bridge_simple.c
team/oej/pinedanish-copybridgeflags-trunk/bridges/bridge_softmix.c
team/oej/pinedanish-copybridgeflags-trunk/build_tools/cflags-devmode.xml
team/oej/pinedanish-copybridgeflags-trunk/build_tools/cflags.xml
team/oej/pinedanish-copybridgeflags-trunk/build_tools/embed_modules.xml
team/oej/pinedanish-copybridgeflags-trunk/build_tools/make_defaults_h
team/oej/pinedanish-copybridgeflags-trunk/build_tools/make_version
team/oej/pinedanish-copybridgeflags-trunk/build_tools/menuselect-deps.in
team/oej/pinedanish-copybridgeflags-trunk/build_tools/mkpkgconfig
team/oej/pinedanish-copybridgeflags-trunk/build_tools/prep_tarball
team/oej/pinedanish-copybridgeflags-trunk/channels/Makefile
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_agent.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_alsa.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_bridge.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_console.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_dahdi.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_gtalk.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_h323.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_iax2.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_jingle.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_local.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_mgcp.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_misdn.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_multicast_rtp.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_nbs.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_oss.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_phone.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_sip.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_skinny.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_unistim.c
team/oej/pinedanish-copybridgeflags-trunk/channels/chan_vpb.cc
team/oej/pinedanish-copybridgeflags-trunk/channels/console_board.c
team/oej/pinedanish-copybridgeflags-trunk/channels/console_gui.c
team/oej/pinedanish-copybridgeflags-trunk/channels/console_video.c
team/oej/pinedanish-copybridgeflags-trunk/channels/iax2-parser.c
team/oej/pinedanish-copybridgeflags-trunk/channels/iax2-parser.h
team/oej/pinedanish-copybridgeflags-trunk/channels/iax2-provision.c
team/oej/pinedanish-copybridgeflags-trunk/channels/iax2.h
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/chan_misdn_config.h
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/ie.c
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/isdn_lib.c
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/isdn_lib.h
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/isdn_msg_parser.c
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn/portinfo.c
team/oej/pinedanish-copybridgeflags-trunk/channels/misdn_config.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_analog.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_analog.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_pri.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_pri.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_ss7.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sig_ss7.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/config_parser.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/dialplan_functions.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/config_parser.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/dialog.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/reqresp_parser.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/sdp_crypto.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/sip.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/sip_utils.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/include/srtp.h
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/reqresp_parser.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/sdp_crypto.c
team/oej/pinedanish-copybridgeflags-trunk/channels/sip/srtp.c
team/oej/pinedanish-copybridgeflags-trunk/channels/vcodecs.c
team/oej/pinedanish-copybridgeflags-trunk/channels/vgrabbers.c
team/oej/pinedanish-copybridgeflags-trunk/config.guess
team/oej/pinedanish-copybridgeflags-trunk/config.sub
team/oej/pinedanish-copybridgeflags-trunk/configure
team/oej/pinedanish-copybridgeflags-trunk/configure.ac
team/oej/pinedanish-copybridgeflags-trunk/pbx/Makefile
team/oej/pinedanish-copybridgeflags-trunk/pbx/dundi-parser.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_ael.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_config.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_dundi.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_loopback.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_lua.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_realtime.c
team/oej/pinedanish-copybridgeflags-trunk/pbx/pbx_spool.c
team/oej/pinedanish-copybridgeflags-trunk/tests/Makefile
team/oej/pinedanish-copybridgeflags-trunk/tests/test_acl.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_amihooks.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_astobj2.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_db.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_devicestate.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_dlinklists.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_event.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_format_api.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_gosub.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_linkedlists.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_locale.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_logger.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_netsock2.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_pbx.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_poll.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_security_events.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_substitution.c
team/oej/pinedanish-copybridgeflags-trunk/tests/test_utils.c
Propchange: team/oej/pinedanish-copybridgeflags-trunk/
------------------------------------------------------------------------------
automerge = Is-there-life-off-net?
Propchange: team/oej/pinedanish-copybridgeflags-trunk/
('svnmerge-integrated' removed)
Modified: team/oej/pinedanish-copybridgeflags-trunk/CREDITS
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-trunk/CREDITS?view=diff&rev=379998&r1=379997&r2=379998
==============================================================================
--- team/oej/pinedanish-copybridgeflags-trunk/CREDITS (original)
+++ team/oej/pinedanish-copybridgeflags-trunk/CREDITS Wed Jan 23 02:58:25 2013
@@ -1,255 +1,319 @@
=== DEVELOPMENT SUPPORT ===
-We'd like to thank the following companies for helping fund development of
-Asterisk:
-
-Pilosoft, Inc. - for supporting ADSI development in Asterisk
-
-Asterlink, Inc. - for supporting broad Asterisk development
-
-GFS - for supporting ALSA development
-
-Telesthetic - for supporting SIP development
-
-Christos Ricudis - for substantial code contributions
-
-nic.at - ENUM support in Asterisk
-
-Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
-
-John Todd, TalkPlus, Inc. and JR Richardson, Ntegrated Solutions. - for funding
- the development of SIP Session Timers support.
-
-Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
-originate with video/text and many more contributions.
-
-ClearIT AB for work with meetme, res_mutestream, RTCP, manager and tonezones
+
+ We'd like to thank the following companies for helping fund development of
+ Asterisk.
+
+ * Pilosoft, Inc. - for supporting ADSI development in Asterisk
+
+ * Asterlink, Inc. - for supporting broad Asterisk development
+
+ * GFS - for supporting ALSA development
+
+ * Telesthetic - for supporting SIP development
+
+ * Christos Ricudis - for substantial code contributions
+
+ * nic.at - ENUM support in Asterisk
+
+ * Paul Bagyenda, Digital Solutions - for initial Voicetronix driver
+ development.
+
+ * John Todd, TalkPlus, Inc. and JR Richardson, Ntegrated Solutions.
+ for funding the development of SIP Session Timers support.
+
+ * Omnitor AB, Gunnar Hellström, for funding work with videocaps,
+ T.140 RED, originate with video/text and many more
+ contributions.
+
+ * ClearIT AB for work with meetme, res_mutestream, RTCP, manager and
+ tonezones.
+
+ * NetNation Communications (www.netnation.com)
+ Kevin Lindsay <kevinl at netnation.com>
+ Persistent Dynamic Queue Members
+
+ * inAccess Networks (work funded by Hellas On Line (HOL) www.hol.gr)
+ Priorities in queues
+
+ * Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for
+ rewrite of SIP transfers
+
=== WISHLIST CONTRIBUTERS ===
-Jeremy McNamara - SpeeX support
-Nick Seraphin - RDNIS support
-Gary - Phonejack ADSI (in progress)
-Wasim - Hangup detect
+
+ We'd like to thank the following for contributing to our wishlist
+
+ * Jeremy McNamara - SpeeX support
+
+ * Nick Seraphin - RDNIS support
+
+ * Gary - Phonejack ADSI (in progress)
+
+ * Wasim - Hangup detect
=== HARDWARE DONORS ===
-* Thanks to QuickNet Technologies for their donation of an Internet
-PhoneJack and Linejack card to the project. (http://www.quicknet.net)
-
-* Thanks to VoipSupply for their donation of Sipura ATAs to the project for
-T.38 testing. (http://www.voipsupply.com)
-
-* Thanks to Grandstream for their donation of ATAs to the project for
-T.38 testing. (http://www.grandstream.com)
+
+ We'd like to thank the followwing for granting access to hardware for testing.
+
+ * Thanks to QuickNet Technologies for their donation of an Internet
+ PhoneJack and Linejack card to the project.
+ (http://www.quicknet.net)
+
+ * Thanks to VoipSupply for their donation of Sipura ATAs to the project
+ for T.38 testing. (http://www.voipsupply.com)
+
+
+ * Thanks to Grandstream for their donation of ATAs to the project for
+ T.38 testing. (http://www.grandstream.com)
=== MISCELLANEOUS PATCHES ===
-Jim Dixon - Zapata Telephony and app_rpt
- http://www.zapatatelephony.org/app_rpt.html
-
-Russell Bryant - Asterisk release manager and countless enhancements and bug
- fixes.
- russell(AT)digium.com
-
-Anthony Minessale II - Countless big and small fixes, and relentless forward
- push. ChanSpy, ForkCDR, ControlPlayback, While/EndWhile, DumpChan, Dictate,
- MacroIf, ExecIf, ExecIfTime, RetryDial, MixMonitor applications; many
- realtime concepts and implementation pieces, including res_config_odbc;
- format_slin; cdr_custom; several features in Dial including L(), G() and
- enhancements to M() and D(); several CDR enhancements including CDR
- variables; attended transfer; one touch record; native MOH; manager
- eventmask; command line '-t' flag to allow recording/voicemail on nfs
- shares; #exec command and multiline comments in config files; setvar in iax
- and sip configs.
- anthmct(AT)yahoo.com http://www.asterlink.com
-
-James Golovich - Innumerable contributions, including SIP TCP and TLS support.
- You can find him and asterisk-perl at http://asterisk.gnuinter.net
-
-Andre Bierwirth - Extension hints and status
-
-Jean-Denis Girard - Various contributions from the South Pacific Islands
- jd-girard(AT)esoft.pf http://www.esoft.pf
-
-William Jordan / Vonage - MySQL enhancements to Voicemail
- wjordan(AT)vonage.com
-
-Jac Kersing - Various fixes
-
-Steven Critchfield - Seek and Trunc functions for playback and recording
- critch(AT)basesys.com
-
-Jefferson Noxon - app_lookupcidname, app_db, and various other contributions
-
-Klaus-Peter Junghanns - in-band DTMF on SIP and MGCP
-
-Ross Finlayson - Dynamic RTP payload support
-
-Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
- format, and various fixes. Can be contacted at mahmut(AT)oa.com.au
-
-James Dennis - Cisco SIP compatibility patches to work with SIP service
- providers. Can be contacted at asterisk(AT)jdennis.net
-
-Tilghman Lesher - ast_localtime(); ast_say_date_with_format();
- GotoIfTime, SayUnixTime, HasNewVoicemail applications;
- CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, some QUEUE* functions;
- func_odbc, cdr_adaptive_odbc, and other innumerable bug fixes.
- tilghman(AT)digium.com http://asterisk.drunkcoder.com/
-
-Jayson Vantuyl - Manager protocol changes, various other bugs.
- jvantuyl(AT)computingedge.net
-
-Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
- dialplan include verification, route lookup on OpenBSD, SNMP agent
- support (res_snmp), various other bugs. tholo(AT)sigmasoft.com
-
-Josh Roberson - chan_zap reload support, Advanced Voicemail Features, & other
- misc. patches. - josh(AT)asteriasgi.com, http://www.asteriasgi.com
-
-William Waites - syslog support, SIP NAT traversal for SIP-UA. ww(AT)styx.org
-
-Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
- rich(AT)whiteoaklabs.com http://whiteoaklabs.com
-
-Simon Lockhart - Porting to Solaris (based on work of Logan ???)
- simon(AT)slimey.org
-
-Olle E. Johansson - SIP RFC compliance, documentation and testing, testing,
- SIP outbound proxy support, Manager 1.1 update, SIP transfer support,
- SIP presence support, SIP call state updates (dialog-info),
- QUEUE_EXISTS function, device state provider architecture,
- multiparking (together with mvanbaak), meetme and parking device states,
- MiniVM - the small voicemail system, many documentation
- updates/corrections, and many bug fixes.
- oej(AT)edvina.net, http://edvina.net
-
-Steve Kann - new jitter buffer for IAX2
- stevek(AT)stevek.com
-
-Constantine Filin - major contributions to the Asterisk Realtime Architecture
-
-Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade.
- murf(AT)digium.com
-
-Claude Patry - bug fixes, feature enhancements, and bug marshalling
- cpatry(AT)gmail.com
-
-Miroslav Nachev, miro(AT)space-comm.com COSMOS Software Enterprises, Ltd.
- - for Variable for No Answer Timeout for Attended Transfer
-
-Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
- Securax Ltd. info(AT)securax.be
-
-Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
- roy(AT)karlsbakk.net, Briiz Telecom AS
-
-Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite
- of SIP transfers
-
-Philippe Sultan - RADIUS CDR module, many fixes to res_jabber and gtalk/jingle
- channel drivers.
- INRIA, http://www.inria.fr/
-
-John Martin, Aupix - Improved video support in the SIP channel
- T.140 text support in RTP/SIP
-
-Steve Underwood - Provided T.38 pass through support.
-
-George Konstantoulakis - Support for Greek in voicemail added by InAccess
- Networks (work funded by HOL, www.hol.gr) gkon(AT)inaccessnetworks.com
-
-Daniel Nylander - Support for Swedish and Norwegian languages in voicemail.
- http://www.danielnylander.se/
-
-Stojan Sljivic - An option for maximum number of messsages per mailbox in
- voicemail. Also an issue with voicemail synchronization has been fixed.
- GDS Partners www.gdspartners.com . stojan.sljivic(AT)gdspartners.com
-
-Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl)
- Bartosz.Supczinski(AT)dir.pl
-
-James Rothenberger - Support for IMAP storage integration added by
- OneBizTone LLC Work funded by University of Pennsylvania jar(AT)onebiztone.com
-
-Paul Cadach - Bringing chan_h323 up to date, bug fixes, and more!
-
-Voop AS - Financial support for a lot of work with the SIP driver and the IAX
- trunk MTU patch
-
-Cedric Hans - Development of chan_unistim
- cedric.hans(AT)mlkj.net
-
-Takao Takahashi & Mina Naguib - chan_unistim improvements for smaller devices
-
-Sergio Fadda - console_video: video support for chan_oss and chan_alsa
-
-Marta Carbone - console_video and the astobj2 framework
-
-Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
- and a bunch of infrastructure work (loader, new_cli, ...)
-
-Brett Bryant - digit option for musiconhold selection, ENUMQUERY and ENUMRESULT functions,
- feature group configuration for features.conf, per-file CLI debug and verbose settings,
- TCP and TLS support for SIP, and various bug fixes.
- brettbryant(AT)gmail.com
-
-Sergey Tamkovich - Realtime support for MusicOnHold, store and destroy realtime methods and
- implementations for odbc, sqlite, and pgsql realtime drivers, attended transfer updates,
- multiple speeds for ControlPlayback, and multiple bug fixes
- - See http://voip-info.org/users/view/sergee
- serg(AT)voipsolutions.ru
-
-Klaus Darillon - the SIPremoveHeader function in chan_sip
-
-Moises Silva (moy) - for writing LibOpenR2, and providing support for it in chan_dahdi
- moises.silva(AT)gmail.com
-
-Eliel C. Sardanons - XML documentation implementation, and various other contributions
- eliels(AT)gmail.com
-
-Sean Bright - Snom call pickup, newt interface for menuselect, cdr_tds rewrite,
- countless other improvements, fixes, and good ideas.
- sean(AT)malleable.com
-
-Jan Kaláb - Calendaring support for Exchange Server 2007+ via Exchange Web Services.
-
-University of Oslo (uio.no), Norway - SIP Max-Forwards setting support (developed by oej)
-
-FCCN, Lissabon, Portugal - SIP show channels CLI command (developed by oej)
-
-Viagenie, Canada - IPv6 support in socket layers and SIP implementation
- Developers: Marc Blanchet, Simon Perreault and Jean-Philippe Dionne
-
-ClearIT AB, Sweden - res_mutestream, queue_exists and various other patches (developed by oej)
-
-Despegar.com, Argentina - AstData API implementation, also sponsored by Google as part of the
- gsoc/2009 program (developed by Eliel)
-
-Philippe Lindheimer - DEV_STATE additions to CCSS
+
+ We'd like to thank the flollowing for their patches
+
+ * Jim Dixon - Zapata Telephony and app_rpt
+ http://www.zapatatelephony.org/app_rpt.html
+
+ * Russell Bryant - Asterisk release manager and countless enhancements
+ and bug fixes. russell(AT)digium.com
+
+ * Anthony Minessale II - Countless big and small fixes, and relentless
+ forward push. ChanSpy, ForkCDR, ControlPlayback, While/EndWhile,
+ DumpChan, Dictate, MacroIf, ExecIf, ExecIfTime, RetryDial,
+ MixMonitor applications; many realtime concepts and
+ implementation pieces, including res_config_odbc; format_slin;
+ cdr_custom; several features in Dial including L(), G() and
+ enhancements to M() and D(); several CDR enhancements including
+ CDR variables; attended transfer; one touch record; native MOH;
+ manager eventmask; command line '-t' flag to allow
+ recording/voicemail on nfs shares; #exec command and multiline
+ comments in config files; setvar in iax and sip configs.
+ anthmct(AT)yahoo.com http://www.asterlink.com
+
+ * James Golovich - Innumerable contributions, including SIP TCP and TLS
+ support. You can find him and asterisk-perl at
+ http://asterisk.gnuinter.net
+
+ * Andre Bierwirth - Extension hints and status
+
+ * Jean-Denis Girard - Various contributions from the South Pacific
+ Islands jd-girard(AT)sysnux.pf http://www.sysnux.pf
+
+ * William Jordan / Vonage - MySQL enhancements to Voicemail
+ wjordan(AT)vonage.com
+
+ * Jac Kersing - Various fixes
+
+ * Steven Critchfield - Seek and Trunc functions for playback and
+ recording critch(AT)basesys.com
+
+ * Jefferson Noxon - app_lookupcidname, app_db, and various other
+ contributions
+
+ * Klaus-Peter Junghanns - in-band DTMF on SIP and MGCP
+
+ * Ross Finlayson - Dynamic RTP payload support
+
+ * Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw
+ file format, and various fixes. Can be contacted at
+ mahmut(AT)oa.com.au
+
+ * James Dennis - Cisco SIP compatibility patches to work with SIP
+ service providers. Can be contacted at asterisk(AT)jdennis.net
+
+ * Tilghman Lesher - ast_localtime(); ast_say_date_with_format();
+ GotoIfTime, SayUnixTime, HasNewVoicemail applications;
+ CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, some QUEUE*
+ functions; func_odbc, cdr_adaptive_odbc, and other innumerable
+ bug fixes. tilghman(AT)digium.com
+ http://asterisk.drunkcoder.com
+
+ * Jayson Vantuyl - Manager protocol changes, various other bugs.
+ jvantuyl(AT)computingedge.net
+
+ * Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on
+ 10.3, dialplan include verification, route lookup on OpenBSD,
+ SNMP agent support (res_snmp), various other bugs.
+ tholo(AT)sigmasoft.com
+
+ * Josh Roberson - chan_zap reload support, Advanced Voicemail Features,
+ & other misc. patches. josh(AT)asteriasgi.com
+ http://www.asteriasgi.com
+
+ * William Waites - syslog support, SIP NAT traversal for SIP-UA.
+ ww(AT)styx.org
+
+ * Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
+ rich(AT)whiteoaklabs.com http://whiteoaklabs.com
+
+ * Simon Lockhart - Porting to Solaris (based on work of Logan ???)
+ simon(AT)slimey.org
+
+ * Olle E. Johansson - SIP RFC compliance, documentation and testing,
+ testing, SIP outbound proxy support, Manager 1.1 update, SIP
+ transfer support, SIP presence support, SIP call state updates
+ (dialog-info), QUEUE_EXISTS function, device state provider
+ architecture, multiparking (together with mvanbaak), meetme and
+ parking device states, MiniVM - the small voicemail system,
+ many documentation updates/corrections, and many bug fixes.
+ oej(AT)edvina.net, http://edvina.net
+
+ * Steve Kann - new jitter buffer for IAX2
+ stevek(AT)stevek.com
+
+ * Constantine Filin - major contributions to the Asterisk Realtime
+ Architecture
+
+ * Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser
+ upgrade. murf(AT)digium.com
+
+ * Claude Patry - bug fixes, feature enhancements, and bug marshalling
+ cpatry(AT)gmail.com
+
+ * Miroslav Nachev, miro(AT)space-comm.com
+ COSMOS Software Enterprises, Ltd.
+ Variable for No Answer Timeout for Attended Transfer
+
+ * Slav Klenov & Vanheuverzwijn Joachim - development of the generic
+ jitterbuffer Securax Ltd. info(AT)securax.be
+
+ * Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer
+ development roy(AT)karlsbakk.net, Briiz Telecom AS
+
+ * Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - rewrite
+ of SIP transfers
+
+ * Philippe Sultan - RADIUS CDR module, many fixes to res_jabber and
+ gtalk/jingle channel drivers. INRIA, http://www.inria.fr/
+
+ * John Martin, Aupix - Improved video support in the SIP channel
+ T.140 text support in RTP/SIP
+
+ * Steve Underwood - Provided T.38 pass through support.
+
+ * George Konstantoulakis - Support for Greek in voicemail added by
+ InAccess Networks (work funded by HOL, www.hol.gr)
+ gkon(AT)inaccessnetworks.com
+
+ * Daniel Nylander - Support for Swedish and Norwegian languages in
+ voicemail. http://www.danielnylander.se/
+
+ * Stojan Sljivic - An option for maximum number of messsages per
+ mailbox in voicemail. Also an issue with voicemail
+ synchronization has been fixed. GDS Partners
+ www.gdspartners.com stojan.sljivic(AT)gdspartners.com
+
+ * Bartosz Supczinski - Support for Polish added by DIR (www.dir.pl)
+ Bartosz.Supczinski(AT)dir.pl
+
+ * James Rothenberger - Support for IMAP storage integration added by
+ OneBizTone LLC Work funded by University of Pennsylvania
+ jar(AT)onebiztone.com
+
+ * Paul Cadach - Bringing chan_h323 up to date, bug fixes, and more!
+
+ * Voop AS - Financial support for a lot of work with the SIP driver
+ and the IAX trunk MTU patch
+
+ * Cedric Hans - Development of chan_unistim cedric.hans(AT)mlkj.net
+
+ * Takao Takahashi & Mina Naguib - chan_unistim improvements for
+ smaller devices
+
+ * Sergio Fadda - console_video: video support for chan_oss and
+ chan_alsa
+
+ * Marta Carbone - console_video and the astobj2 framework
+
+ * Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
+ and a bunch of infrastructure work (loader, new_cli, ...)
+
+ * Brett Bryant - digit option for musiconhold selection, ENUMQUERY and
+ ENUMRESULT functions, feature group configuration for
+ features.conf, per-file CLI debug and verbose settings, TCP and
+ TLS support for SIP, and various bug fixes.
+ brettbryant(AT)gmail.com
+
+ * Sergey Tamkovich - Realtime support for MusicOnHold, store and destroy
+ realtime methods and implementations for odbc, sqlite, and pgsql
+ realtime drivers, attended transfer updates, multiple speeds for
+ ControlPlayback, and multiple bug fixes See
+ http://voip-info.org/users/view/sergee serg(AT)voipsolutions.ru
+
+ * Klaus Darillon - the SIPremoveHeader function in chan_sip
+
+ * Moises Silva (moy) - for writing LibOpenR2, and providing support for
+ it in chan_dahdi moises.silva(AT)gmail.com
+
+ * Eliel C. Sardanons - XML documentation implementation, and various
+ other contributions eliels(AT)gmail.com
+
+ * Sean Bright - Snom call pickup, newt interface for menuselect,
+ cdr_tds rewrite, countless other improvements, fixes, and good
+ ideas. sean(AT)malleable.com
+
+ * Jan Kaláb - Calendaring support for Exchange Server 2007+ via
+ Exchange Web Services.
+
+ * University of Oslo (uio.no), Norway - SIP Max-Forwards setting
+ support (developed by oej)
+
+ * FCCN, Lissabon, Portugal - SIP show channels CLI command
+ (developed by oej)
+
+ * Viagenie, Canada - IPv6 support in socket layers and SIP
+ implementation Developers: Marc Blanchet, Simon Perreault and
+ Jean-Philippe Dionne
+
+ * ClearIT AB, Sweden - res_mutestream, queue_exists and various other
+ patches (developed by oej)
+
+ * Despegar.com, Argentina - AstData API implementation, also sponsored
+ by Google as part of the gsoc/2009 program (developed by Eliel)
+
+ * Philippe Lindheimer - DEV_STATE additions to CCSS
+
+ * Andrew "lathama" Latham <lathama at gmail dot com>
+ Doxygen, HTTP-Static, Phoneprov, make update
=== OTHER CONTRIBUTIONS ===
-John Todd - Monkey sounds and associated teletorture prompt
-Michael Jerris - bug marshaling
-Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
- available under a Creative Commons License at http://www.asteriskdocs.org
-Brian M. Clapper - poll.c emulation
- This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
+
+ We'd like to thank the following for their listed contributions.
+
+ * John Todd - Monkey sounds and associated teletorture prompt
+
+ * Michael Jerris - bug marshaling
+
+ * Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
+ available under a Creative Commons License at
+ http://www.asteriskdocs.org
+
+ * Brian M. Clapper - poll.c emulation
+ This product includes software developed by
+ Brian M. Clapper <bmc(AT)clapper.org>
=== HOLD MUSIC ===
-Music provided by www.opsound.org
+
+ We'd like to thank the following for hold music
+
+ * Music provided by www.opsound.org
=== OTHER SOURCE CODE IN ASTERISK ===
-Asterisk uses libedit, the lightweight readline replacement from NetBSD.
-The cdr_radius module uses libradiusclient-ng, which is also from NetBSD.
-They are BSD-licensed and require the following statement:
-
- This product includes software developed by the NetBSD
- Foundation, Inc. and its contributors.
-
-Digium did not implement the codecs in Asterisk. Here is the copyright on the
-GSM source:
-
-Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
-Technische Universitaet Berlin
+
+ We'd like to thank the following for their code use
+
+ * Asterisk uses libedit, the lightweight readline replacement from
+ NetBSD.
+ * The cdr_radius module uses libradiusclient-ng, which is also from
+ NetBSD.
+ * They are BSD-licensed and require the following statement:
+ This product includes software developed by the NetBSD
+ Foundation, Inc. and its contributors.
+
+ * Digium did not implement the codecs in Asterisk.
+ Here is the copyright on the GSM source:
+ Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+ Technische Universitaet Berlin
Any use of this software is permitted provided that this notice is not
removed and that neither the authors nor the Technische Universitaet Berlin
Modified: team/oej/pinedanish-copybridgeflags-trunk/README-SERIOUSLY.bestpractices.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinedanish-copybridgeflags-trunk/README-SERIOUSLY.bestpractices.txt?view=diff&rev=379998&r1=379997&r2=379998
==============================================================================
--- team/oej/pinedanish-copybridgeflags-trunk/README-SERIOUSLY.bestpractices.txt (original)
+++ team/oej/pinedanish-copybridgeflags-trunk/README-SERIOUSLY.bestpractices.txt Wed Jan 23 02:58:25 2013
@@ -22,6 +22,9 @@
* Reducing Pattern Match Typos:
Using the 'same' prefix, or using Goto()
+
+* Manager Class Authorizations:
+ Recognizing potential issues with certain classes of authorization
----------------
Additional Links
@@ -293,3 +296,51 @@
exten => error,1,Verbose(2,Unable to lookup technology or device for extension)
same => n,Playback(silence/1&num-not-in-db)
same => n,Hangup()
+
+
+============================
+Manager Class Authorizations
+============================
+
+Manager accounts have associated class authorizations that define what actions
+and events that account can execute/receive. In order to run Asterisk commands
+or dialplan applications that affect the system Asterisk executes on, the
+"system" class authorization should be set on the account.
+
+However, Manager commands that originate new calls into the Asterisk dialplan
+have the potential to alter or affect the system as well, even though the
+class authorization for origination commands is "originate". Take, for example,
+the Originate manager command:
+
+Action: Originate
+Channel: SIP/foo
+Exten: s
+Context: default
+Priority: 1
+Application: System
+Data: echo hello world!
+
+This manager command will attempt to execute an Asterisk application, System,
+which is normally associated with the "system" class authorication. While some
+checks have been put into Asterisk to take this into account, certain dialplan
+configurations and/or clever manipulation of the Originate manager action can
+circumvent these checks. For example, take the following dialplan:
+
+exten => s,1,Verbose(Incoming call)
+same => n,MixMonitor(foo.wav,,${EXEC_COMMAND})
+same => n,Dial(SIP/bar)
+same => n,Hangup()
+
+Whatever has been defined in the variable EXEC_COMMAND will be executed after
[... 93506 lines stripped ...]
More information about the asterisk-commits
mailing list