[asterisk-commits] branch oej/aum - r7473 in /team/oej/aum: ./
apps/ build_tools/ channels/ conf...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Dec 14 14:58:55 CST 2005
Author: oej
Date: Wed Dec 14 14:56:24 2005
New Revision: 7473
URL: http://svn.digium.com/view/asterisk?rev=7473&view=rev
Log:
Merged revisions 7285,7299,7310,7329,7335,7337,7340,7345-7347,7349,7351,7382,7386,7404,7406,7425,7427,7429-7430,7433,7435,7448-7449,7451,7453,7468,7470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
Modified:
team/oej/aum/Makefile
team/oej/aum/app.c
team/oej/aum/apps/app_dial.c
team/oej/aum/apps/app_externalivr.c
team/oej/aum/apps/app_queue.c
team/oej/aum/apps/app_voicemail.c
team/oej/aum/build_tools/make_svn_branch_name
team/oej/aum/channels/chan_agent.c
team/oej/aum/channels/chan_sip.c
team/oej/aum/channels/chan_zap.c
team/oej/aum/configs/res_odbc.conf.sample
team/oej/aum/configs/sip.conf.sample
team/oej/aum/contrib/firmware/iax/iaxy.bin (contents, props changed)
team/oej/aum/contrib/init.d/rc.debian.asterisk (props changed)
team/oej/aum/contrib/init.d/rc.gentoo.asterisk (props changed)
team/oej/aum/contrib/init.d/rc.mandrake.asterisk (contents, props changed)
team/oej/aum/contrib/init.d/rc.mandrake.zaptel (props changed)
team/oej/aum/contrib/init.d/rc.redhat.asterisk (props changed)
team/oej/aum/contrib/init.d/rc.slackware.asterisk (props changed)
team/oej/aum/doc/README.variables
team/oej/aum/include/asterisk/linkedlists.h
team/oej/aum/pbx.c
team/oej/aum/sounds/agent-alreadyon.gsm (props changed)
team/oej/aum/sounds/agent-incorrect.gsm (props changed)
team/oej/aum/sounds/agent-loggedoff.gsm (props changed)
team/oej/aum/sounds/agent-loginok.gsm (props changed)
team/oej/aum/sounds/agent-newlocation.gsm (props changed)
team/oej/aum/sounds/agent-pass.gsm (props changed)
team/oej/aum/sounds/agent-user.gsm (props changed)
team/oej/aum/sounds/auth-incorrect.gsm (props changed)
team/oej/aum/sounds/auth-thankyou.gsm (props changed)
team/oej/aum/sounds/beep.gsm (props changed)
team/oej/aum/sounds/beeperr.gsm (props changed)
team/oej/aum/sounds/conf-adminmenu.gsm (props changed)
team/oej/aum/sounds/conf-enteringno.gsm (props changed)
team/oej/aum/sounds/conf-errormenu.gsm (props changed)
team/oej/aum/sounds/conf-getchannel.gsm (props changed)
team/oej/aum/sounds/conf-getconfno.gsm (props changed)
team/oej/aum/sounds/conf-getpin.gsm (props changed)
team/oej/aum/sounds/conf-hasjoin.gsm (props changed)
team/oej/aum/sounds/conf-hasleft.gsm (props changed)
team/oej/aum/sounds/conf-invalid.gsm (props changed)
team/oej/aum/sounds/conf-invalidpin.gsm (props changed)
team/oej/aum/sounds/conf-kicked.gsm (props changed)
team/oej/aum/sounds/conf-leaderhasleft.gsm (props changed)
team/oej/aum/sounds/conf-locked.gsm (props changed)
team/oej/aum/sounds/conf-lockednow.gsm (props changed)
team/oej/aum/sounds/conf-muted.gsm (props changed)
team/oej/aum/sounds/conf-noempty.gsm (props changed)
team/oej/aum/sounds/conf-onlyone.gsm (props changed)
team/oej/aum/sounds/conf-onlyperson.gsm (props changed)
team/oej/aum/sounds/conf-otherinparty.gsm (props changed)
team/oej/aum/sounds/conf-placeintoconf.gsm (props changed)
team/oej/aum/sounds/conf-thereare.gsm (props changed)
team/oej/aum/sounds/conf-unlockednow.gsm (props changed)
team/oej/aum/sounds/conf-unmuted.gsm (props changed)
team/oej/aum/sounds/conf-usermenu.gsm (props changed)
team/oej/aum/sounds/conf-userswilljoin.gsm (props changed)
team/oej/aum/sounds/conf-userwilljoin.gsm (props changed)
team/oej/aum/sounds/conf-waitforleader.gsm (props changed)
team/oej/aum/sounds/demo-abouttotry.gsm (props changed)
team/oej/aum/sounds/demo-congrats.gsm (props changed)
team/oej/aum/sounds/demo-echodone.gsm (props changed)
team/oej/aum/sounds/demo-echotest.gsm (props changed)
team/oej/aum/sounds/demo-enterkeywords.gsm (props changed)
team/oej/aum/sounds/demo-instruct.gsm (props changed)
team/oej/aum/sounds/demo-moreinfo.gsm (props changed)
team/oej/aum/sounds/demo-nogo.gsm (props changed)
team/oej/aum/sounds/demo-nomatch.gsm (props changed)
team/oej/aum/sounds/demo-thanks.gsm (props changed)
team/oej/aum/sounds/dictate/both_help.gsm (props changed)
team/oej/aum/sounds/dictate/enter_filename.gsm (props changed)
team/oej/aum/sounds/dictate/forhelp.gsm (props changed)
team/oej/aum/sounds/dictate/pause.gsm (props changed)
team/oej/aum/sounds/dictate/paused.gsm (props changed)
team/oej/aum/sounds/dictate/play_help.gsm (props changed)
team/oej/aum/sounds/dictate/playback.gsm (props changed)
team/oej/aum/sounds/dictate/playback_mode.gsm (props changed)
team/oej/aum/sounds/dictate/record.gsm (props changed)
team/oej/aum/sounds/dictate/record_help.gsm (props changed)
team/oej/aum/sounds/dictate/record_mode.gsm (props changed)
team/oej/aum/sounds/dictate/truncating_audio.gsm (props changed)
team/oej/aum/sounds/digits/0.gsm (props changed)
team/oej/aum/sounds/digits/1.gsm (props changed)
team/oej/aum/sounds/digits/10.gsm (props changed)
team/oej/aum/sounds/digits/11.gsm (props changed)
team/oej/aum/sounds/digits/12.gsm (props changed)
team/oej/aum/sounds/digits/13.gsm (props changed)
team/oej/aum/sounds/digits/14.gsm (props changed)
team/oej/aum/sounds/digits/15.gsm (props changed)
team/oej/aum/sounds/digits/16.gsm (props changed)
team/oej/aum/sounds/digits/17.gsm (props changed)
team/oej/aum/sounds/digits/18.gsm (props changed)
team/oej/aum/sounds/digits/19.gsm (props changed)
team/oej/aum/sounds/digits/2.gsm (props changed)
team/oej/aum/sounds/digits/20.gsm (props changed)
team/oej/aum/sounds/digits/3.gsm (props changed)
team/oej/aum/sounds/digits/30.gsm (props changed)
team/oej/aum/sounds/digits/4.gsm (props changed)
team/oej/aum/sounds/digits/40.gsm (props changed)
team/oej/aum/sounds/digits/5.gsm (props changed)
team/oej/aum/sounds/digits/50.gsm (props changed)
team/oej/aum/sounds/digits/6.gsm (props changed)
team/oej/aum/sounds/digits/60.gsm (props changed)
team/oej/aum/sounds/digits/7.gsm (props changed)
team/oej/aum/sounds/digits/70.gsm (props changed)
team/oej/aum/sounds/digits/8.gsm (props changed)
team/oej/aum/sounds/digits/80.gsm (props changed)
team/oej/aum/sounds/digits/9.gsm (props changed)
team/oej/aum/sounds/digits/90.gsm (props changed)
team/oej/aum/sounds/digits/a-m.gsm (props changed)
team/oej/aum/sounds/digits/at.gsm (props changed)
team/oej/aum/sounds/digits/day-0.gsm (props changed)
team/oej/aum/sounds/digits/day-1.gsm (props changed)
team/oej/aum/sounds/digits/day-2.gsm (props changed)
team/oej/aum/sounds/digits/day-3.gsm (props changed)
team/oej/aum/sounds/digits/day-4.gsm (props changed)
team/oej/aum/sounds/digits/day-5.gsm (props changed)
team/oej/aum/sounds/digits/day-6.gsm (props changed)
team/oej/aum/sounds/digits/dollars.gsm (props changed)
team/oej/aum/sounds/digits/h-1.gsm (props changed)
team/oej/aum/sounds/digits/h-10.gsm (props changed)
team/oej/aum/sounds/digits/h-11.gsm (props changed)
team/oej/aum/sounds/digits/h-12.gsm (props changed)
team/oej/aum/sounds/digits/h-13.gsm (props changed)
team/oej/aum/sounds/digits/h-14.gsm (props changed)
team/oej/aum/sounds/digits/h-15.gsm (props changed)
team/oej/aum/sounds/digits/h-16.gsm (props changed)
team/oej/aum/sounds/digits/h-17.gsm (props changed)
team/oej/aum/sounds/digits/h-18.gsm (props changed)
team/oej/aum/sounds/digits/h-19.gsm (props changed)
team/oej/aum/sounds/digits/h-2.gsm (props changed)
team/oej/aum/sounds/digits/h-20.gsm (props changed)
team/oej/aum/sounds/digits/h-3.gsm (props changed)
team/oej/aum/sounds/digits/h-30.gsm (props changed)
team/oej/aum/sounds/digits/h-4.gsm (props changed)
team/oej/aum/sounds/digits/h-5.gsm (props changed)
team/oej/aum/sounds/digits/h-6.gsm (props changed)
team/oej/aum/sounds/digits/h-7.gsm (props changed)
team/oej/aum/sounds/digits/h-8.gsm (props changed)
team/oej/aum/sounds/digits/h-9.gsm (props changed)
team/oej/aum/sounds/digits/hundred.gsm (props changed)
team/oej/aum/sounds/digits/million.gsm (props changed)
team/oej/aum/sounds/digits/minus.gsm (props changed)
team/oej/aum/sounds/digits/mon-0.gsm (props changed)
team/oej/aum/sounds/digits/mon-1.gsm (props changed)
team/oej/aum/sounds/digits/mon-10.gsm (props changed)
team/oej/aum/sounds/digits/mon-11.gsm (props changed)
team/oej/aum/sounds/digits/mon-2.gsm (props changed)
team/oej/aum/sounds/digits/mon-3.gsm (props changed)
team/oej/aum/sounds/digits/mon-4.gsm (props changed)
team/oej/aum/sounds/digits/mon-5.gsm (props changed)
team/oej/aum/sounds/digits/mon-6.gsm (props changed)
team/oej/aum/sounds/digits/mon-7.gsm (props changed)
team/oej/aum/sounds/digits/mon-8.gsm (props changed)
team/oej/aum/sounds/digits/mon-9.gsm (props changed)
team/oej/aum/sounds/digits/oclock.gsm (props changed)
team/oej/aum/sounds/digits/oh.gsm (props changed)
team/oej/aum/sounds/digits/p-m.gsm (props changed)
team/oej/aum/sounds/digits/pound.gsm (props changed)
team/oej/aum/sounds/digits/star.gsm (props changed)
team/oej/aum/sounds/digits/thousand.gsm (props changed)
team/oej/aum/sounds/digits/today.gsm (props changed)
team/oej/aum/sounds/digits/tomorrow.gsm (props changed)
team/oej/aum/sounds/digits/yesterday.gsm (props changed)
team/oej/aum/sounds/dir-instr.gsm (props changed)
team/oej/aum/sounds/dir-intro-fn.gsm (props changed)
team/oej/aum/sounds/dir-intro.gsm (props changed)
team/oej/aum/sounds/dir-nomatch.gsm (props changed)
team/oej/aum/sounds/dir-nomore.gsm (props changed)
team/oej/aum/sounds/fpm-calm-river.mp3 (props changed)
team/oej/aum/sounds/fpm-sunshine.mp3 (props changed)
team/oej/aum/sounds/fpm-world-mix.mp3 (props changed)
team/oej/aum/sounds/hello-world.gsm (props changed)
team/oej/aum/sounds/hours.gsm (props changed)
team/oej/aum/sounds/invalid.gsm (props changed)
team/oej/aum/sounds/letters/a.gsm (props changed)
team/oej/aum/sounds/letters/at.gsm (props changed)
team/oej/aum/sounds/letters/b.gsm (props changed)
team/oej/aum/sounds/letters/c.gsm (props changed)
team/oej/aum/sounds/letters/d.gsm (props changed)
team/oej/aum/sounds/letters/dash.gsm (props changed)
team/oej/aum/sounds/letters/dollar.gsm (props changed)
team/oej/aum/sounds/letters/dot.gsm (props changed)
team/oej/aum/sounds/letters/e.gsm (props changed)
team/oej/aum/sounds/letters/equals.gsm (props changed)
team/oej/aum/sounds/letters/exclaimation-point.gsm (props changed)
team/oej/aum/sounds/letters/f.gsm (props changed)
team/oej/aum/sounds/letters/g.gsm (props changed)
team/oej/aum/sounds/letters/h.gsm (props changed)
team/oej/aum/sounds/letters/i.gsm (props changed)
team/oej/aum/sounds/letters/j.gsm (props changed)
team/oej/aum/sounds/letters/k.gsm (props changed)
team/oej/aum/sounds/letters/l.gsm (props changed)
team/oej/aum/sounds/letters/m.gsm (props changed)
team/oej/aum/sounds/letters/n.gsm (props changed)
team/oej/aum/sounds/letters/o.gsm (props changed)
team/oej/aum/sounds/letters/p.gsm (props changed)
team/oej/aum/sounds/letters/plus.gsm (props changed)
team/oej/aum/sounds/letters/q.gsm (props changed)
team/oej/aum/sounds/letters/r.gsm (props changed)
team/oej/aum/sounds/letters/s.gsm (props changed)
team/oej/aum/sounds/letters/slash.gsm (props changed)
team/oej/aum/sounds/letters/space.gsm (props changed)
team/oej/aum/sounds/letters/t.gsm (props changed)
team/oej/aum/sounds/letters/u.gsm (props changed)
team/oej/aum/sounds/letters/v.gsm (props changed)
team/oej/aum/sounds/letters/w.gsm (props changed)
team/oej/aum/sounds/letters/x.gsm (props changed)
team/oej/aum/sounds/letters/y.gsm (props changed)
team/oej/aum/sounds/letters/z.gsm (props changed)
team/oej/aum/sounds/letters/zed.gsm (props changed)
team/oej/aum/sounds/minutes.gsm (props changed)
team/oej/aum/sounds/pbx-invalid.gsm (props changed)
team/oej/aum/sounds/pbx-invalidpark.gsm (props changed)
team/oej/aum/sounds/pbx-transfer.gsm (props changed)
team/oej/aum/sounds/phonetic/9_p.gsm (props changed)
team/oej/aum/sounds/phonetic/a_p.gsm (props changed)
team/oej/aum/sounds/phonetic/b_p.gsm (props changed)
team/oej/aum/sounds/phonetic/c_p.gsm (props changed)
team/oej/aum/sounds/phonetic/d_p.gsm (props changed)
team/oej/aum/sounds/phonetic/e_p.gsm (props changed)
team/oej/aum/sounds/phonetic/f_p.gsm (props changed)
team/oej/aum/sounds/phonetic/g_p.gsm (props changed)
team/oej/aum/sounds/phonetic/h_p.gsm (props changed)
team/oej/aum/sounds/phonetic/i_p.gsm (props changed)
team/oej/aum/sounds/phonetic/j_p.gsm (props changed)
team/oej/aum/sounds/phonetic/k_p.gsm (props changed)
team/oej/aum/sounds/phonetic/l_p.gsm (props changed)
team/oej/aum/sounds/phonetic/m_p.gsm (props changed)
team/oej/aum/sounds/phonetic/n_p.gsm (props changed)
team/oej/aum/sounds/phonetic/o_p.gsm (props changed)
team/oej/aum/sounds/phonetic/p_p.gsm (props changed)
team/oej/aum/sounds/phonetic/q_p.gsm (props changed)
team/oej/aum/sounds/phonetic/r_p.gsm (props changed)
team/oej/aum/sounds/phonetic/s_p.gsm (props changed)
team/oej/aum/sounds/phonetic/t_p.gsm (props changed)
team/oej/aum/sounds/phonetic/u_p.gsm (props changed)
team/oej/aum/sounds/phonetic/v_p.gsm (props changed)
team/oej/aum/sounds/phonetic/w_p.gsm (props changed)
team/oej/aum/sounds/phonetic/x_p.gsm (props changed)
team/oej/aum/sounds/phonetic/y_p.gsm (props changed)
team/oej/aum/sounds/phonetic/z_p.gsm (props changed)
team/oej/aum/sounds/priv-callee-options.gsm (props changed)
team/oej/aum/sounds/priv-callpending.gsm (props changed)
team/oej/aum/sounds/priv-introsaved.gsm (props changed)
team/oej/aum/sounds/priv-recordintro.gsm (props changed)
team/oej/aum/sounds/privacy-incorrect.gsm (props changed)
team/oej/aum/sounds/privacy-prompt.gsm (props changed)
team/oej/aum/sounds/privacy-thankyou.gsm (props changed)
team/oej/aum/sounds/privacy-unident.gsm (props changed)
team/oej/aum/sounds/queue-callswaiting.gsm (props changed)
team/oej/aum/sounds/queue-holdtime.gsm (props changed)
team/oej/aum/sounds/queue-less-than.gsm (props changed)
team/oej/aum/sounds/queue-minutes.gsm (props changed)
team/oej/aum/sounds/queue-periodic-announce.gsm (props changed)
team/oej/aum/sounds/queue-reporthold.gsm (props changed)
team/oej/aum/sounds/queue-seconds.gsm (props changed)
team/oej/aum/sounds/queue-thankyou.gsm (props changed)
team/oej/aum/sounds/queue-thereare.gsm (props changed)
team/oej/aum/sounds/queue-youarenext.gsm (props changed)
team/oej/aum/sounds/screen-callee-options.gsm (props changed)
team/oej/aum/sounds/seconds.gsm (props changed)
team/oej/aum/sounds/spy-agent.gsm (props changed)
team/oej/aum/sounds/spy-h323.gsm (props changed)
team/oej/aum/sounds/spy-iax.gsm (props changed)
team/oej/aum/sounds/spy-iax2.gsm (props changed)
team/oej/aum/sounds/spy-mgcp.gsm (props changed)
team/oej/aum/sounds/spy-sip.gsm (props changed)
team/oej/aum/sounds/spy-skinny.gsm (props changed)
team/oej/aum/sounds/spy-zap.gsm (props changed)
team/oej/aum/sounds/ss-noservice.gsm (props changed)
team/oej/aum/sounds/transfer.gsm (props changed)
team/oej/aum/sounds/tt-allbusy.gsm (props changed)
team/oej/aum/sounds/tt-monkeys.gsm (props changed)
team/oej/aum/sounds/tt-monkeysintro.gsm (props changed)
team/oej/aum/sounds/tt-somethingwrong.gsm (props changed)
team/oej/aum/sounds/tt-weasels.gsm (props changed)
team/oej/aum/sounds/vm-Cust1.gsm (props changed)
team/oej/aum/sounds/vm-Cust2.gsm (props changed)
team/oej/aum/sounds/vm-Cust3.gsm (props changed)
team/oej/aum/sounds/vm-Cust4.gsm (props changed)
team/oej/aum/sounds/vm-Cust5.gsm (props changed)
team/oej/aum/sounds/vm-Family.gsm (props changed)
team/oej/aum/sounds/vm-Friends.gsm (props changed)
team/oej/aum/sounds/vm-INBOX.gsm (props changed)
team/oej/aum/sounds/vm-Old.gsm (props changed)
team/oej/aum/sounds/vm-Work.gsm (props changed)
team/oej/aum/sounds/vm-advopts.gsm (props changed)
team/oej/aum/sounds/vm-and.gsm (props changed)
team/oej/aum/sounds/vm-calldiffnum.gsm (props changed)
team/oej/aum/sounds/vm-changeto.gsm (props changed)
team/oej/aum/sounds/vm-delete.gsm (props changed)
team/oej/aum/sounds/vm-deleted.gsm (props changed)
team/oej/aum/sounds/vm-dialout.gsm (props changed)
team/oej/aum/sounds/vm-enter-num-to-call.gsm (props changed)
team/oej/aum/sounds/vm-extension.gsm (props changed)
team/oej/aum/sounds/vm-first.gsm (props changed)
team/oej/aum/sounds/vm-for.gsm (props changed)
team/oej/aum/sounds/vm-forward.gsm (props changed)
team/oej/aum/sounds/vm-forwardoptions.gsm (props changed)
team/oej/aum/sounds/vm-from-extension.gsm (props changed)
team/oej/aum/sounds/vm-from-phonenumber.gsm (props changed)
team/oej/aum/sounds/vm-from.gsm (props changed)
team/oej/aum/sounds/vm-goodbye.gsm (props changed)
team/oej/aum/sounds/vm-helpexit.gsm (props changed)
team/oej/aum/sounds/vm-incorrect-mailbox.gsm (props changed)
team/oej/aum/sounds/vm-incorrect.gsm (props changed)
team/oej/aum/sounds/vm-instructions.gsm (props changed)
team/oej/aum/sounds/vm-intro.gsm (props changed)
team/oej/aum/sounds/vm-isonphone.gsm (props changed)
team/oej/aum/sounds/vm-isunavail.gsm (props changed)
team/oej/aum/sounds/vm-last.gsm (props changed)
team/oej/aum/sounds/vm-leavemsg.gsm (props changed)
team/oej/aum/sounds/vm-login.gsm (props changed)
team/oej/aum/sounds/vm-mailboxfull.gsm (props changed)
team/oej/aum/sounds/vm-message.gsm (props changed)
team/oej/aum/sounds/vm-messages.gsm (props changed)
team/oej/aum/sounds/vm-minutes.gsm (props changed)
team/oej/aum/sounds/vm-mismatch.gsm (props changed)
team/oej/aum/sounds/vm-msginstruct.gsm (props changed)
team/oej/aum/sounds/vm-msgsaved.gsm (props changed)
team/oej/aum/sounds/vm-newpassword.gsm (props changed)
team/oej/aum/sounds/vm-newuser.gsm (props changed)
team/oej/aum/sounds/vm-next.gsm (props changed)
team/oej/aum/sounds/vm-no.gsm (props changed)
team/oej/aum/sounds/vm-nobodyavail.gsm (props changed)
team/oej/aum/sounds/vm-nobox.gsm (props changed)
team/oej/aum/sounds/vm-nomore.gsm (props changed)
team/oej/aum/sounds/vm-nonumber.gsm (props changed)
team/oej/aum/sounds/vm-num-i-have.gsm (props changed)
team/oej/aum/sounds/vm-onefor.gsm (props changed)
team/oej/aum/sounds/vm-options.gsm (props changed)
team/oej/aum/sounds/vm-opts.gsm (props changed)
team/oej/aum/sounds/vm-passchanged.gsm (props changed)
team/oej/aum/sounds/vm-password.gsm (props changed)
team/oej/aum/sounds/vm-press.gsm (props changed)
team/oej/aum/sounds/vm-prev.gsm (props changed)
team/oej/aum/sounds/vm-reachoper.gsm (props changed)
team/oej/aum/sounds/vm-rec-busy.gsm (props changed)
team/oej/aum/sounds/vm-rec-name.gsm (props changed)
team/oej/aum/sounds/vm-rec-temp.gsm (props changed)
team/oej/aum/sounds/vm-rec-unv.gsm (props changed)
team/oej/aum/sounds/vm-received.gsm (props changed)
team/oej/aum/sounds/vm-reenterpassword.gsm (props changed)
team/oej/aum/sounds/vm-repeat.gsm (props changed)
team/oej/aum/sounds/vm-review.gsm (props changed)
team/oej/aum/sounds/vm-saved.gsm (props changed)
team/oej/aum/sounds/vm-savedto.gsm (props changed)
team/oej/aum/sounds/vm-savefolder.gsm (props changed)
team/oej/aum/sounds/vm-savemessage.gsm (props changed)
team/oej/aum/sounds/vm-saveoper.gsm (props changed)
team/oej/aum/sounds/vm-sorry.gsm (props changed)
team/oej/aum/sounds/vm-star-cancel.gsm (props changed)
team/oej/aum/sounds/vm-starmain.gsm (props changed)
team/oej/aum/sounds/vm-tempgreeting.gsm (props changed)
team/oej/aum/sounds/vm-tempgreeting2.gsm (props changed)
team/oej/aum/sounds/vm-tempremoved.gsm (props changed)
team/oej/aum/sounds/vm-then-pound.gsm (props changed)
team/oej/aum/sounds/vm-theperson.gsm (props changed)
team/oej/aum/sounds/vm-tocallback.gsm (props changed)
team/oej/aum/sounds/vm-tocallnum.gsm (props changed)
team/oej/aum/sounds/vm-tocancel.gsm (props changed)
team/oej/aum/sounds/vm-tocancelmsg.gsm (props changed)
team/oej/aum/sounds/vm-toenternumber.gsm (props changed)
team/oej/aum/sounds/vm-toforward.gsm (props changed)
team/oej/aum/sounds/vm-tohearenv.gsm (props changed)
team/oej/aum/sounds/vm-tomakecall.gsm (props changed)
team/oej/aum/sounds/vm-tooshort.gsm (props changed)
team/oej/aum/sounds/vm-toreply.gsm (props changed)
team/oej/aum/sounds/vm-torerecord.gsm (props changed)
team/oej/aum/sounds/vm-undelete.gsm (props changed)
team/oej/aum/sounds/vm-undeleted.gsm (props changed)
team/oej/aum/sounds/vm-unknown-caller.gsm (props changed)
team/oej/aum/sounds/vm-whichbox.gsm (props changed)
team/oej/aum/sounds/vm-youhave.gsm (props changed)
team/oej/aum/utils.c
team/oej/aum/utils/astman.c
Modified: team/oej/aum/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/aum/Makefile?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/Makefile (original)
+++ team/oej/aum/Makefile Wed Dec 14 14:56:24 2005
@@ -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/aum/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/app.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/app.c (original)
+++ team/oej/aum/app.c Wed Dec 14 14:56:24 2005
@@ -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/aum/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/apps/app_dial.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/apps/app_dial.c (original)
+++ team/oej/aum/apps/app_dial.c Wed Dec 14 14:56:24 2005
@@ -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/aum/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/apps/app_externalivr.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/apps/app_externalivr.c (original)
+++ team/oej/aum/apps/app_externalivr.c Wed Dec 14 14:56:24 2005
@@ -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/aum/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/apps/app_queue.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/apps/app_queue.c (original)
+++ team/oej/aum/apps/app_queue.c Wed Dec 14 14:56:24 2005
@@ -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;
}
Modified: team/oej/aum/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/apps/app_voicemail.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/apps/app_voicemail.c (original)
+++ team/oej/aum/apps/app_voicemail.c Wed Dec 14 14:56:24 2005
@@ -536,10 +536,10 @@
if (mailbox)
ast_copy_string(retval->mailbox, mailbox, sizeof(retval->mailbox));
populate_defaults(retval);
- if (ast_test_flag((&globalflags), VM_SEARCH))
+ if (!context && ast_test_flag((&globalflags), VM_SEARCH))
var = ast_load_realtime("voicemail", "mailbox", mailbox, NULL);
else
- var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL);
+ var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", context, NULL);
if (var) {
tmp = var;
while(tmp) {
@@ -582,7 +582,7 @@
while (cur) {
if (ast_test_flag((&globalflags), VM_SEARCH) && !strcasecmp(mailbox, cur->mailbox))
break;
- if ((!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
+ if (context && (!strcasecmp(context, cur->context)) && (!strcasecmp(mailbox, cur->mailbox)))
break;
cur=cur->next;
}
@@ -3674,7 +3674,7 @@
/* Strip off caller ID number from name */
ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
ast_callerid_parse(cid, &name, &callerid);
- if ((!res)&&(!ast_strlen_zero(callerid))){
+ if ((!ast_strlen_zero(callerid)) && strcmp(callerid, "Unknown")) {
/* Check for internal contexts and only */
/* say extension when the call didn't come from an internal context in the list */
for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){
@@ -3714,9 +3714,8 @@
} else {
/* Number unknown */
ast_log(LOG_DEBUG, "VM-CID: From an unknown number\n");
- if (!res)
- /* BB: Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
- res = wait_file2(chan, vms, "vm-unknown-caller");
+ /* Say "from an unknown caller" as one phrase - it is already recorded by "the voice" anyhow */
+ res = wait_file2(chan, vms, "vm-unknown-caller");
}
return res;
}
Modified: team/oej/aum/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/team/oej/aum/build_tools/make_svn_branch_name?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/build_tools/make_svn_branch_name (original)
+++ team/oej/aum/build_tools/make_svn_branch_name Wed Dec 14 14:56:24 2005
@@ -4,7 +4,7 @@
BRANCH=0
TEAM=0
-REV=`LANG=C svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'`
+REV=`svnversion -c . | cut -d: -f2`
if [ "${PARTS}" = "trunk" ]
then
Modified: team/oej/aum/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/channels/chan_agent.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/channels/chan_agent.c (original)
+++ team/oej/aum/channels/chan_agent.c Wed Dec 14 14:56:24 2005
@@ -1417,7 +1417,7 @@
/* Set a default status. It 'should' get changed. */
status = "AGENT_UNKNOWN";
- if (!ast_strlen_zero(p->loginchan)) {
+ if (!ast_strlen_zero(p->loginchan) && !p->chan) {
loginChan = p->loginchan;
talkingtoChan = "n/a";
status = "AGENT_IDLE";
Modified: team/oej/aum/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/channels/chan_sip.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/channels/chan_sip.c (original)
+++ team/oej/aum/channels/chan_sip.c Wed Dec 14 14:56:24 2005
@@ -1061,7 +1061,7 @@
res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->sa, sizeof(struct sockaddr_in));
if (res != len) {
- ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), res, ntohs(p->sa.sin_port), strerror(errno));
+ ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s:%d returned %d: %s\n", data, len, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), res, strerror(errno));
}
return res;
}
@@ -2275,6 +2275,7 @@
/* Possible values taken from causes.h */
switch(cause) {
+ case 603: /* Declined */
case 403: /* Not found */
return AST_CAUSE_CALL_REJECTED;
case 404: /* Not found */
@@ -2454,7 +2455,7 @@
if (ast->hangupcause && ((res = hangup_cause2sip(ast->hangupcause)))) {
transmit_response_reliable(p, res, &p->initreq, 1);
} else
- transmit_response_reliable(p, "403 Forbidden", &p->initreq, 1);
+ transmit_response_reliable(p, "603 Declined", &p->initreq, 1);
}
} else { /* Call is in UP state, send BYE */
if (!p->pendinginvite) {
Modified: team/oej/aum/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/aum/channels/chan_zap.c?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/channels/chan_zap.c (original)
+++ team/oej/aum/channels/chan_zap.c Wed Dec 14 14:56:24 2005
@@ -5269,6 +5269,7 @@
return NULL;
} else if (res) {
exten[len++] = res;
+ exten[len] = '\0';
} else
break;
}
@@ -5375,6 +5376,7 @@
default:
/* If we got the first digit, get the rest */
len = 1;
+ dtmfbuf[len] = '\0';
while((len < AST_MAX_EXTENSION-1) && ast_matchmore_extension(chan, chan->context, dtmfbuf, 1, p->cid_num)) {
if (ast_exists_extension(chan, chan->context, dtmfbuf, 1, p->cid_num)) {
timeout = matchdigittimeout;
@@ -5388,6 +5390,7 @@
return NULL;
} else if (res) {
dtmfbuf[len++] = res;
+ dtmfbuf[len] = '\0';
} else {
break;
}
Modified: team/oej/aum/configs/res_odbc.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/aum/configs/res_odbc.conf.sample?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/configs/res_odbc.conf.sample (original)
+++ team/oej/aum/configs/res_odbc.conf.sample Wed Dec 14 14:56:24 2005
@@ -1,17 +1,28 @@
;;; odbc setup file
+; ENV is a global set of environmental variables that will get set.
+; Note that all environmental variables can be seen by all connections,
+; so you can't have different values for different connections.
+[ENV]
+INFORMIXSERVER => my_special_database
+INFORMIXDIR => /opt/informix
+
+; All other sections are arbitrary names for database connections.
+
[asterisk]
+enabled => yes
dsn => asterisk
;username => myuser
;password => mypass
pre-connect => yes
-;[mysql2]
-;dsn => MySQL-asterisk
-;username => myuser
-;password => mypass
-;pre-connect => yes
+[mysql2]
+enabled => no
+dsn => MySQL-asterisk
+username => myuser
+password => mypass
+pre-connect => yes
Modified: team/oej/aum/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/aum/configs/sip.conf.sample?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/configs/sip.conf.sample (original)
+++ team/oej/aum/configs/sip.conf.sample Wed Dec 14 14:56:24 2005
@@ -148,7 +148,7 @@
;registerattempts=10 ; Number of registration attempts before we give up
; 0 = continue forever, hammering the other server until it
; accepts the registration
- ; Default is 10 tries
+ ; Default is 0 tries, continue forever
;callevents=no ; generate manager events when sip ua performs events (e.g. hold)
;----------------------------------------- NAT SUPPORT ------------------------
Modified: team/oej/aum/contrib/firmware/iax/iaxy.bin
URL: http://svn.digium.com/view/asterisk/team/oej/aum/contrib/firmware/iax/iaxy.bin?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
Binary files - no diff available.
Propchange: team/oej/aum/contrib/firmware/iax/iaxy.bin
('svn:eol-style' removed)
Propchange: team/oej/aum/contrib/firmware/iax/iaxy.bin
('svn:keywords' removed)
Propchange: team/oej/aum/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: team/oej/aum/contrib/firmware/iax/iaxy.bin
------------------------------------------------------------------------------
svn:needs-lock = *
Propchange: team/oej/aum/contrib/init.d/rc.debian.asterisk
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/oej/aum/contrib/init.d/rc.gentoo.asterisk
------------------------------------------------------------------------------
svn:executable = *
Modified: team/oej/aum/contrib/init.d/rc.mandrake.asterisk
URL: http://svn.digium.com/view/asterisk/team/oej/aum/contrib/init.d/rc.mandrake.asterisk?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/contrib/init.d/rc.mandrake.asterisk (original)
+++ team/oej/aum/contrib/init.d/rc.mandrake.asterisk Wed Dec 14 14:56:24 2005
@@ -15,7 +15,12 @@
NOTIFY=root # Who to notify about crashes
DUMPDROP=/tmp
HOSTNAME=`hostname`
-CONFIGFILE=/etc/sysconfig/`basename $0`
+if [ 0`readlink $0` = "0" ]; then
+ CONFIGFILE=/etc/sysconfig/`basename $0`
+else
+ CONFIG0=`readlink $0`
+ CONFIGFILE=/etc/sysconfig/`basename $CONFIG0`
+fi
# Setup environment
cd /usr/src
@@ -68,7 +73,7 @@
#{
#}
-SIGMSG=("Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault")
+SIGMSG=("None", "Hangup" "Interrupt" "Quit" "Illegal instruction" "Trace trap" "IOT Trap" "Bus Error" "Floating-point exception" "Killed" "User-defined signal 1" "Segmentation violation" "User-defined signal 2" "Broken pipe" "Alarm clock" "Termination" "Stack fault")
run_asterisk()
{
@@ -90,7 +95,7 @@
exit 0
elif [ $EXITSTATUS -gt 128 ]; then
EXITSIGNAL=$(($EXITSTATUS - 128))
- EXITMSG=$SIGMSG[$EXITSIGNAL]
+ EXITMSG=${SIGMSG[$EXITSIGNAL]}
echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG."
if [ "$NOTIFY" != "" ]; then
echo "Asterisk exited on signal $EXITSIGNAL - $EXITMSG. Might want to take a peek." | \
Propchange: team/oej/aum/contrib/init.d/rc.mandrake.asterisk
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/oej/aum/contrib/init.d/rc.mandrake.zaptel
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/oej/aum/contrib/init.d/rc.redhat.asterisk
------------------------------------------------------------------------------
svn:executable = *
Propchange: team/oej/aum/contrib/init.d/rc.slackware.asterisk
------------------------------------------------------------------------------
svn:executable = *
Modified: team/oej/aum/doc/README.variables
URL: http://svn.digium.com/view/asterisk/team/oej/aum/doc/README.variables?rev=7473&r1=7472&r2=7473&view=diff
==============================================================================
--- team/oej/aum/doc/README.variables (original)
+++ team/oej/aum/doc/README.variables Wed Dec 14 14:56:24 2005
@@ -94,17 +94,17 @@
-_______________________________
-REMOVING CHARACTERS FROM STRING
--------------------------------
-
-The format for removing characters from a variable can be expressed as:
+___________________________________
+SELECTING CHARACTERS FROM VARIABLES
+-----------------------------------
+
+The format for selecting characters from a variable can be expressed as:
${variable_name[:offset[:length]]}
-If you want to remove the first N characters from the string assigned
[... 1899 lines stripped ...]
More information about the asterisk-commits
mailing list