[svn-commits] branch oej/strictrouting r36184 - in
/team/oej/strictrouting: ./ agi/ apps/ b...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue Jun 27 14:13:15 MST 2006
Author: oej
Date: Tue Jun 27 16:13:12 2006
New Revision: 36184
URL: http://svn.digium.com/view/asterisk?rev=36184&view=rev
Log:
Updating to trunk, resetting automerge
Added:
team/oej/strictrouting/Makefile.rules
- copied unchanged from r36180, trunk/Makefile.rules
team/oej/strictrouting/abstract_jb.c
- copied unchanged from r36180, trunk/abstract_jb.c
team/oej/strictrouting/apps/app_followme.c
- copied unchanged from r36180, trunk/apps/app_followme.c
team/oej/strictrouting/build_tools/get_makeopts
- copied unchanged from r36180, trunk/build_tools/get_makeopts
team/oej/strictrouting/build_tools/get_moduleinfo
- copied unchanged from r36180, trunk/build_tools/get_moduleinfo
team/oej/strictrouting/codecs/codec_zap.c
- copied unchanged from r36180, trunk/codecs/codec_zap.c
team/oej/strictrouting/configs/followme.conf.sample
- copied unchanged from r36180, trunk/configs/followme.conf.sample
team/oej/strictrouting/contrib/utils/zones2indications.c
- copied unchanged from r36180, trunk/contrib/utils/zones2indications.c
team/oej/strictrouting/doc/callfiles.txt
- copied unchanged from r36180, trunk/doc/callfiles.txt
team/oej/strictrouting/fixedjitterbuf.c
- copied unchanged from r36180, trunk/fixedjitterbuf.c
team/oej/strictrouting/fixedjitterbuf.h
- copied unchanged from r36180, trunk/fixedjitterbuf.h
team/oej/strictrouting/funcs/func_global.c
- copied unchanged from r36180, trunk/funcs/func_global.c
team/oej/strictrouting/include/asterisk/abstract_jb.h
- copied unchanged from r36180, trunk/include/asterisk/abstract_jb.h
team/oej/strictrouting/include/asterisk/autoconfig.h.in
- copied unchanged from r36180, trunk/include/asterisk/autoconfig.h.in
team/oej/strictrouting/pbx/ael/ael-test/ael-test8/
- copied from r36180, trunk/pbx/ael/ael-test/ael-test8/
team/oej/strictrouting/pbx/ael/ael-test/ael-test8/extensions.ael
- copied unchanged from r36180, trunk/pbx/ael/ael-test/ael-test8/extensions.ael
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test8
- copied unchanged from r36180, trunk/pbx/ael/ael-test/ref.ael-test8
team/oej/strictrouting/sounds/Makefile
- copied unchanged from r36180, trunk/sounds/Makefile
team/oej/strictrouting/sounds/sounds.xml
- copied unchanged from r36180, trunk/sounds/sounds.xml
Removed:
team/oej/strictrouting/build_tools/Makefile
team/oej/strictrouting/build_tools/get_moduledeps
team/oej/strictrouting/build_tools/menuselect.c
team/oej/strictrouting/build_tools/menuselect.h
team/oej/strictrouting/build_tools/menuselect_curses.c
team/oej/strictrouting/include/autoconfig.h.in
team/oej/strictrouting/mxml/
team/oej/strictrouting/sounds/agent-alreadyon.gsm
team/oej/strictrouting/sounds/agent-incorrect.gsm
team/oej/strictrouting/sounds/agent-loggedoff.gsm
team/oej/strictrouting/sounds/agent-loginok.gsm
team/oej/strictrouting/sounds/agent-newlocation.gsm
team/oej/strictrouting/sounds/agent-pass.gsm
team/oej/strictrouting/sounds/agent-user.gsm
team/oej/strictrouting/sounds/auth-incorrect.gsm
team/oej/strictrouting/sounds/auth-thankyou.gsm
team/oej/strictrouting/sounds/beep.gsm
team/oej/strictrouting/sounds/beeperr.gsm
team/oej/strictrouting/sounds/conf-adminmenu.gsm
team/oej/strictrouting/sounds/conf-enteringno.gsm
team/oej/strictrouting/sounds/conf-errormenu.gsm
team/oej/strictrouting/sounds/conf-getchannel.gsm
team/oej/strictrouting/sounds/conf-getconfno.gsm
team/oej/strictrouting/sounds/conf-getpin.gsm
team/oej/strictrouting/sounds/conf-hasjoin.gsm
team/oej/strictrouting/sounds/conf-hasleft.gsm
team/oej/strictrouting/sounds/conf-invalid.gsm
team/oej/strictrouting/sounds/conf-invalidpin.gsm
team/oej/strictrouting/sounds/conf-kicked.gsm
team/oej/strictrouting/sounds/conf-leaderhasleft.gsm
team/oej/strictrouting/sounds/conf-locked.gsm
team/oej/strictrouting/sounds/conf-lockednow.gsm
team/oej/strictrouting/sounds/conf-muted.gsm
team/oej/strictrouting/sounds/conf-noempty.gsm
team/oej/strictrouting/sounds/conf-onlyone.gsm
team/oej/strictrouting/sounds/conf-onlyperson.gsm
team/oej/strictrouting/sounds/conf-otherinparty.gsm
team/oej/strictrouting/sounds/conf-placeintoconf.gsm
team/oej/strictrouting/sounds/conf-thereare.gsm
team/oej/strictrouting/sounds/conf-unlockednow.gsm
team/oej/strictrouting/sounds/conf-unmuted.gsm
team/oej/strictrouting/sounds/conf-usermenu.gsm
team/oej/strictrouting/sounds/conf-userswilljoin.gsm
team/oej/strictrouting/sounds/conf-userwilljoin.gsm
team/oej/strictrouting/sounds/conf-waitforleader.gsm
team/oej/strictrouting/sounds/demo-abouttotry.gsm
team/oej/strictrouting/sounds/demo-congrats.gsm
team/oej/strictrouting/sounds/demo-echodone.gsm
team/oej/strictrouting/sounds/demo-echotest.gsm
team/oej/strictrouting/sounds/demo-enterkeywords.gsm
team/oej/strictrouting/sounds/demo-instruct.gsm
team/oej/strictrouting/sounds/demo-moreinfo.gsm
team/oej/strictrouting/sounds/demo-nogo.gsm
team/oej/strictrouting/sounds/demo-nomatch.gsm
team/oej/strictrouting/sounds/demo-thanks.gsm
team/oej/strictrouting/sounds/dictate/
team/oej/strictrouting/sounds/digits/
team/oej/strictrouting/sounds/dir-instr.gsm
team/oej/strictrouting/sounds/dir-intro-fn.gsm
team/oej/strictrouting/sounds/dir-intro.gsm
team/oej/strictrouting/sounds/dir-nomatch.gsm
team/oej/strictrouting/sounds/dir-nomore.gsm
team/oej/strictrouting/sounds/fpm-calm-river.mp3
team/oej/strictrouting/sounds/fpm-sunshine.mp3
team/oej/strictrouting/sounds/fpm-world-mix.mp3
team/oej/strictrouting/sounds/hello-world.gsm
team/oej/strictrouting/sounds/hours.gsm
team/oej/strictrouting/sounds/invalid.gsm
team/oej/strictrouting/sounds/letters/
team/oej/strictrouting/sounds/minutes.gsm
team/oej/strictrouting/sounds/pbx-invalid.gsm
team/oej/strictrouting/sounds/pbx-invalidpark.gsm
team/oej/strictrouting/sounds/pbx-transfer.gsm
team/oej/strictrouting/sounds/phonetic/
team/oej/strictrouting/sounds/priv-callee-options.gsm
team/oej/strictrouting/sounds/priv-callpending.gsm
team/oej/strictrouting/sounds/priv-introsaved.gsm
team/oej/strictrouting/sounds/priv-recordintro.gsm
team/oej/strictrouting/sounds/privacy-incorrect.gsm
team/oej/strictrouting/sounds/privacy-prompt.gsm
team/oej/strictrouting/sounds/privacy-thankyou.gsm
team/oej/strictrouting/sounds/privacy-unident.gsm
team/oej/strictrouting/sounds/queue-callswaiting.gsm
team/oej/strictrouting/sounds/queue-holdtime.gsm
team/oej/strictrouting/sounds/queue-less-than.gsm
team/oej/strictrouting/sounds/queue-minutes.gsm
team/oej/strictrouting/sounds/queue-periodic-announce.gsm
team/oej/strictrouting/sounds/queue-reporthold.gsm
team/oej/strictrouting/sounds/queue-seconds.gsm
team/oej/strictrouting/sounds/queue-thankyou.gsm
team/oej/strictrouting/sounds/queue-thereare.gsm
team/oej/strictrouting/sounds/queue-youarenext.gsm
team/oej/strictrouting/sounds/screen-callee-options.gsm
team/oej/strictrouting/sounds/seconds.gsm
team/oej/strictrouting/sounds/spy-agent.gsm
team/oej/strictrouting/sounds/spy-h323.gsm
team/oej/strictrouting/sounds/spy-iax.gsm
team/oej/strictrouting/sounds/spy-iax2.gsm
team/oej/strictrouting/sounds/spy-mgcp.gsm
team/oej/strictrouting/sounds/spy-sip.gsm
team/oej/strictrouting/sounds/spy-skinny.gsm
team/oej/strictrouting/sounds/spy-zap.gsm
team/oej/strictrouting/sounds/ss-noservice.gsm
team/oej/strictrouting/sounds/transfer.gsm
team/oej/strictrouting/sounds/tt-allbusy.gsm
team/oej/strictrouting/sounds/tt-monkeys.gsm
team/oej/strictrouting/sounds/tt-monkeysintro.gsm
team/oej/strictrouting/sounds/tt-somethingwrong.gsm
team/oej/strictrouting/sounds/tt-weasels.gsm
team/oej/strictrouting/sounds/vm-Cust1.gsm
team/oej/strictrouting/sounds/vm-Cust2.gsm
team/oej/strictrouting/sounds/vm-Cust3.gsm
team/oej/strictrouting/sounds/vm-Cust4.gsm
team/oej/strictrouting/sounds/vm-Cust5.gsm
team/oej/strictrouting/sounds/vm-Family.gsm
team/oej/strictrouting/sounds/vm-Friends.gsm
team/oej/strictrouting/sounds/vm-INBOX.gsm
team/oej/strictrouting/sounds/vm-Old.gsm
team/oej/strictrouting/sounds/vm-Work.gsm
team/oej/strictrouting/sounds/vm-advopts.gsm
team/oej/strictrouting/sounds/vm-and.gsm
team/oej/strictrouting/sounds/vm-calldiffnum.gsm
team/oej/strictrouting/sounds/vm-changeto.gsm
team/oej/strictrouting/sounds/vm-delete.gsm
team/oej/strictrouting/sounds/vm-deleted.gsm
team/oej/strictrouting/sounds/vm-dialout.gsm
team/oej/strictrouting/sounds/vm-enter-num-to-call.gsm
team/oej/strictrouting/sounds/vm-extension.gsm
team/oej/strictrouting/sounds/vm-first.gsm
team/oej/strictrouting/sounds/vm-for.gsm
team/oej/strictrouting/sounds/vm-forward.gsm
team/oej/strictrouting/sounds/vm-forwardoptions.gsm
team/oej/strictrouting/sounds/vm-from-extension.gsm
team/oej/strictrouting/sounds/vm-from-phonenumber.gsm
team/oej/strictrouting/sounds/vm-from.gsm
team/oej/strictrouting/sounds/vm-goodbye.gsm
team/oej/strictrouting/sounds/vm-helpexit.gsm
team/oej/strictrouting/sounds/vm-incorrect-mailbox.gsm
team/oej/strictrouting/sounds/vm-incorrect.gsm
team/oej/strictrouting/sounds/vm-instructions.gsm
team/oej/strictrouting/sounds/vm-intro.gsm
team/oej/strictrouting/sounds/vm-isonphone.gsm
team/oej/strictrouting/sounds/vm-isunavail.gsm
team/oej/strictrouting/sounds/vm-last.gsm
team/oej/strictrouting/sounds/vm-leavemsg.gsm
team/oej/strictrouting/sounds/vm-login.gsm
team/oej/strictrouting/sounds/vm-mailboxfull.gsm
team/oej/strictrouting/sounds/vm-message.gsm
team/oej/strictrouting/sounds/vm-messages.gsm
team/oej/strictrouting/sounds/vm-minutes.gsm
team/oej/strictrouting/sounds/vm-mismatch.gsm
team/oej/strictrouting/sounds/vm-msginstruct.gsm
team/oej/strictrouting/sounds/vm-msgsaved.gsm
team/oej/strictrouting/sounds/vm-newpassword.gsm
team/oej/strictrouting/sounds/vm-newuser.gsm
team/oej/strictrouting/sounds/vm-next.gsm
team/oej/strictrouting/sounds/vm-no.gsm
team/oej/strictrouting/sounds/vm-nobodyavail.gsm
team/oej/strictrouting/sounds/vm-nobox.gsm
team/oej/strictrouting/sounds/vm-nomore.gsm
team/oej/strictrouting/sounds/vm-nonumber.gsm
team/oej/strictrouting/sounds/vm-num-i-have.gsm
team/oej/strictrouting/sounds/vm-onefor.gsm
team/oej/strictrouting/sounds/vm-options.gsm
team/oej/strictrouting/sounds/vm-opts.gsm
team/oej/strictrouting/sounds/vm-passchanged.gsm
team/oej/strictrouting/sounds/vm-password.gsm
team/oej/strictrouting/sounds/vm-press.gsm
team/oej/strictrouting/sounds/vm-prev.gsm
team/oej/strictrouting/sounds/vm-reachoper.gsm
team/oej/strictrouting/sounds/vm-rec-busy.gsm
team/oej/strictrouting/sounds/vm-rec-name.gsm
team/oej/strictrouting/sounds/vm-rec-temp.gsm
team/oej/strictrouting/sounds/vm-rec-unv.gsm
team/oej/strictrouting/sounds/vm-received.gsm
team/oej/strictrouting/sounds/vm-reenterpassword.gsm
team/oej/strictrouting/sounds/vm-repeat.gsm
team/oej/strictrouting/sounds/vm-review.gsm
team/oej/strictrouting/sounds/vm-saved.gsm
team/oej/strictrouting/sounds/vm-savedto.gsm
team/oej/strictrouting/sounds/vm-savefolder.gsm
team/oej/strictrouting/sounds/vm-savemessage.gsm
team/oej/strictrouting/sounds/vm-saveoper.gsm
team/oej/strictrouting/sounds/vm-sorry.gsm
team/oej/strictrouting/sounds/vm-star-cancel.gsm
team/oej/strictrouting/sounds/vm-starmain.gsm
team/oej/strictrouting/sounds/vm-tempgreetactive.gsm
team/oej/strictrouting/sounds/vm-tempgreeting.gsm
team/oej/strictrouting/sounds/vm-tempgreeting2.gsm
team/oej/strictrouting/sounds/vm-tempremoved.gsm
team/oej/strictrouting/sounds/vm-then-pound.gsm
team/oej/strictrouting/sounds/vm-theperson.gsm
team/oej/strictrouting/sounds/vm-tocallback.gsm
team/oej/strictrouting/sounds/vm-tocallnum.gsm
team/oej/strictrouting/sounds/vm-tocancel.gsm
team/oej/strictrouting/sounds/vm-tocancelmsg.gsm
team/oej/strictrouting/sounds/vm-toenternumber.gsm
team/oej/strictrouting/sounds/vm-toforward.gsm
team/oej/strictrouting/sounds/vm-tohearenv.gsm
team/oej/strictrouting/sounds/vm-tomakecall.gsm
team/oej/strictrouting/sounds/vm-tooshort.gsm
team/oej/strictrouting/sounds/vm-toreply.gsm
team/oej/strictrouting/sounds/vm-torerecord.gsm
team/oej/strictrouting/sounds/vm-undelete.gsm
team/oej/strictrouting/sounds/vm-undeleted.gsm
team/oej/strictrouting/sounds/vm-unknown-caller.gsm
team/oej/strictrouting/sounds/vm-whichbox.gsm
team/oej/strictrouting/sounds/vm-youhave.gsm
Modified:
team/oej/strictrouting/ (props changed)
team/oej/strictrouting/.cleancount
team/oej/strictrouting/CREDITS
team/oej/strictrouting/Makefile
team/oej/strictrouting/UPGRADE.txt
team/oej/strictrouting/acl.c
team/oej/strictrouting/aclocal.m4
team/oej/strictrouting/agi/Makefile
team/oej/strictrouting/app.c
team/oej/strictrouting/apps/Makefile
team/oej/strictrouting/apps/app_adsiprog.c
team/oej/strictrouting/apps/app_alarmreceiver.c
team/oej/strictrouting/apps/app_amd.c
team/oej/strictrouting/apps/app_authenticate.c
team/oej/strictrouting/apps/app_cdr.c
team/oej/strictrouting/apps/app_chanisavail.c
team/oej/strictrouting/apps/app_channelredirect.c
team/oej/strictrouting/apps/app_chanspy.c
team/oej/strictrouting/apps/app_controlplayback.c
team/oej/strictrouting/apps/app_db.c
team/oej/strictrouting/apps/app_dial.c
team/oej/strictrouting/apps/app_dictate.c
team/oej/strictrouting/apps/app_directed_pickup.c
team/oej/strictrouting/apps/app_directory.c
team/oej/strictrouting/apps/app_disa.c
team/oej/strictrouting/apps/app_dumpchan.c
team/oej/strictrouting/apps/app_echo.c
team/oej/strictrouting/apps/app_exec.c
team/oej/strictrouting/apps/app_externalivr.c
team/oej/strictrouting/apps/app_festival.c
team/oej/strictrouting/apps/app_flash.c
team/oej/strictrouting/apps/app_forkcdr.c
team/oej/strictrouting/apps/app_getcpeid.c
team/oej/strictrouting/apps/app_hasnewvoicemail.c
team/oej/strictrouting/apps/app_ices.c
team/oej/strictrouting/apps/app_image.c
team/oej/strictrouting/apps/app_ivrdemo.c
team/oej/strictrouting/apps/app_lookupblacklist.c
team/oej/strictrouting/apps/app_lookupcidname.c
team/oej/strictrouting/apps/app_macro.c
team/oej/strictrouting/apps/app_meetme.c
team/oej/strictrouting/apps/app_milliwatt.c
team/oej/strictrouting/apps/app_mixmonitor.c
team/oej/strictrouting/apps/app_morsecode.c
team/oej/strictrouting/apps/app_mp3.c
team/oej/strictrouting/apps/app_nbscat.c
team/oej/strictrouting/apps/app_osplookup.c
team/oej/strictrouting/apps/app_page.c
team/oej/strictrouting/apps/app_parkandannounce.c
team/oej/strictrouting/apps/app_playback.c
team/oej/strictrouting/apps/app_privacy.c
team/oej/strictrouting/apps/app_queue.c
team/oej/strictrouting/apps/app_random.c
team/oej/strictrouting/apps/app_read.c
team/oej/strictrouting/apps/app_readfile.c
team/oej/strictrouting/apps/app_realtime.c
team/oej/strictrouting/apps/app_record.c
team/oej/strictrouting/apps/app_rpt.c
team/oej/strictrouting/apps/app_sayunixtime.c
team/oej/strictrouting/apps/app_senddtmf.c
team/oej/strictrouting/apps/app_sendtext.c
team/oej/strictrouting/apps/app_setcallerid.c
team/oej/strictrouting/apps/app_setcdruserfield.c
team/oej/strictrouting/apps/app_settransfercapability.c
team/oej/strictrouting/apps/app_skel.c
team/oej/strictrouting/apps/app_sms.c
team/oej/strictrouting/apps/app_softhangup.c
team/oej/strictrouting/apps/app_speech_utils.c
team/oej/strictrouting/apps/app_stack.c
team/oej/strictrouting/apps/app_system.c
team/oej/strictrouting/apps/app_talkdetect.c
team/oej/strictrouting/apps/app_test.c
team/oej/strictrouting/apps/app_transfer.c
team/oej/strictrouting/apps/app_url.c
team/oej/strictrouting/apps/app_userevent.c
team/oej/strictrouting/apps/app_verbose.c
team/oej/strictrouting/apps/app_voicemail.c
team/oej/strictrouting/apps/app_waitforring.c
team/oej/strictrouting/apps/app_waitforsilence.c
team/oej/strictrouting/apps/app_while.c
team/oej/strictrouting/apps/app_zapateller.c
team/oej/strictrouting/apps/app_zapbarge.c
team/oej/strictrouting/apps/app_zapras.c
team/oej/strictrouting/apps/app_zapscan.c
team/oej/strictrouting/ast_expr2.c
team/oej/strictrouting/ast_expr2.fl
team/oej/strictrouting/ast_expr2.h
team/oej/strictrouting/ast_expr2.y
team/oej/strictrouting/ast_expr2f.c
team/oej/strictrouting/asterisk.8
team/oej/strictrouting/asterisk.c
team/oej/strictrouting/astmm.c
team/oej/strictrouting/autoservice.c
team/oej/strictrouting/build_tools/cflags.xml
team/oej/strictrouting/build_tools/menuselect-deps.in
team/oej/strictrouting/build_tools/prep_moduledeps
team/oej/strictrouting/callerid.c
team/oej/strictrouting/cdr.c
team/oej/strictrouting/cdr/Makefile
team/oej/strictrouting/cdr/cdr_csv.c
team/oej/strictrouting/cdr/cdr_custom.c
team/oej/strictrouting/cdr/cdr_manager.c
team/oej/strictrouting/cdr/cdr_odbc.c
team/oej/strictrouting/cdr/cdr_pgsql.c
team/oej/strictrouting/cdr/cdr_radius.c
team/oej/strictrouting/cdr/cdr_sqlite.c
team/oej/strictrouting/cdr/cdr_tds.c
team/oej/strictrouting/channel.c
team/oej/strictrouting/channels/Makefile
team/oej/strictrouting/channels/chan_agent.c
team/oej/strictrouting/channels/chan_alsa.c
team/oej/strictrouting/channels/chan_features.c
team/oej/strictrouting/channels/chan_h323.c
team/oej/strictrouting/channels/chan_iax2.c
team/oej/strictrouting/channels/chan_jingle.c
team/oej/strictrouting/channels/chan_local.c
team/oej/strictrouting/channels/chan_mgcp.c
team/oej/strictrouting/channels/chan_misdn.c
team/oej/strictrouting/channels/chan_nbs.c
team/oej/strictrouting/channels/chan_oss.c
team/oej/strictrouting/channels/chan_phone.c
team/oej/strictrouting/channels/chan_sip.c
team/oej/strictrouting/channels/chan_skinny.c
team/oej/strictrouting/channels/chan_vpb.c
team/oej/strictrouting/channels/chan_zap.c
team/oej/strictrouting/channels/h323/Makefile
team/oej/strictrouting/channels/h323/h323.conf.sample
team/oej/strictrouting/channels/iax2-parser.c
team/oej/strictrouting/channels/iax2-provision.c
team/oej/strictrouting/channels/misdn/chan_misdn_config.h
team/oej/strictrouting/channels/misdn/ie.c
team/oej/strictrouting/channels/misdn/isdn_lib.c
team/oej/strictrouting/channels/misdn/isdn_lib.h
team/oej/strictrouting/channels/misdn/isdn_msg_parser.c
team/oej/strictrouting/channels/misdn_config.c
team/oej/strictrouting/chanvars.c
team/oej/strictrouting/cli.c
team/oej/strictrouting/codecs/Makefile
team/oej/strictrouting/codecs/codec_a_mu.c
team/oej/strictrouting/codecs/codec_adpcm.c
team/oej/strictrouting/codecs/codec_alaw.c
team/oej/strictrouting/codecs/codec_g723_1.c
team/oej/strictrouting/codecs/codec_g726.c
team/oej/strictrouting/codecs/codec_gsm.c
team/oej/strictrouting/codecs/codec_ilbc.c
team/oej/strictrouting/codecs/codec_lpc10.c
team/oej/strictrouting/codecs/codec_speex.c
team/oej/strictrouting/codecs/codec_ulaw.c
team/oej/strictrouting/codecs/gsm/Makefile
team/oej/strictrouting/codecs/gsm/src/preprocess.c
team/oej/strictrouting/codecs/lpc10/lpc10.h
team/oej/strictrouting/codecs/lpc10/lpcini.c
team/oej/strictrouting/config.c
team/oej/strictrouting/configs/alsa.conf.sample
team/oej/strictrouting/configs/extensions.conf.sample
team/oej/strictrouting/configs/iax.conf.sample
team/oej/strictrouting/configs/indications.conf.sample
team/oej/strictrouting/configs/jabber.conf.sample
team/oej/strictrouting/configs/mgcp.conf.sample
team/oej/strictrouting/configs/misdn.conf.sample
team/oej/strictrouting/configs/musiconhold.conf.sample
team/oej/strictrouting/configs/oss.conf.sample
team/oej/strictrouting/configs/queues.conf.sample
team/oej/strictrouting/configs/rtp.conf.sample
team/oej/strictrouting/configs/sip.conf.sample
team/oej/strictrouting/configs/skinny.conf.sample
team/oej/strictrouting/configs/voicemail.conf.sample
team/oej/strictrouting/configs/zapata.conf.sample
team/oej/strictrouting/configure
team/oej/strictrouting/configure.ac
team/oej/strictrouting/cryptostub.c
team/oej/strictrouting/db.c
team/oej/strictrouting/db1-ast/Makefile
team/oej/strictrouting/devicestate.c
team/oej/strictrouting/dns.c
team/oej/strictrouting/dnsmgr.c
team/oej/strictrouting/doc/ (props changed)
team/oej/strictrouting/doc/ael.txt
team/oej/strictrouting/doc/asterisk-conf.txt
team/oej/strictrouting/doc/channelvariables.txt
team/oej/strictrouting/doc/extconfig.txt
team/oej/strictrouting/doc/radius.txt
team/oej/strictrouting/doc/realtime.txt
team/oej/strictrouting/doc/smdi.txt
team/oej/strictrouting/doc/speechrec.txt
team/oej/strictrouting/doc/video.txt
team/oej/strictrouting/dsp.c
team/oej/strictrouting/enum.c
team/oej/strictrouting/file.c
team/oej/strictrouting/formats/Makefile
team/oej/strictrouting/formats/format_g723.c
team/oej/strictrouting/formats/format_g726.c
team/oej/strictrouting/formats/format_g729.c
team/oej/strictrouting/formats/format_gsm.c
team/oej/strictrouting/formats/format_h263.c
team/oej/strictrouting/formats/format_h264.c
team/oej/strictrouting/formats/format_ilbc.c
team/oej/strictrouting/formats/format_jpeg.c
team/oej/strictrouting/formats/format_ogg_vorbis.c
team/oej/strictrouting/formats/format_pcm.c
team/oej/strictrouting/formats/format_sln.c
team/oej/strictrouting/formats/format_vox.c
team/oej/strictrouting/formats/format_wav.c
team/oej/strictrouting/formats/format_wav_gsm.c
team/oej/strictrouting/frame.c
team/oej/strictrouting/fskmodem.c
team/oej/strictrouting/funcs/Makefile
team/oej/strictrouting/funcs/func_base64.c
team/oej/strictrouting/funcs/func_callerid.c
team/oej/strictrouting/funcs/func_cdr.c
team/oej/strictrouting/funcs/func_channel.c
team/oej/strictrouting/funcs/func_curl.c
team/oej/strictrouting/funcs/func_cut.c
team/oej/strictrouting/funcs/func_db.c
team/oej/strictrouting/funcs/func_enum.c
team/oej/strictrouting/funcs/func_env.c
team/oej/strictrouting/funcs/func_groupcount.c
team/oej/strictrouting/funcs/func_language.c
team/oej/strictrouting/funcs/func_logic.c
team/oej/strictrouting/funcs/func_math.c
team/oej/strictrouting/funcs/func_md5.c
team/oej/strictrouting/funcs/func_moh.c
team/oej/strictrouting/funcs/func_odbc.c
team/oej/strictrouting/funcs/func_rand.c
team/oej/strictrouting/funcs/func_realtime.c
team/oej/strictrouting/funcs/func_sha1.c
team/oej/strictrouting/funcs/func_strings.c
team/oej/strictrouting/funcs/func_timeout.c
team/oej/strictrouting/funcs/func_uri.c
team/oej/strictrouting/http.c
team/oej/strictrouting/image.c
team/oej/strictrouting/include/ (props changed)
team/oej/strictrouting/include/asterisk/ (props changed)
team/oej/strictrouting/include/asterisk.h
team/oej/strictrouting/include/asterisk/ael_structs.h
team/oej/strictrouting/include/asterisk/alaw.h
team/oej/strictrouting/include/asterisk/app.h
team/oej/strictrouting/include/asterisk/astmm.h
team/oej/strictrouting/include/asterisk/callerid.h
team/oej/strictrouting/include/asterisk/channel.h
team/oej/strictrouting/include/asterisk/chanspy.h
team/oej/strictrouting/include/asterisk/compat.h
team/oej/strictrouting/include/asterisk/devicestate.h
team/oej/strictrouting/include/asterisk/dnsmgr.h
team/oej/strictrouting/include/asterisk/doxyref.h
team/oej/strictrouting/include/asterisk/endian.h
team/oej/strictrouting/include/asterisk/file.h
team/oej/strictrouting/include/asterisk/frame.h
team/oej/strictrouting/include/asterisk/jabber.h
team/oej/strictrouting/include/asterisk/linkedlists.h
team/oej/strictrouting/include/asterisk/lock.h
team/oej/strictrouting/include/asterisk/logger.h
team/oej/strictrouting/include/asterisk/options.h
team/oej/strictrouting/include/asterisk/plc.h
team/oej/strictrouting/include/asterisk/rtp.h
team/oej/strictrouting/include/asterisk/stringfields.h
team/oej/strictrouting/include/asterisk/translate.h
team/oej/strictrouting/include/asterisk/udptl.h
team/oej/strictrouting/include/asterisk/ulaw.h
team/oej/strictrouting/include/asterisk/utils.h
team/oej/strictrouting/indications.c
team/oej/strictrouting/io.c
team/oej/strictrouting/jitterbuf.c
team/oej/strictrouting/loader.c
team/oej/strictrouting/logger.c
team/oej/strictrouting/makeopts.in
team/oej/strictrouting/manager.c
team/oej/strictrouting/md5.c
team/oej/strictrouting/netsock.c
team/oej/strictrouting/pbx.c
team/oej/strictrouting/pbx/Makefile
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test1
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test2
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test3
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test4
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test5
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test6
team/oej/strictrouting/pbx/ael/ael-test/ref.ael-test7
team/oej/strictrouting/pbx/ael/ael.flex
team/oej/strictrouting/pbx/ael/ael.tab.c
team/oej/strictrouting/pbx/ael/ael.tab.h
team/oej/strictrouting/pbx/ael/ael.y
team/oej/strictrouting/pbx/ael/ael_lex.c
team/oej/strictrouting/pbx/dundi-parser.c
team/oej/strictrouting/pbx/pbx_ael.c
team/oej/strictrouting/pbx/pbx_config.c
team/oej/strictrouting/pbx/pbx_dundi.c
team/oej/strictrouting/pbx/pbx_gtkconsole.c
team/oej/strictrouting/pbx/pbx_loopback.c
team/oej/strictrouting/pbx/pbx_realtime.c
team/oej/strictrouting/pbx/pbx_spool.c
team/oej/strictrouting/plc.c
team/oej/strictrouting/privacy.c
team/oej/strictrouting/res/Makefile
team/oej/strictrouting/res/res_adsi.c
team/oej/strictrouting/res/res_agi.c
team/oej/strictrouting/res/res_clioriginate.c
team/oej/strictrouting/res/res_config_odbc.c
team/oej/strictrouting/res/res_config_pgsql.c
team/oej/strictrouting/res/res_convert.c
team/oej/strictrouting/res/res_crypto.c
team/oej/strictrouting/res/res_features.c
team/oej/strictrouting/res/res_indications.c
team/oej/strictrouting/res/res_jabber.c
team/oej/strictrouting/res/res_monitor.c
team/oej/strictrouting/res/res_musiconhold.c
team/oej/strictrouting/res/res_odbc.c
team/oej/strictrouting/res/res_osp.c
team/oej/strictrouting/res/res_smdi.c
team/oej/strictrouting/res/res_snmp.c
team/oej/strictrouting/res/res_speech.c
team/oej/strictrouting/res/snmp/agent.c
team/oej/strictrouting/rtp.c
team/oej/strictrouting/sample.call
team/oej/strictrouting/say.c
team/oej/strictrouting/sched.c
team/oej/strictrouting/slinfactory.c
team/oej/strictrouting/sounds/ (props changed)
team/oej/strictrouting/sounds.txt
team/oej/strictrouting/srv.c
team/oej/strictrouting/stdtime/localtime.c
team/oej/strictrouting/strcompat.c
team/oej/strictrouting/tdd.c
team/oej/strictrouting/term.c
team/oej/strictrouting/translate.c
team/oej/strictrouting/udptl.c
team/oej/strictrouting/utils.c
team/oej/strictrouting/utils/Makefile
team/oej/strictrouting/utils/ael_main.c
team/oej/strictrouting/utils/astman.c
team/oej/strictrouting/utils/smsq.c
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Jun 27 16:13:12 2006
@@ -1,0 +1,2 @@
+menuselect http://svn.digium.com/svn/menuselect/trunk
+mxml http://svn.digium.com/svn/mxml/trunk
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 27 16:13:12 2006
@@ -16,6 +16,7 @@
testexpr2
makeopts
menuselect.makeopts
+menuselect.makedeps
config.status
config.log
makeopts.xml
Propchange: team/oej/strictrouting/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 27 16:13:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-30060
+/trunk:1-36180
Modified: team/oej/strictrouting/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/.cleancount?rev=36184&r1=36183&r2=36184&view=diff
==============================================================================
--- team/oej/strictrouting/.cleancount (original)
+++ team/oej/strictrouting/.cleancount Tue Jun 27 16:13:12 2006
@@ -1,1 +1,1 @@
-17
+19
Modified: team/oej/strictrouting/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/CREDITS?rev=36184&r1=36183&r2=36184&view=diff
==============================================================================
--- team/oej/strictrouting/CREDITS (original)
+++ team/oej/strictrouting/CREDITS Tue Jun 27 16:13:12 2006
@@ -27,60 +27,110 @@
* 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 1.0 maintainer and misc. enhancements
russelb at clemson.edu
+
Anthony Minessale II - Countless big and small fixes, and relentless forward push
anthmct at yahoo.com http://www.asterlink.com
+
James Golovich - Innumerable contributions
You can find him and asterisk-perl at http://asterisk.gnuinter.net
+
Andre Bierwirth - Extension hints and status
+
Oliver Daudey - ISDN4Linux fixes
+
Pauline Middelink - ISDN4Linux patches and some general patches.
She can be found at http://www.polyware.nl/~middelink/En/
+
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, Random, SayUnixTime, HasNewVoicemail applications;
CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, QUEUEAGENT* functions;
and other innumerable bug fixes. 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
+
Brian West - ODBC support and Bug Marshaling
+
Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
and Bug Marshalling. - 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, testing
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
+
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 A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+
+Philippe Sultan - RADIUS CDR module
+ INRIA, http://www.inria.fr/
+
+John Martin, Aupix - Improved video support in the SIP channel
+
+Steve Underwood - Provided T.38 pass through support.
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/oej/strictrouting/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/strictrouting/Makefile?rev=36184&r1=36183&r2=36184&view=diff
==============================================================================
--- team/oej/strictrouting/Makefile (original)
+++ team/oej/strictrouting/Makefile Tue Jun 27 16:13:12 2006
@@ -36,22 +36,6 @@
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
- # Stack backtraces, while useful for debugging, are incompatible with optimizations
- ifeq (${OSARCH},Linux)
- CFLAGS+=-DSTACK_BACKTRACES
- endif
-endif
# Overwite config files on "make samples"
OVERWRITE=y
@@ -95,14 +79,18 @@
else
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
ASTHEADERDIR=$(includedir)/asterisk
ASTBINDIR=$(bindir)
ASTSBINDIR=$(sbindir)
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
+ifeq ($(OSARCH),FreeBSD)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+else
+ ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+endif
endif
ASTDATADIR?=$(ASTVARLIBDIR)
@@ -133,15 +121,32 @@
ifneq ($(wildcard menuselect.makeopts),)
include menuselect.makeopts
+ include menuselect.makedeps
endif
ifneq ($(wildcard makeopts),)
include makeopts
endif
-TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
-OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions. This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.
+#K6OPT = -DK6OPT
+
+# Tell gcc to optimize the code
+OPTIMIZE+=-O6
+else
+ # Stack backtraces, while useful for debugging, are incompatible with optimizations
+ ifeq ($(OSARCH),Linux)
+ CFLAGS+=-DSTACK_BACKTRACES
+ endif
+endif
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
@@ -183,7 +188,6 @@
endif
endif
endif
- MPG123TARG=linux
endif
GREP=grep
@@ -196,7 +200,9 @@
endif
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifneq ($(OPTIMIZE),)
ASTCFLAGS+=$(OPTIMIZE)
+endif
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
@@ -223,15 +229,10 @@
BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
- endif
- MPG123TARG=freebsd
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
- MPG123TARG=netbsd
endif
ifeq ($(OSARCH),OpenBSD)
@@ -253,22 +254,22 @@
RPMVERSION=unknown
endif
-# CVS mirrors of SVN have .svnrevision files showing
-# which SVN revision they are based on, and .svnbranch
-# showing the branch they are made from
-ifneq ($(wildcard .svnrevision),)
+ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
-else
- ifneq ($(wildcard .svn),)
- ASTERISKVERSIONNUM=999999
- endif
endif
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS=res channels pbx apps codecs formats cdr funcs
-OTHER_SUBDIRS=utils stdtime agi
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
+SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
+SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
+MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
+OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
+SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
@@ -278,7 +279,7 @@
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
- cryptostub.o sha1.o http.o
+ cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o
# we need to link in the objects statically, not as a library, because
# otherwise modules will not have them available if none of the static
@@ -300,9 +301,9 @@
endif
ifeq ($(OSARCH),Linux)
- LIBS+=-ldl -lpthread $(EDITLINE_LIBS) -lm -lresolv #-lnjamd
+ LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv #-lnjamd
else
- LIBS+=$(EDITLINE_LIBS) -lm
+ LIBS+=$(EDITLINE_LIB) -lm
endif
ifeq ($(OSARCH),Darwin)
[... 61635 lines stripped ...]
More information about the svn-commits
mailing list