[asterisk-commits] branch oej/bug2617 r9146 - in /team/oej/bug2617:
./ apps/ build_tools/ cdr/ c...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 4 04:41:25 MST 2006
Author: oej
Date: Sat Feb 4 05:38:12 2006
New Revision: 9146
URL: http://svn.digium.com/view/asterisk?rev=9146&view=rev
Log:
Updates
Added:
team/oej/bug2617/channels/misdn/mISDN.patch
- copied unchanged from r7871, branches/1.2/channels/misdn/mISDN.patch
team/oej/bug2617/channels/misdn/mISDNuser.patch
- copied unchanged from r7871, branches/1.2/channels/misdn/mISDNuser.patch
Removed:
team/oej/bug2617/ast_expr.y
Modified:
team/oej/bug2617/ (props changed)
team/oej/bug2617/Makefile
team/oej/bug2617/app.c
team/oej/bug2617/apps/app_chanspy.c
team/oej/bug2617/apps/app_cut.c
team/oej/bug2617/apps/app_dial.c
team/oej/bug2617/apps/app_directed_pickup.c
team/oej/bug2617/apps/app_externalivr.c
team/oej/bug2617/apps/app_hasnewvoicemail.c
team/oej/bug2617/apps/app_meetme.c
team/oej/bug2617/apps/app_mixmonitor.c
team/oej/bug2617/apps/app_privacy.c
team/oej/bug2617/apps/app_queue.c
team/oej/bug2617/apps/app_sms.c
team/oej/bug2617/apps/app_stack.c
team/oej/bug2617/apps/app_voicemail.c
team/oej/bug2617/apps/app_waitforsilence.c
team/oej/bug2617/ast_expr2.fl
team/oej/bug2617/ast_expr2f.c
team/oej/bug2617/asterisk.c
team/oej/bug2617/build_tools/make_svn_branch_name
team/oej/bug2617/cdr.c
team/oej/bug2617/cdr/cdr_tds.c
team/oej/bug2617/channel.c
team/oej/bug2617/channels/Makefile
team/oej/bug2617/channels/chan_agent.c
team/oej/bug2617/channels/chan_alsa.c
team/oej/bug2617/channels/chan_iax2.c
team/oej/bug2617/channels/chan_misdn.c
team/oej/bug2617/channels/chan_misdn_config.c
team/oej/bug2617/channels/chan_sip.c
team/oej/bug2617/channels/chan_zap.c
team/oej/bug2617/channels/misdn/Makefile
team/oej/bug2617/channels/misdn/chan_misdn_config.h
team/oej/bug2617/channels/misdn/ie.c
team/oej/bug2617/channels/misdn/isdn_lib.c
team/oej/bug2617/channels/misdn/isdn_lib.h
team/oej/bug2617/channels/misdn/isdn_lib_intern.h
team/oej/bug2617/channels/misdn/isdn_msg_parser.c
team/oej/bug2617/cli.c
team/oej/bug2617/config.c
team/oej/bug2617/configs/res_odbc.conf.sample
team/oej/bug2617/configs/sip.conf.sample
team/oej/bug2617/contrib/firmware/iax/iaxy.bin (contents, props changed)
team/oej/bug2617/contrib/init.d/rc.debian.asterisk (props changed)
team/oej/bug2617/contrib/init.d/rc.gentoo.asterisk (props changed)
team/oej/bug2617/contrib/init.d/rc.mandrake.asterisk (contents, props changed)
team/oej/bug2617/contrib/init.d/rc.mandrake.zaptel (props changed)
team/oej/bug2617/contrib/init.d/rc.redhat.asterisk (props changed)
team/oej/bug2617/contrib/init.d/rc.slackware.asterisk (props changed)
team/oej/bug2617/doc/README.ael
team/oej/bug2617/doc/README.misdn
team/oej/bug2617/doc/README.variables
team/oej/bug2617/file.c
team/oej/bug2617/formats/format_pcm.c
team/oej/bug2617/formats/format_pcm_alaw.c
team/oej/bug2617/funcs/func_moh.c
team/oej/bug2617/include/asterisk/chanspy.h
team/oej/bug2617/include/asterisk/linkedlists.h
team/oej/bug2617/include/asterisk/strings.h
team/oej/bug2617/manager.c
team/oej/bug2617/pbx.c
team/oej/bug2617/pbx/pbx_ael.c
team/oej/bug2617/pbx/pbx_config.c
team/oej/bug2617/pbx/pbx_dundi.c
team/oej/bug2617/pbx/pbx_spool.c
team/oej/bug2617/res/res_agi.c
team/oej/bug2617/res/res_features.c
team/oej/bug2617/res/res_monitor.c
team/oej/bug2617/sounds/agent-alreadyon.gsm (props changed)
team/oej/bug2617/sounds/agent-incorrect.gsm (props changed)
team/oej/bug2617/sounds/agent-loggedoff.gsm (props changed)
team/oej/bug2617/sounds/agent-loginok.gsm (props changed)
team/oej/bug2617/sounds/agent-newlocation.gsm (props changed)
team/oej/bug2617/sounds/agent-pass.gsm (props changed)
team/oej/bug2617/sounds/agent-user.gsm (props changed)
team/oej/bug2617/sounds/auth-incorrect.gsm (props changed)
team/oej/bug2617/sounds/auth-thankyou.gsm (props changed)
team/oej/bug2617/sounds/beep.gsm (props changed)
team/oej/bug2617/sounds/beeperr.gsm (props changed)
team/oej/bug2617/sounds/conf-adminmenu.gsm (props changed)
team/oej/bug2617/sounds/conf-enteringno.gsm (props changed)
team/oej/bug2617/sounds/conf-errormenu.gsm (props changed)
team/oej/bug2617/sounds/conf-getchannel.gsm (props changed)
team/oej/bug2617/sounds/conf-getconfno.gsm (props changed)
team/oej/bug2617/sounds/conf-getpin.gsm (props changed)
team/oej/bug2617/sounds/conf-hasjoin.gsm (props changed)
team/oej/bug2617/sounds/conf-hasleft.gsm (props changed)
team/oej/bug2617/sounds/conf-invalid.gsm (props changed)
team/oej/bug2617/sounds/conf-invalidpin.gsm (props changed)
team/oej/bug2617/sounds/conf-kicked.gsm (props changed)
team/oej/bug2617/sounds/conf-leaderhasleft.gsm (props changed)
team/oej/bug2617/sounds/conf-locked.gsm (props changed)
team/oej/bug2617/sounds/conf-lockednow.gsm (props changed)
team/oej/bug2617/sounds/conf-muted.gsm (props changed)
team/oej/bug2617/sounds/conf-noempty.gsm (props changed)
team/oej/bug2617/sounds/conf-onlyone.gsm (props changed)
team/oej/bug2617/sounds/conf-onlyperson.gsm (props changed)
team/oej/bug2617/sounds/conf-otherinparty.gsm (props changed)
team/oej/bug2617/sounds/conf-placeintoconf.gsm (props changed)
team/oej/bug2617/sounds/conf-thereare.gsm (props changed)
team/oej/bug2617/sounds/conf-unlockednow.gsm (props changed)
team/oej/bug2617/sounds/conf-unmuted.gsm (props changed)
team/oej/bug2617/sounds/conf-usermenu.gsm (props changed)
team/oej/bug2617/sounds/conf-userswilljoin.gsm (props changed)
team/oej/bug2617/sounds/conf-userwilljoin.gsm (props changed)
team/oej/bug2617/sounds/conf-waitforleader.gsm (props changed)
team/oej/bug2617/sounds/demo-abouttotry.gsm (props changed)
team/oej/bug2617/sounds/demo-congrats.gsm (props changed)
team/oej/bug2617/sounds/demo-echodone.gsm (props changed)
team/oej/bug2617/sounds/demo-echotest.gsm (props changed)
team/oej/bug2617/sounds/demo-enterkeywords.gsm (props changed)
team/oej/bug2617/sounds/demo-instruct.gsm (props changed)
team/oej/bug2617/sounds/demo-moreinfo.gsm (props changed)
team/oej/bug2617/sounds/demo-nogo.gsm (props changed)
team/oej/bug2617/sounds/demo-nomatch.gsm (props changed)
team/oej/bug2617/sounds/demo-thanks.gsm (props changed)
team/oej/bug2617/sounds/dictate/both_help.gsm (props changed)
team/oej/bug2617/sounds/dictate/enter_filename.gsm (props changed)
team/oej/bug2617/sounds/dictate/forhelp.gsm (props changed)
team/oej/bug2617/sounds/dictate/pause.gsm (props changed)
team/oej/bug2617/sounds/dictate/paused.gsm (props changed)
team/oej/bug2617/sounds/dictate/play_help.gsm (props changed)
team/oej/bug2617/sounds/dictate/playback.gsm (props changed)
team/oej/bug2617/sounds/dictate/playback_mode.gsm (props changed)
team/oej/bug2617/sounds/dictate/record.gsm (props changed)
team/oej/bug2617/sounds/dictate/record_help.gsm (props changed)
team/oej/bug2617/sounds/dictate/record_mode.gsm (props changed)
team/oej/bug2617/sounds/dictate/truncating_audio.gsm (props changed)
team/oej/bug2617/sounds/digits/0.gsm (props changed)
team/oej/bug2617/sounds/digits/1.gsm (props changed)
team/oej/bug2617/sounds/digits/10.gsm (props changed)
team/oej/bug2617/sounds/digits/11.gsm (props changed)
team/oej/bug2617/sounds/digits/12.gsm (props changed)
team/oej/bug2617/sounds/digits/13.gsm (props changed)
team/oej/bug2617/sounds/digits/14.gsm (props changed)
team/oej/bug2617/sounds/digits/15.gsm (props changed)
team/oej/bug2617/sounds/digits/16.gsm (props changed)
team/oej/bug2617/sounds/digits/17.gsm (props changed)
team/oej/bug2617/sounds/digits/18.gsm (props changed)
team/oej/bug2617/sounds/digits/19.gsm (props changed)
team/oej/bug2617/sounds/digits/2.gsm (props changed)
team/oej/bug2617/sounds/digits/20.gsm (props changed)
team/oej/bug2617/sounds/digits/3.gsm (props changed)
team/oej/bug2617/sounds/digits/30.gsm (props changed)
team/oej/bug2617/sounds/digits/4.gsm (props changed)
team/oej/bug2617/sounds/digits/40.gsm (props changed)
team/oej/bug2617/sounds/digits/5.gsm (props changed)
team/oej/bug2617/sounds/digits/50.gsm (props changed)
team/oej/bug2617/sounds/digits/6.gsm (props changed)
team/oej/bug2617/sounds/digits/60.gsm (props changed)
team/oej/bug2617/sounds/digits/7.gsm (props changed)
team/oej/bug2617/sounds/digits/70.gsm (props changed)
team/oej/bug2617/sounds/digits/8.gsm (props changed)
team/oej/bug2617/sounds/digits/80.gsm (props changed)
team/oej/bug2617/sounds/digits/9.gsm (props changed)
team/oej/bug2617/sounds/digits/90.gsm (props changed)
team/oej/bug2617/sounds/digits/a-m.gsm (props changed)
team/oej/bug2617/sounds/digits/at.gsm (props changed)
team/oej/bug2617/sounds/digits/day-0.gsm (props changed)
team/oej/bug2617/sounds/digits/day-1.gsm (props changed)
team/oej/bug2617/sounds/digits/day-2.gsm (props changed)
team/oej/bug2617/sounds/digits/day-3.gsm (props changed)
team/oej/bug2617/sounds/digits/day-4.gsm (props changed)
team/oej/bug2617/sounds/digits/day-5.gsm (props changed)
team/oej/bug2617/sounds/digits/day-6.gsm (props changed)
team/oej/bug2617/sounds/digits/dollars.gsm (props changed)
team/oej/bug2617/sounds/digits/h-1.gsm (props changed)
team/oej/bug2617/sounds/digits/h-10.gsm (props changed)
team/oej/bug2617/sounds/digits/h-11.gsm (props changed)
team/oej/bug2617/sounds/digits/h-12.gsm (props changed)
team/oej/bug2617/sounds/digits/h-13.gsm (props changed)
team/oej/bug2617/sounds/digits/h-14.gsm (props changed)
team/oej/bug2617/sounds/digits/h-15.gsm (props changed)
team/oej/bug2617/sounds/digits/h-16.gsm (props changed)
team/oej/bug2617/sounds/digits/h-17.gsm (props changed)
team/oej/bug2617/sounds/digits/h-18.gsm (props changed)
team/oej/bug2617/sounds/digits/h-19.gsm (props changed)
team/oej/bug2617/sounds/digits/h-2.gsm (props changed)
team/oej/bug2617/sounds/digits/h-20.gsm (props changed)
team/oej/bug2617/sounds/digits/h-3.gsm (props changed)
team/oej/bug2617/sounds/digits/h-30.gsm (props changed)
team/oej/bug2617/sounds/digits/h-4.gsm (props changed)
team/oej/bug2617/sounds/digits/h-5.gsm (props changed)
team/oej/bug2617/sounds/digits/h-6.gsm (props changed)
team/oej/bug2617/sounds/digits/h-7.gsm (props changed)
team/oej/bug2617/sounds/digits/h-8.gsm (props changed)
team/oej/bug2617/sounds/digits/h-9.gsm (props changed)
team/oej/bug2617/sounds/digits/hundred.gsm (props changed)
team/oej/bug2617/sounds/digits/million.gsm (props changed)
team/oej/bug2617/sounds/digits/minus.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-0.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-1.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-10.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-11.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-2.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-3.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-4.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-5.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-6.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-7.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-8.gsm (props changed)
team/oej/bug2617/sounds/digits/mon-9.gsm (props changed)
team/oej/bug2617/sounds/digits/oclock.gsm (props changed)
team/oej/bug2617/sounds/digits/oh.gsm (props changed)
team/oej/bug2617/sounds/digits/p-m.gsm (props changed)
team/oej/bug2617/sounds/digits/pound.gsm (props changed)
team/oej/bug2617/sounds/digits/star.gsm (props changed)
team/oej/bug2617/sounds/digits/thousand.gsm (props changed)
team/oej/bug2617/sounds/digits/today.gsm (props changed)
team/oej/bug2617/sounds/digits/tomorrow.gsm (props changed)
team/oej/bug2617/sounds/digits/yesterday.gsm (props changed)
team/oej/bug2617/sounds/dir-instr.gsm (props changed)
team/oej/bug2617/sounds/dir-intro-fn.gsm (props changed)
team/oej/bug2617/sounds/dir-intro.gsm (props changed)
team/oej/bug2617/sounds/dir-nomatch.gsm (props changed)
team/oej/bug2617/sounds/dir-nomore.gsm (props changed)
team/oej/bug2617/sounds/fpm-calm-river.mp3 (props changed)
team/oej/bug2617/sounds/fpm-sunshine.mp3 (props changed)
team/oej/bug2617/sounds/fpm-world-mix.mp3 (props changed)
team/oej/bug2617/sounds/hello-world.gsm (props changed)
team/oej/bug2617/sounds/hours.gsm (props changed)
team/oej/bug2617/sounds/invalid.gsm (props changed)
team/oej/bug2617/sounds/letters/a.gsm (props changed)
team/oej/bug2617/sounds/letters/at.gsm (props changed)
team/oej/bug2617/sounds/letters/b.gsm (props changed)
team/oej/bug2617/sounds/letters/c.gsm (props changed)
team/oej/bug2617/sounds/letters/d.gsm (props changed)
team/oej/bug2617/sounds/letters/dash.gsm (props changed)
team/oej/bug2617/sounds/letters/dollar.gsm (props changed)
team/oej/bug2617/sounds/letters/dot.gsm (props changed)
team/oej/bug2617/sounds/letters/e.gsm (props changed)
team/oej/bug2617/sounds/letters/equals.gsm (props changed)
team/oej/bug2617/sounds/letters/exclaimation-point.gsm (props changed)
team/oej/bug2617/sounds/letters/f.gsm (props changed)
team/oej/bug2617/sounds/letters/g.gsm (props changed)
team/oej/bug2617/sounds/letters/h.gsm (props changed)
team/oej/bug2617/sounds/letters/i.gsm (props changed)
team/oej/bug2617/sounds/letters/j.gsm (props changed)
team/oej/bug2617/sounds/letters/k.gsm (props changed)
team/oej/bug2617/sounds/letters/l.gsm (props changed)
team/oej/bug2617/sounds/letters/m.gsm (props changed)
team/oej/bug2617/sounds/letters/n.gsm (props changed)
team/oej/bug2617/sounds/letters/o.gsm (props changed)
team/oej/bug2617/sounds/letters/p.gsm (props changed)
team/oej/bug2617/sounds/letters/plus.gsm (props changed)
team/oej/bug2617/sounds/letters/q.gsm (props changed)
team/oej/bug2617/sounds/letters/r.gsm (props changed)
team/oej/bug2617/sounds/letters/s.gsm (props changed)
team/oej/bug2617/sounds/letters/slash.gsm (props changed)
team/oej/bug2617/sounds/letters/space.gsm (props changed)
team/oej/bug2617/sounds/letters/t.gsm (props changed)
team/oej/bug2617/sounds/letters/u.gsm (props changed)
team/oej/bug2617/sounds/letters/v.gsm (props changed)
team/oej/bug2617/sounds/letters/w.gsm (props changed)
team/oej/bug2617/sounds/letters/x.gsm (props changed)
team/oej/bug2617/sounds/letters/y.gsm (props changed)
team/oej/bug2617/sounds/letters/z.gsm (props changed)
team/oej/bug2617/sounds/letters/zed.gsm (props changed)
team/oej/bug2617/sounds/minutes.gsm (props changed)
team/oej/bug2617/sounds/pbx-invalid.gsm (props changed)
team/oej/bug2617/sounds/pbx-invalidpark.gsm (props changed)
team/oej/bug2617/sounds/pbx-transfer.gsm (props changed)
team/oej/bug2617/sounds/phonetic/9_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/a_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/b_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/c_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/d_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/e_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/f_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/g_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/h_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/i_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/j_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/k_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/l_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/m_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/n_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/o_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/p_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/q_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/r_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/s_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/t_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/u_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/v_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/w_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/x_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/y_p.gsm (props changed)
team/oej/bug2617/sounds/phonetic/z_p.gsm (props changed)
team/oej/bug2617/sounds/priv-callee-options.gsm (props changed)
team/oej/bug2617/sounds/priv-callpending.gsm (props changed)
team/oej/bug2617/sounds/priv-introsaved.gsm (props changed)
team/oej/bug2617/sounds/priv-recordintro.gsm (props changed)
team/oej/bug2617/sounds/privacy-incorrect.gsm (props changed)
team/oej/bug2617/sounds/privacy-prompt.gsm (props changed)
team/oej/bug2617/sounds/privacy-thankyou.gsm (props changed)
team/oej/bug2617/sounds/privacy-unident.gsm (props changed)
team/oej/bug2617/sounds/queue-callswaiting.gsm (props changed)
team/oej/bug2617/sounds/queue-holdtime.gsm (props changed)
team/oej/bug2617/sounds/queue-less-than.gsm (props changed)
team/oej/bug2617/sounds/queue-minutes.gsm (props changed)
team/oej/bug2617/sounds/queue-periodic-announce.gsm (props changed)
team/oej/bug2617/sounds/queue-reporthold.gsm (props changed)
team/oej/bug2617/sounds/queue-seconds.gsm (props changed)
team/oej/bug2617/sounds/queue-thankyou.gsm (props changed)
team/oej/bug2617/sounds/queue-thereare.gsm (props changed)
team/oej/bug2617/sounds/queue-youarenext.gsm (props changed)
team/oej/bug2617/sounds/screen-callee-options.gsm (props changed)
team/oej/bug2617/sounds/seconds.gsm (props changed)
team/oej/bug2617/sounds/spy-agent.gsm (props changed)
team/oej/bug2617/sounds/spy-h323.gsm (props changed)
team/oej/bug2617/sounds/spy-iax.gsm (props changed)
team/oej/bug2617/sounds/spy-iax2.gsm (props changed)
team/oej/bug2617/sounds/spy-mgcp.gsm (props changed)
team/oej/bug2617/sounds/spy-sip.gsm (props changed)
team/oej/bug2617/sounds/spy-skinny.gsm (props changed)
team/oej/bug2617/sounds/spy-zap.gsm (props changed)
team/oej/bug2617/sounds/ss-noservice.gsm (props changed)
team/oej/bug2617/sounds/transfer.gsm (props changed)
team/oej/bug2617/sounds/tt-allbusy.gsm (props changed)
team/oej/bug2617/sounds/tt-monkeys.gsm (props changed)
team/oej/bug2617/sounds/tt-monkeysintro.gsm (props changed)
team/oej/bug2617/sounds/tt-somethingwrong.gsm (props changed)
team/oej/bug2617/sounds/tt-weasels.gsm (props changed)
team/oej/bug2617/sounds/vm-Cust1.gsm (props changed)
team/oej/bug2617/sounds/vm-Cust2.gsm (props changed)
team/oej/bug2617/sounds/vm-Cust3.gsm (props changed)
team/oej/bug2617/sounds/vm-Cust4.gsm (props changed)
team/oej/bug2617/sounds/vm-Cust5.gsm (props changed)
team/oej/bug2617/sounds/vm-Family.gsm (props changed)
team/oej/bug2617/sounds/vm-Friends.gsm (props changed)
team/oej/bug2617/sounds/vm-INBOX.gsm (props changed)
team/oej/bug2617/sounds/vm-Old.gsm (props changed)
team/oej/bug2617/sounds/vm-Work.gsm (props changed)
team/oej/bug2617/sounds/vm-advopts.gsm (props changed)
team/oej/bug2617/sounds/vm-and.gsm (props changed)
team/oej/bug2617/sounds/vm-calldiffnum.gsm (props changed)
team/oej/bug2617/sounds/vm-changeto.gsm (props changed)
team/oej/bug2617/sounds/vm-delete.gsm (props changed)
team/oej/bug2617/sounds/vm-deleted.gsm (props changed)
team/oej/bug2617/sounds/vm-dialout.gsm (props changed)
team/oej/bug2617/sounds/vm-enter-num-to-call.gsm (props changed)
team/oej/bug2617/sounds/vm-extension.gsm (props changed)
team/oej/bug2617/sounds/vm-first.gsm (props changed)
team/oej/bug2617/sounds/vm-for.gsm (props changed)
team/oej/bug2617/sounds/vm-forward.gsm (props changed)
team/oej/bug2617/sounds/vm-forwardoptions.gsm (props changed)
team/oej/bug2617/sounds/vm-from-extension.gsm (props changed)
team/oej/bug2617/sounds/vm-from-phonenumber.gsm (props changed)
team/oej/bug2617/sounds/vm-from.gsm (props changed)
team/oej/bug2617/sounds/vm-goodbye.gsm (props changed)
team/oej/bug2617/sounds/vm-helpexit.gsm (props changed)
team/oej/bug2617/sounds/vm-incorrect-mailbox.gsm (props changed)
team/oej/bug2617/sounds/vm-incorrect.gsm (props changed)
team/oej/bug2617/sounds/vm-instructions.gsm (props changed)
team/oej/bug2617/sounds/vm-intro.gsm (props changed)
team/oej/bug2617/sounds/vm-isonphone.gsm (props changed)
team/oej/bug2617/sounds/vm-isunavail.gsm (props changed)
team/oej/bug2617/sounds/vm-last.gsm (props changed)
team/oej/bug2617/sounds/vm-leavemsg.gsm (props changed)
team/oej/bug2617/sounds/vm-login.gsm (props changed)
team/oej/bug2617/sounds/vm-mailboxfull.gsm (props changed)
team/oej/bug2617/sounds/vm-message.gsm (props changed)
team/oej/bug2617/sounds/vm-messages.gsm (props changed)
team/oej/bug2617/sounds/vm-minutes.gsm (props changed)
team/oej/bug2617/sounds/vm-mismatch.gsm (props changed)
team/oej/bug2617/sounds/vm-msginstruct.gsm (props changed)
team/oej/bug2617/sounds/vm-msgsaved.gsm (props changed)
team/oej/bug2617/sounds/vm-newpassword.gsm (props changed)
team/oej/bug2617/sounds/vm-newuser.gsm (props changed)
team/oej/bug2617/sounds/vm-next.gsm (props changed)
team/oej/bug2617/sounds/vm-no.gsm (props changed)
team/oej/bug2617/sounds/vm-nobodyavail.gsm (props changed)
team/oej/bug2617/sounds/vm-nobox.gsm (props changed)
team/oej/bug2617/sounds/vm-nomore.gsm (props changed)
team/oej/bug2617/sounds/vm-nonumber.gsm (props changed)
team/oej/bug2617/sounds/vm-num-i-have.gsm (props changed)
team/oej/bug2617/sounds/vm-onefor.gsm (props changed)
team/oej/bug2617/sounds/vm-options.gsm (props changed)
team/oej/bug2617/sounds/vm-opts.gsm (props changed)
team/oej/bug2617/sounds/vm-passchanged.gsm (props changed)
team/oej/bug2617/sounds/vm-password.gsm (props changed)
team/oej/bug2617/sounds/vm-press.gsm (props changed)
team/oej/bug2617/sounds/vm-prev.gsm (props changed)
team/oej/bug2617/sounds/vm-reachoper.gsm (props changed)
team/oej/bug2617/sounds/vm-rec-busy.gsm (props changed)
team/oej/bug2617/sounds/vm-rec-name.gsm (props changed)
team/oej/bug2617/sounds/vm-rec-temp.gsm (props changed)
team/oej/bug2617/sounds/vm-rec-unv.gsm (props changed)
team/oej/bug2617/sounds/vm-received.gsm (props changed)
team/oej/bug2617/sounds/vm-reenterpassword.gsm (props changed)
team/oej/bug2617/sounds/vm-repeat.gsm (props changed)
team/oej/bug2617/sounds/vm-review.gsm (props changed)
team/oej/bug2617/sounds/vm-saved.gsm (props changed)
team/oej/bug2617/sounds/vm-savedto.gsm (props changed)
team/oej/bug2617/sounds/vm-savefolder.gsm (props changed)
team/oej/bug2617/sounds/vm-savemessage.gsm (props changed)
team/oej/bug2617/sounds/vm-saveoper.gsm (props changed)
team/oej/bug2617/sounds/vm-sorry.gsm (props changed)
team/oej/bug2617/sounds/vm-star-cancel.gsm (props changed)
team/oej/bug2617/sounds/vm-starmain.gsm (props changed)
team/oej/bug2617/sounds/vm-tempgreeting.gsm (props changed)
team/oej/bug2617/sounds/vm-tempgreeting2.gsm (props changed)
team/oej/bug2617/sounds/vm-tempremoved.gsm (props changed)
team/oej/bug2617/sounds/vm-then-pound.gsm (props changed)
team/oej/bug2617/sounds/vm-theperson.gsm (props changed)
team/oej/bug2617/sounds/vm-tocallback.gsm (props changed)
team/oej/bug2617/sounds/vm-tocallnum.gsm (props changed)
team/oej/bug2617/sounds/vm-tocancel.gsm (props changed)
team/oej/bug2617/sounds/vm-tocancelmsg.gsm (props changed)
team/oej/bug2617/sounds/vm-toenternumber.gsm (props changed)
team/oej/bug2617/sounds/vm-toforward.gsm (props changed)
team/oej/bug2617/sounds/vm-tohearenv.gsm (props changed)
team/oej/bug2617/sounds/vm-tomakecall.gsm (props changed)
team/oej/bug2617/sounds/vm-tooshort.gsm (props changed)
team/oej/bug2617/sounds/vm-toreply.gsm (props changed)
team/oej/bug2617/sounds/vm-torerecord.gsm (props changed)
team/oej/bug2617/sounds/vm-undelete.gsm (props changed)
team/oej/bug2617/sounds/vm-undeleted.gsm (props changed)
team/oej/bug2617/sounds/vm-unknown-caller.gsm (props changed)
team/oej/bug2617/sounds/vm-whichbox.gsm (props changed)
team/oej/bug2617/sounds/vm-youhave.gsm (props changed)
team/oej/bug2617/utils.c
team/oej/bug2617/utils/astman.c
Propchange: team/oej/bug2617/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 4 05:38:12 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7275
+/branches/1.2:1-7880
Modified: team/oej/bug2617/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/Makefile?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/Makefile (original)
+++ team/oej/bug2617/Makefile Sat Feb 4 05:38:12 2006
@@ -829,7 +829,7 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
- echo "PROJECT_NUMBER=$(ASTERISKVERSION) - $(ASTERISKVERSIONNUM)") | doxygen -
+ echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
mpg123:
@wget -V >/dev/null || (echo "You need wget" ; false )
Modified: team/oej/bug2617/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/app.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/app.c (original)
+++ team/oej/bug2617/app.c Sat Feb 4 05:38:12 2006
@@ -430,11 +430,11 @@
const char *stop, const char *pause,
const char *restart, int skipms)
{
- long elapsed = 0, last_elapsed = 0;
char *breaks = NULL;
char *end = NULL;
int blen = 2;
int res;
+ long pause_restart_point = 0;
if (stop)
blen += strlen(stop);
@@ -456,9 +456,6 @@
if (chan->_state != AST_STATE_UP)
res = ast_answer(chan);
- if (chan)
- ast_stopstream(chan);
-
if (file) {
if ((end = strchr(file,':'))) {
if (!strcasecmp(end, ":end")) {
@@ -469,25 +466,18 @@
}
for (;;) {
- struct timeval started = ast_tvnow();
-
- if (chan)
- ast_stopstream(chan);
+ ast_stopstream(chan);
res = ast_streamfile(chan, file, chan->language);
if (!res) {
- if (end) {
+ if (pause_restart_point) {
+ ast_seekstream(chan->stream, pause_restart_point, SEEK_SET);
+ pause_restart_point = 0;
+ }
+ else if (end) {
ast_seekstream(chan->stream, 0, SEEK_END);
- end=NULL;
- }
- res = 1;
- if (elapsed) {
- ast_stream_fastforward(chan->stream, elapsed);
- last_elapsed = elapsed - 200;
- }
- if (res)
- res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
- else
- break;
+ end = NULL;
+ };
+ res = ast_waitstream_fr(chan, breaks, fwd, rev, skipms);
}
if (res < 1)
@@ -496,17 +486,16 @@
/* We go at next loop if we got the restart char */
if (restart && strchr(restart, res)) {
ast_log(LOG_DEBUG, "we'll restart the stream here at next loop\n");
- elapsed=0; /* To make sure the next stream will start at beginning */
+ pause_restart_point = 0;
continue;
}
- if (pause != NULL && strchr(pause, res)) {
- elapsed = ast_tvdiff_ms(ast_tvnow(), started) + last_elapsed;
- for(;;) {
- if (chan)
- ast_stopstream(chan);
+ if (pause && strchr(pause, res)) {
+ pause_restart_point = ast_tellstream(chan->stream);
+ for (;;) {
+ ast_stopstream(chan);
res = ast_waitfordigit(chan, 1000);
- if (res == 0)
+ if (!res)
continue;
else if (res == -1 || strchr(pause, res) || (stop && strchr(stop, res)))
break;
@@ -516,17 +505,16 @@
continue;
}
}
+
if (res == -1)
break;
/* if we get one of our stop chars, return it to the calling function */
- if (stop && strchr(stop, res)) {
- /* res = 0; */
- break;
- }
- }
- if (chan)
- ast_stopstream(chan);
+ if (stop && strchr(stop, res))
+ break;
+ }
+
+ ast_stopstream(chan);
return res;
}
Modified: team/oej/bug2617/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_chanspy.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_chanspy.c (original)
+++ team/oej/bug2617/apps/app_chanspy.c Sat Feb 4 05:38:12 2006
@@ -208,9 +208,9 @@
static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy)
{
- /* If our status has changed, then the channel we're spying on is gone....
+ /* If our status has changed to DONE, then the channel we're spying on is gone....
DON'T TOUCH IT!!! RUN AWAY!!! */
- if (spy->status != CHANSPY_RUNNING)
+ if (spy->status == CHANSPY_DONE)
return;
if (!chan)
@@ -439,8 +439,8 @@
if (recbase) {
char filename[512];
- snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",ast_config_AST_MONITOR_DIR, recbase, time(NULL));
- if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC)) <= 0) {
+ snprintf(filename,sizeof(filename),"%s/%s.%d.raw",ast_config_AST_MONITOR_DIR, recbase, (int)time(NULL));
+ if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC, 0644)) <= 0) {
ast_log(LOG_WARNING, "Cannot open %s for recording\n", filename);
fd = 0;
}
@@ -482,7 +482,7 @@
}
}
- if (igrp && (!spec || ((strlen(spec) < strlen(peer->name) &&
+ if (igrp && (!spec || ((strlen(spec) <= strlen(peer->name) &&
!strncasecmp(peer->name, spec, strlen(spec)))))) {
if (peer && (!bronly || ast_bridged_channel(peer)) &&
!ast_check_hangup(peer) && !ast_test_flag(peer, AST_FLAG_SPYING)) {
Modified: team/oej/bug2617/apps/app_cut.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_cut.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_cut.c (original)
+++ team/oej/bug2617/apps/app_cut.c Sat Feb 4 05:38:12 2006
@@ -145,8 +145,9 @@
int blen = strlen(buffer);
if (element_count++) {
strncat(buffer + blen, ",", buflen - blen - 1);
- }
- strncat(buffer + blen + 1, sortable_keys[count2].key, buflen - blen - 2);
+ blen++;
+ }
+ strncat(buffer + blen, sortable_keys[count2].key, buflen - blen - 1);
}
return 0;
Modified: team/oej/bug2617/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_dial.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_dial.c (original)
+++ team/oej/bug2617/apps/app_dial.c Sat Feb 4 05:38:12 2006
@@ -962,7 +962,7 @@
/* If a channel group has been specified, get it for use when we create peer channels */
outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
- ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID);
+ ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP);
cur = args.peers;
do {
/* Remember where to start next time */
Modified: team/oej/bug2617/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_directed_pickup.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_directed_pickup.c (original)
+++ team/oej/bug2617/apps/app_directed_pickup.c Sat Feb 4 05:38:12 2006
@@ -77,7 +77,7 @@
/* Find a channel to pickup */
origin = ast_get_channel_by_exten_locked(exten, context);
- if (origin) {
+ if (origin && origin->cdr) {
ast_cdr_getvar(origin->cdr, "dstchannel", &tmp, workspace,
sizeof(workspace), 0);
if (tmp) {
@@ -89,6 +89,8 @@
}
ast_mutex_unlock(&origin->lock);
} else {
+ if (origin)
+ ast_mutex_unlock(&origin->lock);
ast_log(LOG_DEBUG, "No originating channel found.\n");
}
Modified: team/oej/bug2617/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_externalivr.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_externalivr.c (original)
+++ team/oej/bug2617/apps/app_externalivr.c Sat Feb 4 05:38:12 2006
@@ -94,9 +94,9 @@
char tmp[256];
if (!data) {
- snprintf(tmp, sizeof(tmp), "%c,%10ld", event, time(NULL));
+ snprintf(tmp, sizeof(tmp), "%c,%10d", event, (int)time(NULL));
} else {
- snprintf(tmp, sizeof(tmp), "%c,%10ld,%s", event, time(NULL), data);
+ snprintf(tmp, sizeof(tmp), "%c,%10d,%s", event, (int)time(NULL), data);
}
fprintf(handle, "%s\n", tmp);
@@ -345,8 +345,6 @@
goto exit;
}
- setvbuf(child_events, NULL, _IONBF, 0);
-
if (!(child_commands = fdopen(child_commands_fd, "r"))) {
ast_chan_log(LOG_WARNING, chan, "Could not open stream for child commands\n");
goto exit;
@@ -356,6 +354,10 @@
ast_chan_log(LOG_WARNING, chan, "Could not open stream for child errors\n");
goto exit;
}
+
+ setvbuf(child_events, NULL, _IONBF, 0);
+ setvbuf(child_commands, NULL, _IONBF, 0);
+ setvbuf(child_errors, NULL, _IONBF, 0);
res = 0;
Modified: team/oej/bug2617/apps/app_hasnewvoicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_hasnewvoicemail.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_hasnewvoicemail.c (original)
+++ team/oej/bug2617/apps/app_hasnewvoicemail.c Sat Feb 4 05:38:12 2006
@@ -90,7 +90,6 @@
while ((vment = readdir(vmdir))) {
if (!strncmp(vment->d_name + 7, ".txt", 4)) {
count++;
- break;
}
}
closedir(vmdir);
Modified: team/oej/bug2617/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_meetme.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_meetme.c (original)
+++ team/oej/bug2617/apps/app_meetme.c Sat Feb 4 05:38:12 2006
@@ -263,14 +263,17 @@
return "(not talking)";
}
-static int careful_write(int fd, unsigned char *data, int len)
+static int careful_write(int fd, unsigned char *data, int len, int block)
{
int res;
int x;
while (len) {
- x = ZT_IOMUX_WRITE | ZT_IOMUX_SIGEVENT;
- res = ioctl(fd, ZT_IOMUX, &x);
+ if (block) {
+ x = ZT_IOMUX_WRITE | ZT_IOMUX_SIGEVENT;
+ res = ioctl(fd, ZT_IOMUX, &x);
+ } else
+ res = 0;
if (res >= 0)
res = write(fd, data, len);
if (res < 1) {
@@ -423,7 +426,7 @@
len = 0;
}
if (data)
- careful_write(conf->fd, data, len);
+ careful_write(conf->fd, data, len, 1);
ast_mutex_unlock(&conflock);
@@ -1307,7 +1310,11 @@
audio frames (in which case carefully writing would only
have delayed the audio even further).
*/
- write(fd, f->data, f->datalen);
+ /* As it turns out, we do want to use careful write. We just
+ don't want to block, but we do want to at least *try*
+ to write out all the samples.
+ */
+ careful_write(fd, f->data, f->datalen, 0);
}
} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) {
char tmp[2];
Modified: team/oej/bug2617/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_mixmonitor.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_mixmonitor.c (original)
+++ team/oej/bug2617/apps/app_mixmonitor.c Sat Feb 4 05:38:12 2006
@@ -112,9 +112,9 @@
static void stopmon(struct ast_channel *chan, struct ast_channel_spy *spy)
{
- /* If our status has changed, then the channel we're spying on is gone....
+ /* If our status has changed to DONE, then the channel we're spying on is gone....
DON'T TOUCH IT!!! RUN AWAY!!! */
- if (spy->status != CHANSPY_RUNNING)
+ if (spy->status == CHANSPY_DONE)
return;
if (!chan)
Modified: team/oej/bug2617/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_privacy.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_privacy.c (original)
+++ team/oej/bug2617/apps/app_privacy.c Sat Feb 4 05:38:12 2006
@@ -193,7 +193,7 @@
}
/*Got a number, play sounds and send them on their way*/
- if ((retries < maxretries) && res == 1 ) {
+ if ((retries < maxretries) && !res ) {
res = ast_streamfile(chan, "privacy-thankyou", chan->language);
if (!res)
res = ast_waitstream(chan, "");
Modified: team/oej/bug2617/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug2617/apps/app_queue.c?rev=9146&r1=9145&r2=9146&view=diff
==============================================================================
--- team/oej/bug2617/apps/app_queue.c (original)
+++ team/oej/bug2617/apps/app_queue.c Sat Feb 4 05:38:12 2006
@@ -484,11 +484,11 @@
"Membership: %s\r\n"
"Penalty: %d\r\n"
"CallsTaken: %d\r\n"
- "LastCall: %ld\r\n"
+ "LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
q->name, cur->interface, cur->dynamic ? "dynamic" : "static",
- cur->penalty, cur->calls, cur->lastcall, cur->status, cur->paused);
+ cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
}
}
@@ -850,10 +850,11 @@
v = v->next;
}
- /* Temporarily set members dead so we can detect deleted ones. */
+ /* Temporarily set non-dynamic members dead so we can detect deleted ones. */
m = q->members;
while (m) {
- m->dead = 1;
+ if (!m->dynamic)
+ m->dead = 1;
m = m->next;
}
@@ -1261,11 +1262,11 @@
"Membership: %s\r\n"
"Penalty: %d\r\n"
"CallsTaken: %d\r\n"
- "LastCall: %ld\r\n"
+ "LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
q->name, cur->interface, cur->dynamic ? "dynamic" : "static",
- cur->penalty, cur->calls, cur->lastcall, cur->status, cur->paused);
+ cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
break;
}
@@ -2419,11 +2420,11 @@
"Membership: %s\r\n"
"Penalty: %d\r\n"
"CallsTaken: %d\r\n"
- "LastCall: %ld\r\n"
+ "LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
- new_member->penalty, new_member->calls, new_member->lastcall, new_member->status, new_member->paused);
[... 4814 lines stripped ...]
More information about the asterisk-commits
mailing list