From fd0ca1c3f9b972a52d48a82b492fd6bac772dc78 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Fri, 22 Dec 2017 09:23:22 -0500 Subject: [PATCH] Remove as much trailing whitespace as possible. Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0 --- Makefile | 1 - Makefile.moddir_rules | 2 +- Makefile.rules | 4 +- UPGRADE-1.2.txt | 48 +- UPGRADE-1.4.txt | 77 +- UPGRADE-1.6.txt | 14 +- UPGRADE-1.8.txt | 15 +- UPGRADE-10.txt | 4 +- UPGRADE-11.txt | 6 +- UPGRADE-12.txt | 6 +- addons/app_mysql.c | 9 +- addons/cdr_mysql.c | 1 - addons/chan_mobile.c | 6 +- addons/chan_ooh323.c | 216 ++-- addons/chan_ooh323.h | 14 +- addons/format_mp3.c | 1 - addons/ooh323c/README | 35 +- addons/ooh323c/src/Makefile.in | 4 +- addons/ooh323c/src/context.c | 24 +- addons/ooh323c/src/decode.c | 118 +-- addons/ooh323c/src/dlist.c | 27 +- addons/ooh323c/src/dlist.h | 62 +- addons/ooh323c/src/encode.c | 104 +- addons/ooh323c/src/errmgmt.c | 50 +- addons/ooh323c/src/eventHandler.c | 18 +- addons/ooh323c/src/eventHandler.h | 88 +- .../ooh323c/src/h323/H235-SECURITY-MESSAGES.h | 10 +- .../src/h323/H235-SECURITY-MESSAGESDec.c | 11 +- .../src/h323/H235-SECURITY-MESSAGESEnc.c | 11 +- addons/ooh323c/src/h323/H323-MESSAGES.c | 11 +- addons/ooh323c/src/h323/H323-MESSAGES.h | 10 +- addons/ooh323c/src/h323/H323-MESSAGESDec.c | 11 +- addons/ooh323c/src/h323/H323-MESSAGESEnc.c | 11 +- .../src/h323/MULTIMEDIA-SYSTEM-CONTROL.c | 11 +- .../src/h323/MULTIMEDIA-SYSTEM-CONTROL.h | 10 +- .../src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c | 11 +- .../src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c | 11 +- addons/ooh323c/src/memheap.c | 335 +++--- addons/ooh323c/src/memheap.h | 10 +- addons/ooh323c/src/ooCalls.c | 153 ++- addons/ooh323c/src/ooCalls.h | 222 ++-- addons/ooh323c/src/ooCapability.c | 646 ++++++------ addons/ooh323c/src/ooCapability.h | 230 ++-- addons/ooh323c/src/ooCmdChannel.c | 59 +- addons/ooh323c/src/ooCmdChannel.h | 30 +- addons/ooh323c/src/ooCommon.h | 20 +- addons/ooh323c/src/ooDateTime.c | 17 +- addons/ooh323c/src/ooDateTime.h | 18 +- addons/ooh323c/src/ooGkClient.c | 452 ++++---- addons/ooh323c/src/ooGkClient.h | 90 +- addons/ooh323c/src/ooLogChan.c | 79 +- addons/ooh323c/src/ooLogChan.h | 60 +- addons/ooh323c/src/ooSocket.c | 148 +-- addons/ooh323c/src/ooSocket.h | 65 +- addons/ooh323c/src/ooStackCmds.c | 45 +- addons/ooh323c/src/ooStackCmds.h | 32 +- addons/ooh323c/src/ooTimer.c | 24 +- addons/ooh323c/src/ooTimer.h | 26 +- addons/ooh323c/src/ooUtils.c | 12 +- addons/ooh323c/src/ooUtils.h | 20 +- addons/ooh323c/src/ooasn1.h | 194 ++-- addons/ooh323c/src/oochannels.c | 376 +++---- addons/ooh323c/src/oochannels.h | 59 +- addons/ooh323c/src/ooh245.c | 993 +++++++++--------- addons/ooh323c/src/ooh245.h | 164 +-- addons/ooh323c/src/ooh323.c | 476 ++++----- addons/ooh323c/src/ooh323.h | 35 +- addons/ooh323c/src/ooh323ep.c | 127 ++- addons/ooh323c/src/ooh323ep.h | 126 +-- addons/ooh323c/src/oohdr.h | 10 +- addons/ooh323c/src/ooper.h | 11 +- addons/ooh323c/src/ooports.c | 16 +- addons/ooh323c/src/ooports.h | 20 +- addons/ooh323c/src/ooq931.c | 819 ++++++++------- addons/ooh323c/src/ooq931.h | 158 +-- addons/ooh323c/src/ootrace.c | 35 +- addons/ooh323c/src/ootrace.h | 24 +- addons/ooh323c/src/ootypes.h | 79 +- addons/ooh323c/src/perutil.c | 51 +- addons/ooh323c/src/printHandler.c | 22 +- addons/ooh323c/src/printHandler.h | 16 +- addons/ooh323c/src/rtctype.c | 10 +- addons/ooh323c/src/rtctype.h | 15 +- addons/ooh323cDriver.c | 122 ++- addons/ooh323cDriver.h | 10 +- addons/res_config_mysql.c | 7 +- agi/Makefile | 2 +- agi/eagi-sphinx-test.c | 4 +- agi/eagi-test.c | 4 +- agi/jukebox.agi | 4 +- apps/Makefile | 2 +- apps/app_adsiprog.c | 10 +- apps/app_amd.c | 16 +- apps/app_authenticate.c | 4 +- apps/app_chanisavail.c | 5 +- apps/app_chanspy.c | 28 +- apps/app_controlplayback.c | 2 +- apps/app_dahdiras.c | 14 +- apps/app_dial.c | 2 +- apps/app_dictate.c | 7 +- apps/app_directory.c | 12 +- apps/app_echo.c | 2 +- apps/app_externalivr.c | 37 +- apps/app_fax.c | 34 +- apps/app_festival.c | 29 +- apps/app_flash.c | 7 +- apps/app_followme.c | 42 +- apps/app_forkcdr.c | 2 +- apps/app_getcpeid.c | 4 +- apps/app_ices.c | 21 +- apps/app_image.c | 7 +- apps/app_ivrdemo.c | 13 +- apps/app_jack.c | 1 - apps/app_macro.c | 16 +- apps/app_meetme.c | 241 +++-- apps/app_milliwatt.c | 2 +- apps/app_minivm.c | 146 +-- apps/app_morsecode.c | 3 +- apps/app_mp3.c | 19 +- apps/app_nbscat.c | 15 +- apps/app_page.c | 1 - apps/app_playback.c | 24 +- apps/app_queue.c | 3 +- apps/app_read.c | 10 +- apps/app_readexten.c | 4 +- apps/app_record.c | 6 +- apps/app_saycounted.c | 1 - apps/app_sayunixtime.c | 12 +- apps/app_senddtmf.c | 2 +- apps/app_sendtext.c | 4 +- apps/app_setcallerid.c | 5 +- apps/app_skel.c | 6 +- apps/app_sms.c | 43 +- apps/app_softhangup.c | 10 +- apps/app_speech_utils.c | 14 +- apps/app_stack.c | 6 +- apps/app_statsd.c | 846 +++++++-------- apps/app_system.c | 6 +- apps/app_talkdetect.c | 11 +- apps/app_test.c | 3 +- apps/app_transfer.c | 2 +- apps/app_url.c | 15 +- apps/app_userevent.c | 2 +- apps/app_voicemail.c | 392 +++---- apps/app_waitforring.c | 3 +- apps/app_while.c | 14 +- apps/app_zapateller.c | 15 +- apps/enter.h | 548 +++++----- apps/leave.h | 388 +++---- autoconf/ast_c_compile_check.m4 | 2 +- autoconf/ast_c_declare_check.m4 | 2 +- autoconf/ast_c_define_check.m4 | 2 +- autoconf/ast_check_osptk.m4 | 3 +- autoconf/ast_check_pwlib.m4 | 8 +- autoconf/ast_pkgconfig.m4 | 1 - bridges/Makefile | 2 +- bridges/bridge_holding.c | 1 - build_tools/make_buildopts_h | 2 +- build_tools/make_defaults_h | 2 +- build_tools/make_sample_voicemail | 6 +- build_tools/make_version | 6 +- build_tools/sha1sum-sh | 1 - cdr/cdr_adaptive_odbc.c | 1 - cdr/cdr_beanstalkd.c | 1 - cdr/cdr_custom.c | 1 - cdr/cdr_radius.c | 2 +- cel/Makefile | 2 +- cel/cel_custom.c | 1 - cel/cel_odbc.c | 3 +- channels/Makefile | 1 - channels/chan_alsa.c | 20 +- channels/chan_console.c | 72 +- channels/chan_iax2.c | 2 +- channels/chan_motif.c | 4 +- channels/chan_nbs.c | 11 +- channels/chan_oss.c | 15 +- channels/chan_phone.c | 51 +- channels/chan_phone.h | 478 ++++----- channels/chan_pjsip.c | 2 +- channels/chan_unistim.c | 10 +- channels/chan_vpb.cc | 170 +-- channels/console_board.c | 6 +- channels/console_gui.c | 76 +- channels/console_video.c | 36 +- channels/console_video.h | 2 +- channels/iax2/include/iax2.h | 4 +- channels/iax2/include/parser.h | 4 +- channels/iax2/parser.c | 26 +- channels/iax2/provision.c | 22 +- channels/misdn/ie.c | 1 - channels/misdn/isdn_lib.c | 2 - channels/sig_analog.h | 4 +- channels/sip/config_parser.c | 1 - channels/sip/dialplan_functions.c | 3 +- channels/sip/include/config_parser.h | 2 +- channels/sip/include/globals.h | 1 - channels/sip/include/reqresp_parser.h | 2 +- channels/sip/security_events.c | 1 - channels/vcodecs.c | 14 +- channels/vgrabbers.c | 4 +- codecs/Makefile | 2 +- codecs/codec_adpcm.c | 10 +- codecs/codec_alaw.c | 6 +- codecs/codec_g722.c | 6 +- codecs/codec_g726.c | 2 +- codecs/codec_gsm.c | 4 +- codecs/codec_lpc10.c | 4 +- codecs/codec_resample.c | 4 +- codecs/codec_speex.c | 22 +- codecs/codec_ulaw.c | 2 +- codecs/ex_ilbc.h | 8 +- codecs/g722/g722.h | 4 +- codecs/g722/g722_decode.c | 14 +- codecs/g722/g722_encode.c | 8 +- codecs/gsm/Makefile | 16 +- codecs/gsm/README | 2 +- codecs/gsm/inc/gsm.h | 2 +- codecs/gsm/inc/private.h | 14 +- codecs/gsm/inc/proto.h | 2 +- codecs/gsm/src/add.c | 8 +- codecs/gsm/src/code.c | 6 +- codecs/gsm/src/debug.c | 2 +- codecs/gsm/src/gsm_decode.c | 4 +- codecs/gsm/src/gsm_explode.c | 6 +- codecs/gsm/src/gsm_implode.c | 6 +- codecs/gsm/src/gsm_option.c | 2 +- codecs/gsm/src/k6opt.h | 12 +- codecs/gsm/src/long_term.c | 16 +- codecs/gsm/src/lpc.c | 10 +- codecs/gsm/src/preprocess.c | 12 +- codecs/gsm/src/rpe.c | 36 +- codecs/gsm/src/short_term.c | 4 +- codecs/gsm/src/table.c | 2 +- codecs/ilbc/FrameClassify.c | 1 - codecs/ilbc/FrameClassify.h | 1 - codecs/ilbc/LPCdecode.c | 6 - codecs/ilbc/LPCdecode.h | 12 - codecs/ilbc/LPCencode.c | 1 - codecs/ilbc/LPCencode.h | 1 - codecs/ilbc/StateConstructW.c | 12 - codecs/ilbc/StateConstructW.h | 1 - codecs/ilbc/StateSearchW.c | 11 - codecs/ilbc/StateSearchW.h | 8 - codecs/ilbc/anaFilter.c | 1 - codecs/ilbc/anaFilter.h | 1 - codecs/ilbc/constants.c | 1 - codecs/ilbc/constants.h | 1 - codecs/ilbc/createCB.c | 1 - codecs/ilbc/createCB.h | 1 - codecs/ilbc/doCPLC.c | 1 - codecs/ilbc/doCPLC.h | 1 - codecs/ilbc/enhancer.c | 1 - codecs/ilbc/enhancer.h | 1 - codecs/ilbc/extract-cfile.awk | 2 +- codecs/ilbc/filter.c | 1 - codecs/ilbc/filter.h | 1 - codecs/ilbc/gainquant.c | 6 - codecs/ilbc/gainquant.h | 1 - codecs/ilbc/getCBvec.c | 1 - codecs/ilbc/getCBvec.h | 1 - codecs/ilbc/helpfun.c | 1 - codecs/ilbc/helpfun.h | 1 - codecs/ilbc/hpInput.c | 1 - codecs/ilbc/hpInput.h | 1 - codecs/ilbc/hpOutput.c | 1 - codecs/ilbc/hpOutput.h | 1 - codecs/ilbc/iCBConstruct.c | 1 - codecs/ilbc/iCBConstruct.h | 1 - codecs/ilbc/iCBSearch.c | 9 - codecs/ilbc/iCBSearch.h | 1 - codecs/ilbc/iLBC_decode.c | 1 - codecs/ilbc/iLBC_decode.h | 1 - codecs/ilbc/iLBC_define.h | 1 - codecs/ilbc/iLBC_encode.c | 1 - codecs/ilbc/iLBC_encode.h | 6 - codecs/ilbc/iLBC_test.c | 1 - codecs/ilbc/lsf.c | 7 - codecs/ilbc/lsf.h | 1 - codecs/ilbc/packing.c | 1 - codecs/ilbc/packing.h | 1 - codecs/ilbc/rfc3951.txt | 387 ++++--- codecs/ilbc/syntFilter.c | 14 - codecs/ilbc/syntFilter.h | 1 - codecs/log2comp.h | 8 +- codecs/lpc10/Makefile | 12 +- codecs/lpc10/analys.c | 68 +- codecs/lpc10/bsynz.c | 28 +- codecs/lpc10/chanwr.c | 8 +- codecs/lpc10/dcbias.c | 1 - codecs/lpc10/decode.c | 34 +- codecs/lpc10/difmag.c | 3 +- codecs/lpc10/dyptrk.c | 38 +- codecs/lpc10/encode.c | 23 +- codecs/lpc10/energy.c | 1 - codecs/lpc10/f2c.h | 6 +- codecs/lpc10/ham84.c | 1 - codecs/lpc10/invert.c | 1 - codecs/lpc10/irc2pc.c | 1 - codecs/lpc10/ivfilt.c | 1 - codecs/lpc10/lpc10.h | 4 +- codecs/lpc10/lpcdec.c | 26 +- codecs/lpc10/lpcenc.c | 8 +- codecs/lpc10/lpcini.c | 22 +- codecs/lpc10/lpfilt.c | 1 - codecs/lpc10/median.c | 1 - codecs/lpc10/mload.c | 13 +- codecs/lpc10/onset.c | 24 +- codecs/lpc10/pitsyn.c | 38 +- codecs/lpc10/placea.c | 9 +- codecs/lpc10/placev.c | 19 +- codecs/lpc10/preemp.c | 5 +- codecs/lpc10/random.c | 1 - codecs/lpc10/rcchk.c | 3 +- codecs/lpc10/synths.c | 34 +- codecs/lpc10/tbdm.c | 7 +- codecs/lpc10/voicin.c | 60 +- codecs/lpc10/vparms.c | 5 +- codecs/speex/arch.h | 12 +- codecs/speex/fixed_generic.h | 8 +- codecs/speex/resample.c | 84 +- codecs/speex/resample_sse.h | 8 +- codecs/speex/speex_resampler.h | 116 +- codecs/speex/stack_alloc.h | 10 +- configs/basic-pbx/indications.conf | 1 - configs/basic-pbx/pjsip.conf | 1 - configs/samples/alsa.conf.sample | 1 - configs/samples/ari.conf.sample | 1 - configs/samples/asterisk.adsi | 1 - configs/samples/asterisk.conf.sample | 2 +- configs/samples/calendar.conf.sample | 2 +- configs/samples/cdr_adaptive_odbc.conf.sample | 1 - configs/samples/cdr_beanstalkd.conf.sample | 6 - configs/samples/cdr_mysql.conf.sample | 11 +- configs/samples/cdr_tds.conf.sample | 1 - configs/samples/cel.conf.sample | 2 +- configs/samples/chan_dahdi.conf.sample | 12 +- configs/samples/chan_mobile.conf.sample | 4 +- configs/samples/codecs.conf.sample | 1 - configs/samples/dbsep.conf.sample | 1 - configs/samples/dsp.conf.sample | 1 - configs/samples/extconfig.conf.sample | 1 - configs/samples/extensions.lua.sample | 1 - configs/samples/extensions_minivm.conf.sample | 1 - configs/samples/festival.conf.sample | 1 - configs/samples/followme.conf.sample | 2 - configs/samples/func_odbc.conf.sample | 1 - configs/samples/iaxprov.conf.sample | 1 - configs/samples/manager.conf.sample | 3 +- configs/samples/mgcp.conf.sample | 34 +- configs/samples/ooh323.conf.sample | 5 - configs/samples/oss.conf.sample | 1 - configs/samples/phoneprov.conf.sample | 1 - configs/samples/queuerules.conf.sample | 1 - configs/samples/queues.conf.sample | 2 +- configs/samples/res_config_mysql.conf.sample | 2 +- configs/samples/res_fax.conf.sample | 2 +- configs/samples/res_ldap.conf.sample | 7 +- configs/samples/res_pgsql.conf.sample | 2 +- configs/samples/res_snmp.conf.sample | 2 +- configs/samples/resolver_unbound.conf.sample | 1 - configs/samples/say.conf.sample | 10 +- configs/samples/sip.conf.sample | 34 +- configs/samples/skinny.conf.sample | 1 - configs/samples/sla.conf.sample | 3 +- configs/samples/users.conf.sample | 1 - configs/samples/voicemail.conf.sample | 6 +- configs/samples/xmpp.conf.sample | 1 - contrib/README.festival | 18 +- .../versions/210693f3123d_create_cdr_table.py | 1 - ...8e8bbf6b_increase_useragent_column_size.py | 1 - .../28887f25a46f_create_queue_tables.py | 1 - ...c67fa9b7a_add_fax_detect_timeout_option.py | 1 - ...fb_ps_contacts_add_authenticate_qualify.py | 1 - ..._ps_globals_add_ignore_uri_user_options.py | 1 - .../d39508cb8d8_create_queue_rules.py | 1 - contrib/ast-db-manage/env.py | 1 - ...8242f7f5_increase_recording_column_size.py | 1 - contrib/asterisk-ices.xml | 6 +- contrib/init.d/rc.debian.asterisk | 2 +- contrib/init.d/rc.mandriva.asterisk | 15 +- contrib/init.d/rc.mandriva.zaptel | 1 - contrib/init.d/rc.redhat.asterisk | 2 +- contrib/init.d/rc.slackware.asterisk | 1 - contrib/init.d/rc.suse.asterisk | 2 +- contrib/scripts/README.messages-expire | 6 +- contrib/scripts/ast_tls_cert | 2 +- contrib/scripts/astcli | 5 +- contrib/scripts/astgenkey.8 | 44 +- contrib/scripts/autosupport | 52 +- contrib/scripts/autosupport.8 | 20 +- contrib/scripts/dbsep.cgi | 1 - contrib/scripts/managerproxy.pl | 5 +- contrib/scripts/messages-expire.pl | 6 +- .../scripts/retrieve_extensions_from_mysql.pl | 7 +- .../scripts/retrieve_extensions_from_sql.pl | 2 +- .../scripts/retrieve_sip_conf_from_mysql.pl | 5 +- contrib/scripts/safe_asterisk.8 | 38 +- contrib/scripts/sip_nat_settings | 14 +- contrib/upstart/asterisk.user.conf | 1 - contrib/utils/README.rawplayer | 9 +- contrib/utils/eagi_proxy.c | 40 +- contrib/utils/rawplayer.c | 5 +- contrib/utils/zones2indications.c | 16 +- doc/Makefile | 1 - doc/README.txt | 2 +- doc/astdb2bdb.8 | 1 - doc/astdb2sqlite3.8 | 1 - doc/asterisk.8 | 74 +- doc/asterisk.sgml | 18 +- doc/lang/language-criteria.txt | 2 +- formats/Makefile | 2 +- formats/format_g719.c | 3 +- formats/format_g723.c | 12 +- formats/format_g726.c | 10 +- formats/format_g729.c | 6 +- formats/format_gsm.c | 2 +- formats/format_h263.c | 2 +- formats/format_h264.c | 2 +- formats/format_ilbc.c | 4 +- formats/format_jpeg.c | 4 +- formats/format_ogg_vorbis.c | 6 +- formats/format_pcm.c | 8 +- formats/format_siren14.c | 2 +- formats/format_siren7.c | 2 +- formats/format_sln.c | 2 +- formats/format_vox.c | 6 +- formats/format_wav.c | 18 +- formats/format_wav_gsm.c | 4 +- formats/msgsm.h | 4 +- funcs/Makefile | 2 +- funcs/func_audiohookinherit.c | 1 - funcs/func_base64.c | 2 +- funcs/func_blacklist.c | 2 +- funcs/func_config.c | 4 +- funcs/func_curl.c | 9 +- funcs/func_cut.c | 8 +- funcs/func_db.c | 4 +- funcs/func_devstate.c | 4 +- funcs/func_dialplan.c | 2 +- funcs/func_enum.c | 26 +- funcs/func_extstate.c | 8 +- funcs/func_frame_trace.c | 2 - funcs/func_global.c | 2 +- funcs/func_groupcount.c | 12 +- funcs/func_iconv.c | 9 +- funcs/func_jitterbuffer.c | 1 - funcs/func_lock.c | 8 +- funcs/func_logic.c | 8 +- funcs/func_md5.c | 4 +- funcs/func_odbc.c | 9 +- funcs/func_pitchshift.c | 1 - funcs/func_presencestate.c | 7 +- funcs/func_rand.c | 8 +- funcs/func_sha1.c | 4 +- funcs/func_sorcery.c | 1 - funcs/func_speex.c | 22 +- funcs/func_sprintf.c | 4 +- funcs/func_srv.c | 4 +- funcs/func_strings.c | 34 +- funcs/func_sysinfo.c | 5 +- funcs/func_timeout.c | 4 +- funcs/func_uri.c | 6 +- funcs/func_version.c | 2 +- funcs/func_vmcount.c | 6 +- funcs/func_volume.c | 18 +- include/asterisk/abstract_jb.h | 2 +- include/asterisk/adsi.h | 1 - include/asterisk/ael_structs.h | 14 +- include/asterisk/agi.h | 2 +- include/asterisk/ast_expr.h | 4 +- include/asterisk/astobj.h | 52 +- include/asterisk/astosp.h | 2 +- include/asterisk/autochan.h | 2 +- include/asterisk/calendar.h | 4 +- include/asterisk/ccss.h | 4 +- include/asterisk/cel.h | 4 +- include/asterisk/cli.h | 20 +- include/asterisk/compat.h | 4 +- include/asterisk/config.h | 2 +- include/asterisk/config_options.h | 4 +- include/asterisk/core_unreal.h | 2 +- include/asterisk/doxygen/architecture.h | 1 - include/asterisk/doxygen/licensing.h | 2 +- include/asterisk/doxyref.h | 98 +- include/asterisk/dundi.h | 12 +- include/asterisk/endian.h | 1 - include/asterisk/event_defs.h | 2 +- include/asterisk/file.h | 92 +- include/asterisk/format.h | 2 +- include/asterisk/framehook.h | 6 +- include/asterisk/fskmodem.h | 1 - include/asterisk/fskmodem_int.h | 4 +- include/asterisk/image.h | 20 +- include/asterisk/indications.h | 4 +- include/asterisk/io.h | 36 +- include/asterisk/manager.h | 18 +- include/asterisk/message.h | 2 +- include/asterisk/mod_format.h | 16 +- include/asterisk/module.h | 58 +- include/asterisk/netsock2.h | 2 +- include/asterisk/paths.h | 2 +- include/asterisk/pbx.h | 2 +- include/asterisk/pktccops.h | 2 +- include/asterisk/presencestate.h | 1 - include/asterisk/pval.h | 20 +- include/asterisk/res_fax.h | 2 +- include/asterisk/res_odbc.h | 10 +- include/asterisk/res_pjsip_session.h | 8 +- include/asterisk/sched.h | 10 +- include/asterisk/select.h | 2 +- include/asterisk/smdi.h | 12 +- include/asterisk/speech.h | 2 +- include/asterisk/srv.h | 4 +- include/asterisk/statsd.h | 1 - include/asterisk/stringfields.h | 12 +- include/asterisk/strings.h | 30 +- include/asterisk/tcptls.h | 6 +- include/asterisk/tdd.h | 10 +- include/asterisk/threadstorage.h | 6 +- include/asterisk/timing.h | 2 +- include/asterisk/translate.h | 14 +- include/asterisk/udptl.h | 14 +- include/asterisk/xml.h | 1 - include/jitterbuf.h | 18 +- include/solaris-compat/sys/queue.h | 5 +- install-sh | 16 +- main/acl.c | 1 - main/alaw.c | 1 - main/app.c | 1 - main/ast_expr2.c | 201 ++-- main/ast_expr2.h | 13 +- main/ast_expr2.y | 196 ++-- main/ast_expr2f.c | 73 +- main/astfd.c | 1 - main/astobj2_container.c | 1 - main/astobj2_hash.c | 1 - main/astobj2_rbtree.c | 1 - main/bridge_basic.c | 1 - main/ccss.c | 2 +- main/db.c | 4 +- main/dns.c | 1 - main/editline/INSTALL | 4 +- main/editline/chared.c | 4 +- main/editline/configure | 36 +- main/editline/configure.in | 15 +- main/editline/install-sh | 16 +- main/editline/np/unvis.c | 34 +- main/editline/np/vis.c | 12 +- main/editline/read.h | 2 +- main/editline/readline.c | 4 +- main/editline/refresh.c | 4 +- main/editline/term.c | 2 +- main/format_cache.c | 1 - main/format_compatibility.c | 1 - main/fskmodem.c | 1 - main/indications.c | 1 - main/manager_channels.c | 1 - main/manager_endpoints.c | 1 - main/media_index.c | 1 - main/pbx.c | 4 +- main/pbx_sw.c | 1 - main/plc.c | 2 +- main/poll.c | 2 - main/rtp_engine.c | 2 +- main/say.c | 6 +- main/sdp_srtp.c | 1 - main/sdp_state.c | 1 - main/security_events.c | 2 - main/smoother.c | 1 - main/stasis.c | 1 - main/stasis_cache.c | 1 - main/stasis_cache_pattern.c | 1 - main/stdtime/localtime.c | 1 - main/tdd.c | 1 - main/threadpool.c | 2 +- main/threadstorage.c | 5 +- main/ulaw.c | 1 - main/xml.c | 1 - main/xmldoc.c | 2 - menuselect/Makefile | 2 +- menuselect/README | 12 +- menuselect/autoconfig.h.in | 1 - menuselect/contrib/Makefile-dummy | 1 - menuselect/contrib/menuselect-dummy | 58 +- menuselect/linkedlists.h | 2 +- menuselect/make_version | 16 +- menuselect/makeopts.in | 1 - menuselect/menuselect_curses.c | 22 +- menuselect/menuselect_gtk.c | 8 +- menuselect/menuselect_stub.c | 2 +- menuselect/strcompat.c | 4 +- pbx/Makefile | 2 +- pbx/ael/ael-test/ael-ntest12/extensions.ael | 4 +- pbx/ael/ael-test/ael-ntest22/extensions.ael | 2 +- pbx/ael/ael-test/ael-ntest22/t2/f.ael | 1 - pbx/ael/ael-test/ael-ntest23/t2/f.ael | 1 - pbx/ael/ael-test/ael-ntest24/extensions.ael | 2 - pbx/ael/ael-test/ael-ntest9/extensions.ael | 1 - pbx/ael/ael-test/ael-test1/extensions.ael | 20 +- pbx/ael/ael-test/ael-test11/extensions.ael | 2 +- pbx/ael/ael-test/ael-test16/extensions.ael | 1 - pbx/ael/ael-test/ael-test18/extensions.ael | 1 - pbx/ael/ael-test/ael-test19/extensions.ael | 12 +- pbx/ael/ael-test/ael-test2/extensions.ael | 3 +- pbx/ael/ael-test/ael-test20/extensions.ael | 1 - pbx/ael/ael-test/ael-test3/extensions.ael | 398 ++++--- .../ael-test3/telemarket_torture.ael2 | 50 +- pbx/ael/ael-test/ael-test4/extensions.ael | 3 +- pbx/ael/ael-test/ael-test7/extensions.ael | 9 +- pbx/ael/ael-test/ael-test8/extensions.ael | 1 - pbx/ael/ael-test/ael-vtest13/extensions.ael | 398 ++++--- .../ael-vtest13/telemarket_torture.ael2 | 50 +- pbx/ael/ael-test/ael-vtest17/extensions.ael | 6 +- pbx/ael/ael-test/ael-vtest21/extensions.ael | 1 - pbx/ael/ael-test/runtests | 2 +- pbx/dundi-parser.c | 20 +- pbx/pbx_ael.c | 20 +- pbx/pbx_config.c | 30 +- pbx/pbx_dundi.c | 7 +- pbx/pbx_lua.c | 99 +- pbx/pbx_realtime.c | 7 +- pbx/pbx_spool.c | 4 +- res/Makefile | 2 +- res/ael/ael.flex | 28 +- res/ael/ael.tab.c | 18 +- res/ael/ael.tab.h | 13 +- res/ael/ael.y | 11 +- res/ael/ael_lex.c | 95 +- res/ael/pval.c | 843 ++++++++------- res/ari/ari_model_validators.h | 2 +- res/ari/resource_events.c | 2 +- res/res_ael_share.c | 2 +- res/res_calendar.c | 8 +- res/res_calendar_caldav.c | 2 +- res/res_calendar_icalendar.c | 2 +- res/res_clialiases.c | 8 +- res/res_config_curl.c | 2 +- res/res_config_ldap.c | 48 +- res/res_config_odbc.c | 10 +- res/res_config_sqlite.c | 10 +- res/res_config_sqlite3.c | 6 +- res/res_convert.c | 20 +- res/res_corosync.c | 1 - res/res_curl.c | 8 +- res/res_fax_spandsp.c | 4 +- res/res_format_attr_silk.c | 2 +- res/res_http_post.c | 4 +- res/res_limit.c | 3 +- res/res_monitor.c | 28 +- res/res_musiconhold.c | 44 +- res/res_mwi_external_ami.c | 1 - res/res_odbc.c | 8 +- res/res_phoneprov.c | 2 +- res/res_pjsip/location.c | 1 - res/res_pjsip/pjsip_global_headers.c | 4 +- res/res_pjsip/pjsip_options.c | 2 +- res/res_pjsip/pjsip_session.c | 1 - res/res_pjsip_pubsub.c | 2 +- res/res_pktccops.c | 71 +- res/res_realtime.c | 10 +- res/res_rtp_multicast.c | 2 +- res/res_smdi.c | 34 +- res/res_snmp.c | 4 +- res/res_sorcery_realtime.c | 2 +- res/res_srtp.c | 4 +- res/res_timing_dahdi.c | 8 +- res/res_timing_pthread.c | 2 +- res/snmp/agent.c | 2 +- res/stasis/app.c | 2 - .../ari_model_validators.h.mustache | 2 +- sample.call | 1 - sounds/Makefile | 2 +- static-http/ajamdemo.html | 40 +- static-http/astman.css | 2 +- static-http/astman.js | 8 +- static-http/mantest.html | 6 +- tests/Makefile | 2 +- tests/test_acl.c | 2 +- tests/test_ami_security_events.sh | 1 - tests/test_config.c | 1 - tests/test_dlinklists.c | 28 +- tests/test_locale.c | 2 +- tests/test_skel.c | 4 +- tests/test_substitution.c | 2 +- third-party/Makefile | 1 - third-party/configure.m4 | 1 - third-party/pjproject/apply_patches | 1 - .../pjproject/patches/asterisk_malloc_debug.c | 2 - utils/Makefile | 8 +- utils/astcanary.c | 1 - utils/astman.1 | 34 +- utils/conf2ael.c | 88 +- utils/db1-ast/hash/README | 18 +- utils/db1-ast/hash/hash_page.c | 2 +- utils/db1-ast/include/db.h | 2 +- utils/db1-ast/recno/rec_search.c | 2 +- utils/db1-ast/recno/rec_seq.c | 2 +- utils/extconf.c | 1 - utils/frame.c | 1 - utils/stereorize.c | 2 +- 700 files changed, 9249 insertions(+), 9661 deletions(-) diff --git a/Makefile b/Makefile index e37dd90fd2..afd50c3cc9 100644 --- a/Makefile +++ b/Makefile @@ -1113,4 +1113,3 @@ FORCE: # This only stops targets within the root Makefile from building in parallel. .NOTPARALLEL: - diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 59190bece9..917c8e08ca 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -38,7 +38,7 @@ ifneq ($(MODULE_PREFIX),) ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c))) ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc))) endif - + C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS)) CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS)) diff --git a/Makefile.rules b/Makefile.rules index ee8eabd6f8..2273644100 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile rules # # Copyright (C) 2006-2010, Digium, Inc. @@ -55,7 +55,7 @@ ifeq ($(NOISY_BUILD),) ECHO_PREFIX=@ CMD_PREFIX=@ else - ECHO_PREFIX=@\# + ECHO_PREFIX=@\# CMD_PREFIX= endif diff --git a/UPGRADE-1.2.txt b/UPGRADE-1.2.txt index cd647c47b3..cfbff945fd 100644 --- a/UPGRADE-1.2.txt +++ b/UPGRADE-1.2.txt @@ -37,9 +37,9 @@ Dialplan Expressions: Agents: -* The default for ackcall has been changed to "no" instead of "yes" +* The default for ackcall has been changed to "no" instead of "yes" because of a bug which caused the "yes" behavior to generally act like - "no". You may need to adjust the value if your agents behave + "no". You may need to adjust the value if your agents behave differently than you expect with respect to acknowledgement. * The AgentCallBackLogin application now requires a second '|' before @@ -56,16 +56,16 @@ Parking: Dialing: -* The Caller*ID of the outbound leg is now the extension that was - called, rather than the Caller*ID of the inbound leg of the call. The - "o" flag for Dial can be used to restore the original behavior if +* The Caller*ID of the outbound leg is now the extension that was + called, rather than the Caller*ID of the inbound leg of the call. The + "o" flag for Dial can be used to restore the original behavior if desired. Note that if you are looking for the originating callerid - from the manager event, there is a new manager event "Dial" which + from the manager event, there is a new manager event "Dial" which provides the source and destination channels and callerid. -IAX: +IAX: -* The naming convention for IAX channels has changed in two ways: +* The naming convention for IAX channels has changed in two ways: 1. The call number follows a "-" rather than a "/" character. 2. The name of the channel has been simplified to IAX2/peer-callno, rather than IAX2/peer@peer-callno or even IAX2/peer@peer/callno. @@ -77,7 +77,7 @@ SIP: the other channel drivers and to avoid confusion with the "port" option for users/peers. -* The "Registry" event now uses "Username" rather than "User" for +* The "Registry" event now uses "Username" rather than "User" for consistency with IAX. Applications: @@ -85,7 +85,7 @@ Applications: * With the addition of dialplan functions (which operate similarly to variables), the SetVar application has been renamed to Set. -* The CallerPres application has been removed. Use SetCallerPres +* The CallerPres application has been removed. Use SetCallerPres instead. It accepts both numeric and symbolic names. * The applications GetGroupCount, GetGroupMatchCount, SetGroup, and @@ -145,7 +145,7 @@ Applications: moved to option 5. * The application VoiceMailMain now only matches the 'default' context if - none is specified in the arguments. (This was the previously + none is specified in the arguments. (This was the previously documented behavior, however, we didn't follow that behavior.) The old behavior can be restored by setting searchcontexts=yes in voicemail.conf. @@ -153,7 +153,7 @@ Queues: * A queue is now considered empty not only if there are no members but if none of the members are available (e.g. agents not logged on). To - restore the original behavior, use "leavewhenempty=strict" or + restore the original behavior, use "leavewhenempty=strict" or "joinwhenempty=strict" instead of "=yes" for those options. * It is now possible to use multi-digit extensions in the exit context @@ -165,8 +165,8 @@ Queues: Extensions: * By default, there is a new option called "autofallthrough" in - extensions.conf that is set to yes. Asterisk 1.0 (and earlier) - behavior was to wait for an extension to be dialed after there were no + extensions.conf that is set to yes. Asterisk 1.0 (and earlier) + behavior was to wait for an extension to be dialed after there were no more extensions to execute. "autofallthrough" changes this behavior so that the call will immediately be terminated with BUSY, CONGESTION, or HANGUP based on Asterisk's best guess. If you are @@ -175,9 +175,9 @@ Extensions: AGI: -* AGI scripts did not always get SIGHUP at the end, previously. That - behavior has been fixed. If you do not want your script to terminate - at the end of AGI being called (e.g. on a hangup) then set SIGHUP to +* AGI scripts did not always get SIGHUP at the end, previously. That + behavior has been fixed. If you do not want your script to terminate + at the end of AGI being called (e.g. on a hangup) then set SIGHUP to be ignored within your application. * CallerID is reported with agi_callerid and agi_calleridname instead @@ -199,13 +199,13 @@ chan_modem: MeetMe: * The conference application now allows users to increase/decrease their - speaking volume and listening volume (independently of each other and - other users); the 'admin' and 'user' menus have changed, and new sound - files are included with this release. However, if a user calling in - over a Zaptel channel that does NOT have hardware DTMF detection - increases their speaking volume, it is likely they will no longer be - able to enter/exit the menu or make any further adjustments, as the - software DTMF detector will not be able to recognize the DTMF coming + speaking volume and listening volume (independently of each other and + other users); the 'admin' and 'user' menus have changed, and new sound + files are included with this release. However, if a user calling in + over a Zaptel channel that does NOT have hardware DTMF detection + increases their speaking volume, it is likely they will no longer be + able to enter/exit the menu or make any further adjustments, as the + software DTMF detector will not be able to recognize the DTMF coming from their device. GetVar Manager Action: diff --git a/UPGRADE-1.4.txt b/UPGRADE-1.4.txt index f99f937b0f..74cb1e5b4a 100644 --- a/UPGRADE-1.4.txt +++ b/UPGRADE-1.4.txt @@ -34,7 +34,7 @@ users, that will result in a similar build to what they would have had before the configure script was added to the build process (except for having to run 'make' again after the configure script is run). Note that the configure script does NOT need to be re-run just to rebuild Asterisk; you only need to re-run it -when your system configuration changes or you wish to build Asterisk with +when your system configuration changes or you wish to build Asterisk with different options. Build Process (module selection): @@ -42,7 +42,7 @@ Build Process (module selection): The Asterisk source tree now includes a basic module selection and build option selection tool called 'menuselect'. Run 'make menuselect' to make your choices. In this tool, you can disable building of modules that you don't care about, -turn on/off global options for the build and see which modules will not +turn on/off global options for the build and see which modules will not (and cannot) be built because your system does not have the required external dependencies installed. @@ -55,7 +55,7 @@ interface. In this case, the resulting file contains which CFLAGS are in use, not which ones are not in use. If you would like to save your choices and have them applied against all -builds, the file can be copied to '~/.asterisk.makeopts' or +builds, the file can be copied to '~/.asterisk.makeopts' or '/etc/asterisk.makeopts'. Build Process (Makefile targets): @@ -105,10 +105,10 @@ PBX Core: * The (very old and undocumented) ability to use BYEXTENSION for dialing instead of ${EXTEN} has been removed. - + * Builtin (res_features) transfer functionality attempts to use the context defined in TRANSFER_CONTEXT variable of the transferer channel first. If - not set, it uses the transferee variable. If not set in any channel, it will + not set, it uses the transferee variable. If not set in any channel, it will attempt to use the last non macro context. If not possible, it will default to the current context. @@ -116,7 +116,7 @@ PBX Core: if your dialplan relies on the ability to 'run off the end' of an extension and wait for a new extension without using WaitExten() to accomplish that, you will need set autofallthrough to 'no' in your extensions.conf file. - + Command Line Interface: * 'show channels concise', designed to be used by applications that will parse @@ -155,10 +155,10 @@ Applications: * OSPAuth is added to authenticate OSP tokens in in_bound call setup messages. -* The CONNECT event in the queue_log from app_queue now has a second field - in addition to the holdtime field. It contains the unique ID of the - queue member channel that is taking the call. This is useful when trying - to link recording filenames back to a particular call from the queue. +* The CONNECT event in the queue_log from app_queue now has a second field + in addition to the holdtime field. It contains the unique ID of the + queue member channel that is taking the call. This is useful when trying + to link recording filenames back to a particular call from the queue. * The old/current behavior of app_queue has a serial type behavior in that the queue will make all waiting callers wait in the queue @@ -170,14 +170,14 @@ Applications: waits while this happens. This cycle continues until there are no more available members or waiting callers, whichever comes first. The new behavior, enabled by setting autofill=yes in queues.conf - either at the [general] level to default for all queues or - to set on a per-queue level, makes sure that when the waiting - callers are connecting with available members in a parallel fashion + either at the [general] level to default for all queues or + to set on a per-queue level, makes sure that when the waiting + callers are connecting with available members in a parallel fashion until there are no more available members or no more waiting callers, whichever comes first. This is probably more along the lines of how - one would expect a queue should work and in most cases, you will want - to enable this new behavior. If you do not specify or comment out this - option, it will default to "no" to keep backward compatability with the old + one would expect a queue should work and in most cases, you will want + to enable this new behavior. If you do not specify or comment out this + option, it will default to "no" to keep backward compatability with the old behavior. * Queues depend on the channel driver reporting the proper state @@ -197,7 +197,7 @@ Applications: call-limit=10 -* The app_queue application now has the ability to use MixMonitor to +* The app_queue application now has the ability to use MixMonitor to record conversations queue members are having with queue callers. Please see configs/queues.conf.sample for more information on this option. @@ -212,9 +212,9 @@ Applications: other external program in order to mix the audio. * app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and - the 'm' option now provides the functionality of "initially muted". + the 'm' option now provides the functionality of "initially muted". In practice, most existing dialplans using the 'm' flag should not notice - any difference, unless the keypad menu is enabled, allowing the user + any difference, unless the keypad menu is enabled, allowing the user to unmute themsleves. * ast_play_and_record would attempt to cancel the recording if a DTMF @@ -255,10 +255,10 @@ Applications: previously used only by EXTENDED_ODBC_STORAGE. This means that you will need to update your table format using the schema provided in doc/odbcstorage.txt -* app_waitforsilence: Fixes have been made to this application which changes the +* app_waitforsilence: Fixes have been made to this application which changes the default behavior with how quickly it returns. You can maintain "old-style" behavior with the addition/use of a third "timeout" parameter. - Please consult the application documentation and make changes to your dialplan + Please consult the application documentation and make changes to your dialplan if appropriate. Manager: @@ -270,9 +270,9 @@ Manager: until after the release of 1.4, when it will be removed. Please use the time during the 1.4 release to make this transition. -* The AgentConnect event now has an additional field called "BridgedChannel" - which contains the unique ID of the queue member channel that is taking the - call. This is useful when trying to link recording filenames back to +* The AgentConnect event now has an additional field called "BridgedChannel" + which contains the unique ID of the queue member channel that is taking the + call. This is useful when trying to link recording filenames back to a particular call from the queue. * app_userevent has been modified to always send Event: UserEvent with the @@ -298,17 +298,17 @@ Variables: functions. You are encouraged to move towards the associated dialplan function, as these variables will be removed in a future release. -* The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now +* The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now adjustable from cdr.conf, instead of recompiling. * OSP applications exports several new variables, ${OSPINHANDLE}, ${OSPOUTHANDLE}, ${OSPINTOKEN}, ${OSPOUTTOKEN}, ${OSPCALLING}, ${OSPINTIMELIMIT}, and ${OSPOUTTIMELIMIT} - + * Builtin transfer functionality sets the variable ${TRANSFERERNAME} in the new created channel. This variables holds the channel name of the transferer. -* The dial plan variable PRI_CAUSE will be removed from future versions +* The dial plan variable PRI_CAUSE will be removed from future versions of Asterisk. It is replaced by adding a cause value to the hangup() application. @@ -322,8 +322,8 @@ Functions: modules.conf file then you will need to explicitly load the modules that contain the functions you want to use. -* The ENUMLOOKUP() function with the 'c' option (for counting the number of - records), but the lookup fails to match any records, the returned value will +* The ENUMLOOKUP() function with the 'c' option (for counting the number of + records), but the lookup fails to match any records, the returned value will now be "0" instead of blank. * The REALTIME() function is now available in version 1.4 and app_realtime has @@ -345,7 +345,7 @@ The IAX2 channel: which user you want based on host. If you would like to go ahead and use the new behavior which doesn't use the - order in the config file to influence matching order, then change the + order in the config file to influence matching order, then change the MAX_PEER_BUCKETS define in chan_iax2.c to a value greater than one. An example is provided there. By changing this, you will get *much* better performance on systems that do a lot of peer and user lookups as they will be @@ -360,12 +360,12 @@ The IAX2 channel: The SIP channel: -* The "incominglimit" setting is replaced by the "call-limit" setting in +* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf. -* OSP support code is removed from SIP channel to OSP applications. ospauth +* OSP support code is removed from SIP channel to OSP applications. ospauth option in sip.conf is removed to osp.conf as authpolicy. allowguest option - in sip.conf cannot be set as osp anymore. + in sip.conf cannot be set as osp anymore. * The Asterisk RTP stack has been changed in regards to RFC2833 reception and transmission. Packets will now be sent with proper duration instead of all @@ -419,10 +419,10 @@ The G726-32 codec: Installation: * On BSD systems, the installation directories have changed to more "FreeBSDish" - directories. On startup, Asterisk will look for the main configuration in + directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf - If you have an old installation, you might want to remove the binaries and - move the configuration files to the new locations. The following directories + If you have an old installation, you might want to remove the binaries and + move the configuration files to the new locations. The following directories are now default: ASTLIBDIR /usr/local/lib/asterisk ASTVARLIBDIR /usr/local/share/asterisk @@ -476,7 +476,7 @@ CDR Records: set. When using the "callerid" option for various channel drivers, some would set ANI and some would not. This has been cleared up so that all channel drivers set ANI. If you would like to change the callerid number - on the channel from the dialplan and have that change also show up in the + on the channel from the dialplan and have that change also show up in the CDR, then you *must* set CALLERID(ANI) as well as CALLERID(num). API: @@ -492,7 +492,6 @@ Formats: * format_wav: The GAIN preprocessor definition has been changed from 2 to 0 in Asterisk 1.4. This change was made in response to user complaints of choppiness or the clipping of loud signal peaks. The GAIN preprocessor - definition will be retained in Asterisk 1.4, but will be removed in a + definition will be retained in Asterisk 1.4, but will be removed in a future release. The use of GAIN for the increasing of voicemail message volume should use the 'volgain' option in voicemail.conf - diff --git a/UPGRADE-1.6.txt b/UPGRADE-1.6.txt index d0fc82a24f..4ae440147d 100644 --- a/UPGRADE-1.6.txt +++ b/UPGRADE-1.6.txt @@ -39,7 +39,7 @@ Core: sound file installer in the Makefile). * The ast_expr2 stuff has been modified to handle floating-point numbers. - Numbers of the format D.D are now acceptable input for the expr parser, + Numbers of the format D.D are now acceptable input for the expr parser, Where D is a string of base-10 digits. All math is now done in "long double", if it is available on your compiler/architecture. This was half-way between a bug-fix (because the MATH func returns fp by default), and an enhancement. @@ -48,7 +48,7 @@ Core: of rounding/truncation, along with a set of common floating point operations, like sin, cos, tan, log, pow, etc. The ability to call external functions like CDR(), etc. was also added, without having to use the ${...} notation. - + * The delimiter passed to applications has been changed to the comma (','), as that is what people are used to using within extensions.conf. If you are using realtime extensions, you will need to translate your existing dialplan @@ -190,7 +190,7 @@ Formats: Channel Drivers: * SIP: a small upgrade to support the "Record" button on the SNOM360, - which sends a sip INFO message with a "Record: on" or "Record: off" + which sends a sip INFO message with a "Record: on" or "Record: off" header. If Asterisk is set up (via features.conf) to accept "One Touch Monitor" requests (by default, via '*1'), then the user-configured dialpad sequence is generated, and recording can be started and stopped via this button. The @@ -204,9 +204,9 @@ Channel Drivers: now renamed to "counteronpeer". * SIP: The "username" option is now renamed to "defaultuser" to match "defaultip". - These are used only before registration to call a peer with the uri + These are used only before registration to call a peer with the uri sip:defaultuser@defaultip - The "username" setting still work, but is deprecated and will not work in + The "username" setting still work, but is deprecated and will not work in the next version of Asterisk. * SIP: The old "insecure" options, deprecated in 1.4, have been removed. @@ -241,7 +241,7 @@ Channel Drivers: Configuration: * pbx_dundi.c: tos parameter changed to use new values. Old values like lowdelay, - lowcost and other is not acceptable now. Look into qos.tex for description of + lowcost and other is not acceptable now. Look into qos.tex for description of this parameter. * queues.conf: the queue-lessthan sound file option is no longer available, and the @@ -249,7 +249,7 @@ Configuration: Manager: -* Manager has been upgraded to version 1.1 with a lot of changes. +* Manager has been upgraded to version 1.1 with a lot of changes. Please check doc/manager_1_1.txt for information * The IAXpeers command output has been changed to more closely resemble the diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt index e23d5da7f6..b01f762a58 100644 --- a/UPGRADE-1.8.txt +++ b/UPGRADE-1.8.txt @@ -73,9 +73,9 @@ From 1.6.2 to 1.8: it is set to load. If not, then any module which uses RTP (such as chan_sip) will not be able to send or receive calls. -* The app_dahdiscan.c file has been removed, but the dialplan app DAHDIScan still - remains. It now exists within app_chanspy.c and retains the exact same - functionality as before. +* The app_dahdiscan.c file has been removed, but the dialplan app DAHDIScan still + remains. It now exists within app_chanspy.c and retains the exact same + functionality as before. * The default behavior for Set, AGI, and pbx_realtime has been changed to implement 1.6 behavior by default, if there is no [compat] section in asterisk.conf. In @@ -111,7 +111,7 @@ From 1.6.2 to 1.8: * ExternalIVR will now send Z events for invalid or missing files, T events now include the interrupted file and bugs in argument parsing have been fixed so there may be arguments specified in incorrect ways that were - working that will no longer work. Please see + working that will no longer work. Please see https://wiki.asterisk.org/wiki/display/AST/External+IVR+Interface for details. * OSP lookup application changes following variable names: @@ -185,7 +185,7 @@ From 1.6.1 to 1.6.2: * SIP no longer sends the 183 progress message for early media by default. Applications requiring early media should use the - progress() dialplan app to generate the progress message. + progress() dialplan app to generate the progress message. * The firmware for the IAXy has been removed from Asterisk. It can be downloaded from http://downloads.digium.com/pub/iaxy/. To have Asterisk @@ -269,8 +269,8 @@ From 1.6.1 to 1.6.2: * DAHDISendCallreroutingFacility() parameters are now comma-separated, instead of the old pipe. -* res_jabber: autoprune has been disabled by default, to avoid misconfiguration - that would end up being interpreted as a bug once Asterisk started removing +* res_jabber: autoprune has been disabled by default, to avoid misconfiguration + that would end up being interpreted as a bug once Asterisk started removing the contacts from a user list. * The cdr.conf file must exist and be configured correctly in order for CDR @@ -341,4 +341,3 @@ From 1.6.0.x to 1.6.1: * If you use ODBC storage for voicemail, there is a new field called "flag" which should be a char(8) or larger. This field specifies whether or not a message has been designated to be "Urgent", "PRIORITY", or not. - diff --git a/UPGRADE-10.txt b/UPGRADE-10.txt index 35a9fcb2b1..f4b2bec829 100644 --- a/UPGRADE-10.txt +++ b/UPGRADE-10.txt @@ -79,10 +79,10 @@ Asterisk Database: convert an existing astdb to the SQLite3 version automatically at runtime. Module Support Level - - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, + - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, formats, funcs, pbx, and res have been updated to include MODULEINFO data that includes tags with a value of core, extended, or deprecated. - More information is available on the Asterisk wiki at + More information is available on the Asterisk wiki at https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States Deprecated modules are now marked to not build by default and must be explicitly diff --git a/UPGRADE-11.txt b/UPGRADE-11.txt index 311edc8e3a..58b70b6c10 100644 --- a/UPGRADE-11.txt +++ b/UPGRADE-11.txt @@ -185,7 +185,7 @@ SIP configuration option. Symptoms of this include one way media or no media flow. chan_unistim - - Due to massive update in chan_unistim phone keys functions and on-screen + - Due to massive update in chan_unistim phone keys functions and on-screen information changed. users.conf: @@ -257,10 +257,10 @@ Manager: unchanged. Module Support Level - - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, + - All modules in the addons, apps, bridge, cdr, cel, channels, codecs, formats, funcs, pbx, and res have been updated to include MODULEINFO data that includes tags with a value of core, extended, or deprecated. - More information is available on the Asterisk wiki at + More information is available on the Asterisk wiki at https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States Deprecated modules are now marked to not build by default and must be explicitly diff --git a/UPGRADE-12.txt b/UPGRADE-12.txt index 79cafa11f1..665e0168ad 100644 --- a/UPGRADE-12.txt +++ b/UPGRADE-12.txt @@ -427,12 +427,12 @@ Parking: - Configuration is found in res_parking.conf. It is no longer supported in features.conf - - The arguments for the Park, ParkedCall, and ParkAndAnnounce applications - have been modified significantly. See the application documents for + - The arguments for the Park, ParkedCall, and ParkAndAnnounce applications + have been modified significantly. See the application documents for specific details. - Numerous changes to Parking related applications, AMI and CLI commands and - internal inter-workings have been made. Please read the CHANGES file for + internal inter-workings have been made. Please read the CHANGES file for the detailed list. Security Events Framework: diff --git a/addons/app_mysql.c b/addons/app_mysql.c index 6901daf052..1a79afebdb 100644 --- a/addons/app_mysql.c +++ b/addons/app_mysql.c @@ -27,7 +27,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page app_mysql.conf app_mysql.conf * \verbinclude app_mysql.conf.sample */ @@ -335,7 +335,7 @@ static int aMYSQL_connect(struct ast_channel *chan, const char *data) unsigned int port = 0; char *port_str; char *parse = ast_strdupa(data); - + AST_NONSTANDARD_APP_ARGS(args, parse, ' '); if (args.argc < 6) { @@ -626,8 +626,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) @@ -665,4 +665,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Simple Mysql Interface"); - diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index 1f97362519..b2e0a4c670 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -718,4 +718,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL CDR Backend", .unload = unload_module, .reload = reload, ); - diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index 8f04af7530..7d92f8df39 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -16,7 +16,7 @@ * at the top of the source tree. */ -/*! +/*! * \file * \brief Bluetooth Mobile Device channel driver * @@ -1772,7 +1772,7 @@ static int rfcomm_read_command(int rsock, char **buf, size_t count, size_t *in_c * \verbatim * \r\n\r\n * \r - * \r\n> + * \r\n> * \endverbatim * * These formats correspond to AT result codes, AT commands, and the AT SMS @@ -2254,7 +2254,7 @@ static int hfp_parse_cmti(struct hfp_pvt *hfp, char *buf) int index = -1; /* parse cmti info in the following format: - * +CMTI: , + * +CMTI: , */ if (!sscanf(buf, "+CMTI: %*[^,],%d", &index)) { ast_debug(2, "[%s] error parsing CMTI event '%s'\n", hfp->owner->id, buf); diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 0d5a588b77..c25c130d43 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -135,7 +135,7 @@ static int function_ooh323_write(struct ast_channel *chan, const char *cmd, char static enum ast_rtp_glue_result ooh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance **rtp); static enum ast_rtp_glue_result ooh323_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp_instance **rtp); -static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, +static int ooh323_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *rtp, struct ast_rtp_instance *vrtp, struct ast_rtp_instance *trtp, const struct ast_format_cap *codecs, int nat_active); static void ooh323_get_codec(struct ast_channel *chan, struct ast_format_cap *result); void setup_rtp_remote(ooCallData *call, const char *remoteIp, int remotePort); @@ -218,7 +218,7 @@ static struct ooh323_pvt { char callee_dialedDigits[AST_MAX_EXTENSION]; char callee_email[AST_MAX_EXTENSION]; char callee_url[AST_MAX_EXTENSION]; - + int port; struct ast_format *readformat; /* negotiated read format */ struct ast_format *writeformat; /* negotiated write format */ @@ -394,7 +394,7 @@ static struct ooh323_config static struct ast_sched_context *sched; static struct io_context *io; -/* Protect the monitoring thread, so only one process can kill or start it, +/* Protect the monitoring thread, so only one process can kill or start it, and not when it's doing something critical. */ AST_MUTEX_DEFINE_STATIC(monlock); @@ -405,7 +405,7 @@ static pthread_t monitor_thread = AST_PTHREADT_NULL; static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, - const char *host, struct ast_format_cap *cap, + const char *host, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) { struct ast_format_cap *caps = NULL; @@ -422,12 +422,12 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, /* Don't hold a h323 pvt lock while we allocate a channel */ ast_mutex_unlock(&i->lock); ast_mutex_lock(&ooh323c_cn_lock); - ch = ast_channel_alloc(1, state, i->callerid_num, i->callerid_name, + ch = ast_channel_alloc(1, state, i->callerid_num, i->callerid_name, i->accountcode, i->exten, i->context, assignedids, requestor, i->amaflags, "OOH323/%s-%ld", host, callnumber); callnumber++; ast_mutex_unlock(&ooh323c_cn_lock); - + ast_mutex_lock(&i->lock); if (ch && caps) { @@ -497,17 +497,17 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, ast_channel_priority_set(ch, 1); if(!ast_test_flag(i, H323_OUTGOING)) { - + if (!ast_strlen_zero(i->caller_h323id)) { pbx_builtin_setvar_helper(ch, "_CALLER_H323ID", i->caller_h323id); } if (!ast_strlen_zero(i->caller_dialedDigits)) { - pbx_builtin_setvar_helper(ch, "_CALLER_H323DIALEDDIGITS", + pbx_builtin_setvar_helper(ch, "_CALLER_H323DIALEDDIGITS", i->caller_dialedDigits); } if (!ast_strlen_zero(i->caller_email)) { - pbx_builtin_setvar_helper(ch, "_CALLER_H323EMAIL", + pbx_builtin_setvar_helper(ch, "_CALLER_H323EMAIL", i->caller_email); } if (!ast_strlen_zero(i->caller_url)) { @@ -517,7 +517,7 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, if (!ast_strlen_zero(i->accountcode)) ast_channel_accountcode_set(ch, i->accountcode); - + if (i->amaflags) ast_channel_amaflags_set(ch, i->amaflags); @@ -528,7 +528,7 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, ast_channel_unlock(ch); ast_hangup(ch); ch = NULL; - } + } } if (ch) { @@ -552,7 +552,7 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, -static struct ooh323_pvt *ooh323_alloc(int callref, char *callToken) +static struct ooh323_pvt *ooh323_alloc(int callref, char *callToken) { struct ooh323_pvt *pvt = NULL; @@ -602,7 +602,7 @@ static struct ooh323_pvt *ooh323_alloc(int callref, char *callToken) pvt->aniasdni = gANIasDNI; - ast_mutex_unlock(&pvt->lock); + ast_mutex_unlock(&pvt->lock); /* Add to interface list */ ast_mutex_lock(&iflock); pvt->next = iflist; @@ -628,7 +628,7 @@ static struct ast_channel *ooh323_request(const char *type, struct ast_format_ca struct ast_channel *chan = NULL; struct ooh323_pvt *p = NULL; struct ooh323_peer *peer = NULL; - char *dest = NULL; + char *dest = NULL; char *ext = NULL; char tmp[256]; int port = 0; @@ -658,7 +658,7 @@ static struct ast_channel *ooh323_request(const char *type, struct ast_format_ca dest = strchr(tmp, '/'); - if (dest) { + if (dest) { *dest = '\0'; dest++; ext = dest; @@ -769,7 +769,7 @@ static struct ast_channel *ooh323_request(const char *type, struct ast_format_ca chan = ooh323_new(p, AST_STATE_DOWN, p->username, cap, assignedids, requestor); - + ast_mutex_unlock(&p->lock); if (!chan) { @@ -856,7 +856,7 @@ struct ooh323_user *find_user(const char * name, const char* ip) struct ooh323_peer *find_friend(const char *name, int port) { - struct ooh323_peer *peer; + struct ooh323_peer *peer; if (gH323Debug) ast_verb(0, "--- find_friend \"%s\"\n", name); @@ -882,7 +882,7 @@ struct ooh323_peer *find_friend(const char *name, int port) ast_verb(0, "+++ find_friend \"%s\"\n", name); } - return peer; + return peer; } @@ -921,7 +921,7 @@ struct ooh323_peer *find_peer(const char * name, int port) ast_verb(0, "+++ find_peer \"%s\"\n", name); } - return peer; + return peer; } static int ooh323_digit_begin(struct ast_channel *chan, char digit) @@ -929,7 +929,7 @@ static int ooh323_digit_begin(struct ast_channel *chan, char digit) char dtmf[2]; struct ooh323_pvt *p = (struct ooh323_pvt *) ast_channel_tech_pvt(chan); int res = 0; - + if (gH323Debug) ast_verb(0, "--- ooh323_digit_begin\n"); @@ -1036,7 +1036,7 @@ static int ooh323_call(struct ast_channel *ast, const char *dest, int timeout) if ((val = pbx_builtin_getvar_helper(ast, "CALLER_H323ID"))) { ast_copy_string(p->caller_h323id, val, sizeof(p->caller_h323id)); } - + if ((val = pbx_builtin_getvar_helper(ast, "CALLER_H323DIALEDDIGITS"))) { ast_copy_string(p->caller_dialedDigits, val, sizeof(p->caller_dialedDigits)); if(!p->callerid_num) @@ -1117,13 +1117,13 @@ static int ooh323_hangup(struct ast_channel *ast) if (gH323Debug) ast_verb(0, " hanging %s with cause: %d\n", p->username, q931cause); - ast_channel_tech_pvt_set(ast, NULL); + ast_channel_tech_pvt_set(ast, NULL); if (!ast_test_flag(p, H323_ALREADYGONE)) { - ooHangCall(p->callToken, + ooHangCall(p->callToken, ooh323_convert_hangupcause_asteriskToH323(q931cause), q931cause); ast_set_flag(p, H323_ALREADYGONE); /* ast_mutex_unlock(&p->lock); */ - } else + } else ast_set_flag(p, H323_NEEDDESTROY); /* detach channel here */ if (p->owner) { @@ -1139,11 +1139,11 @@ static int ooh323_hangup(struct ast_channel *ast) /* Notify the module monitors that use count for resource has changed */ ast_update_use_count(); - + } else { ast_debug(1, "No call to hangup\n" ); } - + if (gH323Debug) ast_verb(0, "+++ ooh323_hangup\n"); @@ -1166,7 +1166,7 @@ static int ooh323_answer(struct ast_channel *ast) ast_channel_lock(ast); if (!p->alertsent) { if (gH323Debug) { - ast_debug(1, "Sending forced ringback for %s, res = %u\n", + ast_debug(1, "Sending forced ringback for %s, res = %u\n", callToken, ooManualRingback(callToken)); } else { ooManualRingback(callToken); @@ -1228,7 +1228,7 @@ static int ooh323_write(struct ast_channel *ast, struct ast_frame *f) return res; } - + if (f->frametype == AST_FRAME_VOICE) { /* sending progress for first */ if (!ast_test_flag(p, H323_OUTGOING) && !p->progsent && @@ -1266,7 +1266,7 @@ static int ooh323_write(struct ast_channel *ast, struct ast_frame *f) ast_mutex_unlock(&p->lock); return 0; } else { - ast_log(LOG_WARNING, "Can't send %u type frames with OOH323 write\n", + ast_log(LOG_WARNING, "Can't send %u type frames with OOH323 write\n", f->frametype); ast_mutex_unlock(&p->lock); return 0; @@ -1303,7 +1303,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d if (gH323Debug) { ast_verb(0, "----- ooh323_indicate %d on call %s\n", condition, callToken); } - + ast_mutex_lock(&p->lock); switch (condition) { case AST_CONTROL_INCOMPLETE: @@ -1331,7 +1331,7 @@ static int ooh323_indicate(struct ast_channel *ast, int condition, const void *d if (!p->progsent) { if (gH323Debug) { ast_debug(1, "Sending manual progress for %s, res = %u\n", callToken, - ooManualProgress(callToken)); + ooManualProgress(callToken)); } else { ooManualProgress(callToken); } @@ -1476,7 +1476,7 @@ static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, i if (gH323Debug) ast_verb(0, "----- ooh323_queryoption %d on channel %s\n", option, ast_channel_name(ast)); - + switch (option) { case AST_OPTION_T38_STATE: @@ -1516,7 +1516,7 @@ static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, i if (gH323Debug) ast_verb(0, "+++++ ooh323_queryoption %d on channel %s\n", option, ast_channel_name(ast)); - + ast_mutex_unlock(&p->lock); return res; @@ -1560,9 +1560,9 @@ void ooh323_set_write_format(ooCallData *call, struct ast_format *fmt, int txfra struct ooh323_pvt *p = NULL; if (gH323Debug) - ast_verb(0, "--- ooh323_update_writeformat %s/%d\n", + ast_verb(0, "--- ooh323_update_writeformat %s/%d\n", ast_format_get_name(fmt), txframes); - + p = find_call(call); if (!p) { ast_log(LOG_ERROR, "No matching call found for %s\n", call->callToken); @@ -1594,7 +1594,7 @@ void ooh323_set_write_format(ooCallData *call, struct ast_format *fmt, int txfra } if (gH323Debug) { struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN); - ast_verb(0, "Writeformat before update %s/%s\n", + ast_verb(0, "Writeformat before update %s/%s\n", ast_format_get_name(ast_channel_writeformat(p->owner)), ast_format_cap_get_names(ast_channel_nativeformats(p->owner), &codec_buf)); } @@ -1632,9 +1632,9 @@ void ooh323_set_read_format(ooCallData *call, struct ast_format *fmt) struct ooh323_pvt *p = NULL; if (gH323Debug) - ast_verb(0, "--- ooh323_update_readformat %s\n", + ast_verb(0, "--- ooh323_update_readformat %s\n", ast_format_get_name(fmt)); - + p = find_call(call); if (!p) { ast_log(LOG_ERROR, "No matching call found for %s\n", call->callToken); @@ -1666,7 +1666,7 @@ void ooh323_set_read_format(ooCallData *call, struct ast_format *fmt) } if (gH323Debug) { - ast_verb(0, "Readformat before update %s\n", + ast_verb(0, "Readformat before update %s\n", ast_format_get_name(ast_channel_readformat(p->owner))); } ast_format_cap_append(caps, fmt, 0); @@ -1697,7 +1697,7 @@ int onAlerting(ooCallData *call) if(!p) { ast_log(LOG_ERROR, "No matching call found\n"); return -1; - } + } ast_mutex_lock(&p->lock); if (!p->owner) { ast_mutex_unlock(&p->lock); @@ -1753,7 +1753,7 @@ int onProgress(ooCallData *call) if(!p) { ast_log(LOG_ERROR, "No matching call found\n"); return -1; - } + } ast_mutex_lock(&p->lock); if (!p->owner) { ast_mutex_unlock(&p->lock); @@ -1861,7 +1861,7 @@ int ooh323_onReceivedSetup(ooCallData *call, Q931Message *pmsg) } ast_mutex_lock(&p->lock); ast_clear_flag(p, H323_OUTGOING); - + if (call->remoteDisplayName) { p->callerid_name = ast_strdup(call->remoteDisplayName); @@ -1883,7 +1883,7 @@ int ooh323_onReceivedSetup(ooCallData *call, Q931Message *pmsg) { if(!p->callerid_num) p->callerid_num = ast_strdup(alias->value); - ast_copy_string(p->caller_dialedDigits, alias->value, + ast_copy_string(p->caller_dialedDigits, alias->value, sizeof(p->caller_dialedDigits)); } else if(alias->type == T_H225AliasAddress_email_ID) @@ -1955,7 +1955,7 @@ int ooh323_onReceivedSetup(ooCallData *call, Q931Message *pmsg) if (user->rtpmask && user->rtpmaskstr[0]) { p->rtpmask = user->rtpmask; - ast_copy_string(p->rtpmaskstr, user->rtpmaskstr, + ast_copy_string(p->rtpmaskstr, user->rtpmaskstr, sizeof(p->rtpmaskstr)); } if (user->rtdrcount > 0 && user->rtdrinterval > 0) { @@ -2050,7 +2050,7 @@ int onOutgoingCall(ooCallData *call) ooCallSetCallerId(call, p->callerid_num); } } - + if (!ast_strlen_zero(p->caller_h323id)) ooCallAddAliasH323ID(call, p->caller_h323id); @@ -2131,7 +2131,7 @@ int onNewCallCreated(ooCallData *call) ooCallSetCallerId(call, p->callerid_num); } } - + if (!ast_strlen_zero(p->caller_h323id)) ooCallAddAliasH323ID(call, p->caller_h323id); @@ -2150,7 +2150,7 @@ int onNewCallCreated(ooCallData *call) ooCallAddAliasH323ID(call, p->callerid_num); } } - + if (!ast_strlen_zero(p->exten)) { if (ooIsDailedDigit(p->exten)) { @@ -2164,7 +2164,7 @@ int onNewCallCreated(ooCallData *call) if (gH323Debug) { struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN); - ast_verb(0, " Outgoing call %s(%s) - Codec prefs - %s\n", + ast_verb(0, " Outgoing call %s(%s) - Codec prefs - %s\n", p->username?p->username:"NULL", call->callToken, ast_format_cap_get_names(p->cap, &codec_buf)); } @@ -2203,7 +2203,7 @@ int onCallEstablished(ooCallData *call) ast_log(LOG_ERROR, "Channel has no owner\n"); return -1; } - + while (p->owner && ast_channel_trylock(p->owner)) { ast_debug(1, "Failed to grab lock, trying again\n"); DEADLOCK_AVOIDANCE(&p->lock); @@ -2249,7 +2249,7 @@ int onCallCleared(ooCallData *call) if ((p = find_call(call))) { ast_mutex_lock(&p->lock); - + while (p->owner) { if (ast_channel_trylock(p->owner)) { ooTrace(OOTRCLVLINFO, "Failed to grab lock, trying again\n"); @@ -2261,7 +2261,7 @@ int onCallCleared(ooCallData *call) } if (ownerLock) { - if (!ast_test_flag(p, H323_ALREADYGONE)) { + if (!ast_test_flag(p, H323_ALREADYGONE)) { ast_set_flag(p, H323_ALREADYGONE); ast_channel_hangupcause_set(p->owner, call->q931cause); @@ -2305,7 +2305,7 @@ int onCallCleared(ooCallData *call) if (gH323Debug) ast_verb(0, "--- ooh323_delete_user\n"); - if (user) { + if (user) { cur = userl.users; ast_mutex_lock(&userl.lock); while (cur) { @@ -2323,7 +2323,7 @@ int onCallCleared(ooCallData *call) ast_mutex_unlock(&userl.lock); ast_free(user); - } + } if (gH323Debug) ast_verb(0, "+++ ooh323_delete_user\n"); @@ -2337,7 +2337,7 @@ void ooh323_delete_peer(struct ooh323_peer *peer) if (gH323Debug) ast_verb(0, "--- ooh323_delete_peer\n"); - if (peer) { + if (peer) { cur = peerl.peers; ast_mutex_lock(&peerl.lock); while(cur) { @@ -2361,7 +2361,7 @@ void ooh323_delete_peer(struct ooh323_peer *peer) ao2_cleanup(peer->cap); ast_free(peer); - } + } if (gH323Debug) ast_verb(0, "+++ ooh323_delete_peer\n"); @@ -2433,11 +2433,11 @@ static struct ooh323_user *build_user(const char *name, struct ast_variable *v) user->rtptimeout = gRTPTimeout; } else if (!strcasecmp(v->name, "rtpmask")) { if ((user->rtpmask = ast_calloc(1, sizeof(struct OOH323Regex))) && - (regcomp(&user->rtpmask->regex, v->value, REG_EXTENDED) + (regcomp(&user->rtpmask->regex, v->value, REG_EXTENDED) == 0)) { ast_mutex_init(&user->rtpmask->lock); user->rtpmask->inuse = 1; - ast_copy_string(user->rtpmaskstr, v->value, + ast_copy_string(user->rtpmaskstr, v->value, sizeof(user->rtpmaskstr)); } else user->rtpmask = NULL; } else if (!strcasecmp(v->name, "disallow")) { @@ -2454,7 +2454,7 @@ static struct ooh323_user *build_user(const char *name, struct ast_variable *v) struct ast_sockaddr p; if (!ast_parse_arg(v->value, PARSE_ADDR, &p)) { ast_copy_string(user->mIP, ast_sockaddr_stringify_addr(&p), sizeof(user->mIP)-1); - } else { + } else { ast_copy_string(user->mIP, v->value, sizeof(user->mIP)-1); } user->mUseIP = 1; @@ -2599,10 +2599,10 @@ static struct ooh323_peer *build_peer(const char *name, struct ast_variable *v, struct ast_sockaddr p; if (!ast_parse_arg(v->value, PARSE_ADDR, &p)) { ast_copy_string(peer->ip, ast_sockaddr_stringify_host(&p), sizeof(peer->ip)); - } else { + } else { ast_copy_string(peer->ip, v->value, sizeof(peer->ip)); } - + } else if (!strcasecmp(v->name, "outgoinglimit")) { peer->outgoinglimit = atoi(v->value); if (peer->outgoinglimit < 0) @@ -2628,11 +2628,11 @@ static struct ooh323_peer *build_peer(const char *name, struct ast_variable *v, peer->rtptimeout = gRTPTimeout; } else if (!strcasecmp(v->name, "rtpmask")) { if ((peer->rtpmask = ast_calloc(1, sizeof(struct OOH323Regex))) && - (regcomp(&peer->rtpmask->regex, v->value, REG_EXTENDED) + (regcomp(&peer->rtpmask->regex, v->value, REG_EXTENDED) == 0)) { ast_mutex_init(&peer->rtpmask->lock); peer->rtpmask->inuse = 1; - ast_copy_string(peer->rtpmaskstr, v->value, + ast_copy_string(peer->rtpmaskstr, v->value, sizeof(peer->rtpmaskstr)); } else peer->rtpmask = NULL; } else if (!strcasecmp(v->name, "disallow")) { @@ -2721,9 +2721,9 @@ static int ooh323_do_reload(void) reload_config(1); /* Gatekeeper */ - if (gRasGkMode == RasUseSpecificGatekeeper || + if (gRasGkMode == RasUseSpecificGatekeeper || gRasGkMode == RasDiscoverGatekeeper) { - ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? + ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? gGatekeeper : 0, 0); ooGkClientStart(gH323ep.gkClient); } @@ -2738,10 +2738,10 @@ static int ooh323_do_reload(void) case T_H225AliasAddress_h323_ID: ooH323EpAddAliasH323ID(pNewAlias->value); break; - case T_H225AliasAddress_dialedDigits: + case T_H225AliasAddress_dialedDigits: ooH323EpAddAliasDialedDigits(pNewAlias->value); break; - case T_H225AliasAddress_email_ID: + case T_H225AliasAddress_email_ID: ooH323EpAddAliasEmailID(pNewAlias->value); break; default: @@ -2889,7 +2889,7 @@ int reload_config(int reload) v = v->next; continue; } - + if (!strcasecmp(v->name, "port")) { gPort = (int)strtol(v->value, NULL, 10); } else if (!strcasecmp(v->name, "bindaddr")) { @@ -2928,7 +2928,7 @@ int reload_config(int reload) gMediaWaitForConnect = ast_true(v->value); if (gMediaWaitForConnect) ooH323EpEnableMediaWaitForConnect(); - else + else ooH323EpDisableMediaWaitForConnect(); } else if (!strcasecmp(v->name, "h245tunneling")) { gTunneling = ast_true(v->value); @@ -2949,7 +2949,7 @@ int reload_config(int reload) gBeMaster = ast_true(v->value); if (gBeMaster) ooH323EpTryBeMaster(1); - else + else ooH323EpTryBeMaster(0); } else if (!strcasecmp(v->name, "h323id")) { pNewAlias = ast_calloc(1, sizeof(struct ooAliases)); @@ -3081,7 +3081,7 @@ int reload_config(int reload) else if (!strcasecmp(v->value, "h245signal")) gDTMFMode = H323_DTMF_H245SIGNAL; else { - ast_log(LOG_WARNING, "Unknown dtmf mode '%s', using rfc2833\n", + ast_log(LOG_WARNING, "Unknown dtmf mode '%s', using rfc2833\n", v->value); gDTMFMode = H323_DTMF_RFC2833; } @@ -3126,7 +3126,7 @@ int reload_config(int reload) } v = v->next; } - + for (cat = ast_category_browse(cfg, NULL); cat; cat = ast_category_browse(cfg, cat)) { if (strcasecmp(cat, "general")) { int friend_type = 0; @@ -3183,7 +3183,7 @@ static char *handle_cli_ooh323_show_peer(struct ast_cli_entry *e, int cmd, struc { char ip_port[64]; struct ooh323_peer *prev = NULL, *peer = NULL; - + switch (cmd) { case CLI_INIT: e->command = "ooh323 show peer"; @@ -3304,7 +3304,7 @@ static char *handle_cli_ooh323_show_peers(struct ast_cli_entry *e, int cmd, stru while (peer) { ast_mutex_lock(&peer->lock); snprintf(ip_port, sizeof(ip_port), "%s:%hu", peer->ip, peer->port); - ast_cli(a->fd, FORMAT, peer->name, + ast_cli(a->fd, FORMAT, peer->name, peer->accountcode, ip_port, ast_format_cap_get_names(peer->cap, &codec_buf)); @@ -3443,7 +3443,7 @@ static char *handle_cli_ooh323_show_users(struct ast_cli_entry *e, int cmd, stru while(user) { ast_mutex_lock(&user->lock); - ast_cli(a->fd, FORMAT1, user->name, + ast_cli(a->fd, FORMAT1, user->name, user->accountcode, user->context, ast_format_cap_get_names(user->cap, &codec_buf)); prev = user; @@ -3798,7 +3798,7 @@ static int load_module(void) .onMediaChanged = (cb_OnMediaChanged) setup_rtp_remote, }; if (!(gCap = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { - return AST_MODULE_LOAD_DECLINE; + return AST_MODULE_LOAD_DECLINE; } if (!(ooh323_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) { ao2_ref(gCap, -1); @@ -3816,8 +3816,8 @@ static int load_module(void) ast_mutex_init(&userl.lock); peerl.peers = NULL; ast_mutex_init(&peerl.lock); - -#if 0 + +#if 0 ast_register_atexit(&ast_ooh323c_exit); #endif @@ -3831,7 +3831,7 @@ static int load_module(void) if (!reload_config(0)) { - /* fire up the H.323 Endpoint */ + /* fire up the H.323 Endpoint */ if (OO_OK != ooH323EpInitialize(OO_CALLMODE_AUDIOCALL, gLogFile)) { ast_log(LOG_ERROR, "Failed to initialize OOH323 endpoint-" "OOH323 Disabled\n"); @@ -3867,7 +3867,7 @@ static int load_module(void) ast_debug(1, "OOH323 channel is in IP6 mode\n"); } ooH323EpSetCallerID(gCallerID); - + if(ooH323EpSetTCPPortRange(ooconfig.mTCPPortStart, ooconfig.mTCPPortEnd) == OO_FAILED) { ast_log(LOG_ERROR, "h225portrange: Failed to set range\n"); } @@ -3878,10 +3878,10 @@ static int load_module(void) case T_H225AliasAddress_h323_ID: ooH323EpAddAliasH323ID(pNewAlias->value); break; - case T_H225AliasAddress_dialedDigits: + case T_H225AliasAddress_dialedDigits: ooH323EpAddAliasDialedDigits(pNewAlias->value); break; - case T_H225AliasAddress_email_ID: + case T_H225AliasAddress_email_ID: ooH323EpAddAliasEmailID(pNewAlias->value); break; default: @@ -3899,11 +3899,11 @@ static int load_module(void) peer = peer->next; } ast_mutex_unlock(&peerl.lock); - + if (gMediaWaitForConnect) ooH323EpEnableMediaWaitForConnect(); - else + else ooH323EpDisableMediaWaitForConnect(); /* Fast start and tunneling options */ @@ -3938,12 +3938,12 @@ static int load_module(void) ooh323_tech.capabilities = NULL; return 1; } - + /* Create H.323 listener */ if (ooCreateH323Listener() != OO_OK) { ast_log(LOG_ERROR, "OOH323 Listener Creation failure. " "OOH323 DISABLED\n"); - + ooH323EpDestroy(); ao2_ref(gCap, -1); gCap = NULL; @@ -4010,7 +4010,7 @@ static void *do_monitor(void *data) if (gH323ep.gkClient && gH323ep.gkClient->state == GkClientStopped) { ooGkClientDestroy(); ast_verb(0, "Restart stopped gatekeeper client\n"); - ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? + ooGkClientInit(gRasGkMode, (gRasGkMode == RasUseSpecificGatekeeper) ? gGatekeeper : 0, 0); ooGkClientStart(gH323ep.gkClient); } @@ -4036,7 +4036,7 @@ static void *do_monitor(void *data) ast_log(LOG_NOTICE, "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n", ast_channel_name(h323->owner), (long) (t - h323->lastrtprx)); ast_channel_unlock(h323->owner); } - + } if (ast_test_flag(h323, H323_NEEDDESTROY)) { @@ -4136,7 +4136,7 @@ int ooh323_destroy(struct ooh323_pvt *p) iflist = cur->next; if (cur->callToken) { - if (gH323Debug) + if (gH323Debug) ast_verb(0, " Destroying %s\n", cur->callToken); ast_free(cur->callToken); cur->callToken = 0; @@ -4156,7 +4156,7 @@ int ooh323_destroy(struct ooh323_pvt *p) ast_free(cur->callerid_name); cur->callerid_name = 0; } - + if (cur->callerid_num) { ast_free(cur->callerid_num); cur->callerid_num = 0; @@ -4172,20 +4172,20 @@ int ooh323_destroy(struct ooh323_pvt *p) ast_udptl_destroy(cur->udptl); cur->udptl = NULL; } - + /* Unlink us from the owner if we have one */ if (cur->owner) { while(ast_channel_trylock(cur->owner)) { ast_debug(1, "Failed to grab lock, trying again\n"); DEADLOCK_AVOIDANCE(&cur->lock); - } + } ast_debug(1, "Detaching from %s\n", ast_channel_name(cur->owner)); ast_channel_tech_pvt_set(cur->owner, NULL); ast_channel_unlock(cur->owner); cur->owner = NULL; ast_module_unref(myself); } - + if (cur->vad) { ast_dsp_free(cur->vad); cur->vad = NULL; @@ -4325,7 +4325,7 @@ static int unload_module(void) if (gH323Debug) { ast_verb(0, " unload_module - stopping monitor thread\n"); - } + } if (monitor_thread != AST_PTHREADT_NULL) { if (!ast_mutex_lock(&monlock)) { if (monitor_thread && (monitor_thread != AST_PTHREADT_STOP)) { @@ -4368,7 +4368,7 @@ static int unload_module(void) ast_log(LOG_WARNING, "Unable to lock the interface list\n"); return -1; } - + if (gH323Debug) { ast_verb(0, " unload_module - deleting users\n"); @@ -4668,7 +4668,7 @@ int configure_local_rtp(struct ooh323_pvt *p, ooCallData *call) ast_rtp_instance_set_timeout(p->rtp, p->rtptimeout); } ast_rtp_instance_set_prop(p->rtp, AST_RTP_PROPERTY_RTCP, 1); - + } if (p->rtdrcount) { @@ -4830,7 +4830,7 @@ void close_rtp_connection(ooCallData *call) udptl handling functions */ -void setup_udptl_connection(ooCallData *call, const char *remoteIp, +void setup_udptl_connection(ooCallData *call, const char *remoteIp, int remotePort) { struct ooh323_pvt *p = NULL; @@ -4840,7 +4840,7 @@ void setup_udptl_connection(ooCallData *call, const char *remoteIp, ast_verb(0, "--- setup_udptl_connection\n"); /* Find the call or allocate a private structure if call not found */ - p = find_call(call); + p = find_call(call); if (!p) { ast_log(LOG_ERROR, "Something is wrong: rtp\n"); @@ -4944,7 +4944,7 @@ int update_our_aliases(ooCallData *call, struct ooh323_pvt *p) { int updated = -1; ooAliases *psAlias = NULL; - + if (!call->ourAliases) return updated; for (psAlias = call->ourAliases; psAlias; psAlias = psAlias->next) { @@ -4953,7 +4953,7 @@ int update_our_aliases(ooCallData *call, struct ooh323_pvt *p) updated = 1; } if (psAlias->type == T_H225AliasAddress_dialedDigits) { - ast_copy_string(p->callee_dialedDigits, psAlias->value, + ast_copy_string(p->callee_dialedDigits, psAlias->value, sizeof(p->callee_dialedDigits)); updated = 1; } @@ -5145,7 +5145,7 @@ void onModeChanged(ooCallData *call, int t38mode) { } parameters.max_ifp = ast_udptl_get_far_max_ifp(p->udptl); parameters.rate = AST_T38_RATE_14400; - ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS, + ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS, ¶meters, sizeof(parameters)); p->faxmode = 1; @@ -5157,7 +5157,7 @@ void onModeChanged(ooCallData *call, int t38mode) { parameters.request_response = AST_T38_REQUEST_TERMINATE; parameters.max_ifp = ast_udptl_get_far_max_ifp(p->udptl); parameters.rate = AST_T38_RATE_14400; - ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS, + ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS, ¶meters, sizeof(parameters)); } p->faxmode = 0; @@ -5204,7 +5204,7 @@ int ooh323_convert_hangupcause_h323ToAsterisk(int cause) switch (cause) { case OO_REASON_REMOTE_REJECTED: return AST_CAUSE_CALL_REJECTED; - case OO_REASON_NOUSER: + case OO_REASON_NOUSER: return AST_CAUSE_UNALLOCATED; case OO_REASON_REMOTE_BUSY: case OO_REASON_LOCAL_BUSY: @@ -5216,7 +5216,7 @@ int ooh323_convert_hangupcause_h323ToAsterisk(int cause) return AST_CAUSE_CONGESTION; case OO_REASON_REMOTE_NOANSWER: return AST_CAUSE_NO_ANSWER; - case OO_REASON_UNKNOWN: + case OO_REASON_UNKNOWN: case OO_REASON_INVALIDMESSAGE: case OO_REASON_TRANSPORTFAILURE: return AST_CAUSE_FAILURE; diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h index 1279a2246d..e4d285e379 100644 --- a/addons/chan_ooh323.h +++ b/addons/chan_ooh323.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -85,7 +85,7 @@ struct ooh323_peer; /* Helper functions */ struct ooh323_user *find_user(const char * name, const char *ip); struct ooh323_peer *find_peer(const char * name, int port); -void ooh323_delete_peer(struct ooh323_peer *peer); +void ooh323_delete_peer(struct ooh323_peer *peer); int delete_users(void); int delete_peers(void); @@ -95,7 +95,7 @@ int reload_config(int reload); int restart_monitor(void); int configure_local_rtp(struct ooh323_pvt *p, ooCallData* call); -void setup_rtp_connection(ooCallData *call, const char *remoteIp, +void setup_rtp_connection(ooCallData *call, const char *remoteIp, int remotePort); void close_rtp_connection(ooCallData *call); struct ast_frame *ooh323_rtp_read diff --git a/addons/format_mp3.c b/addons/format_mp3.c index bb0b20850d..f4b0a2ac0b 100644 --- a/addons/format_mp3.c +++ b/addons/format_mp3.c @@ -327,4 +327,3 @@ static int unload_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "MP3 format [Any rate but 8000hz mono is optimal]"); - diff --git a/addons/ooh323c/README b/addons/ooh323c/README index e1a5b20e4a..3231747098 100644 --- a/addons/ooh323c/README +++ b/addons/ooh323c/README @@ -6,22 +6,22 @@ Introduction Objective Open H.323 stack is a simple H.323 implementation in C. This package contains the core stack code. For complete H.323 stack package with examples or for more information visit www.obj-sys.com/open - The ASN.1 messaging code was developed using the Objective Systems ASN1C -compiler to implement the core H.323 specifications (H.225, H.235, -and H.245). Additional code was then developed which makes use of -the compiler generated code for presenting a comparatively high level + The ASN.1 messaging code was developed using the Objective Systems ASN1C +compiler to implement the core H.323 specifications (H.225, H.235, +and H.245). Additional code was then developed which makes use of +the compiler generated code for presenting a comparatively high level stack API. Features Features supported in this package include the following: -* H.225/Q.931 - the following message types are supported (including - support for FastStart and H.245 tunneling): - - Setup +* H.225/Q.931 - the following message types are supported (including + support for FastStart and H.245 tunneling): + - Setup - Connect - Call Proceeding - - Alerting + - Alerting - Facility - ReleaseComplete @@ -54,8 +54,8 @@ Features supported in this package include the following: To run the stack test application chansetup chansetup - This is a sample program developed for testing multiple calls. This program allows stack testing by placing multiple calls. The number of - calls, duration of each call and interval between successive calls are - configurable. + calls, duration of each call and interval between successive calls are + configurable. 1. Two instances of this program have to be run. Can be run on same machine or different machines. @@ -64,19 +64,19 @@ To run the stack test application chansetup cd tests/chansetup -2. For running listener instance, +2. For running listener instance, ./h323peer [--use-ip ip] [--use-port port] - where local ip address and port can be specified for listening to incoming + where local ip address and port can be specified for listening to incoming calls. By default, application determines ip address and uses default H323 port number 1720. 3. For running calling instance - + ./h323peer [--use-ip ip] -n -duration -interval destination - + where all times are in seconds. Interval of 0 means next call will be placed after current call finishes. "destination" is the dotted ip address of the endpoint running listener instance. @@ -86,10 +86,9 @@ To run the stack test application chansetup Reporting Problems: -Report problems you encounter by sending E-mail to support@obj-sys.com. +Report problems you encounter by sending E-mail to support@obj-sys.com. If you have any further questions or comments on what you would like to -see in the product or what is difficult to use or understand, please +see in the product or what is difficult to use or understand, please communicate them to us. Your feedback is important to us. Please let us -know how it works out for you - either good or bad. - +know how it works out for you - either good or bad. diff --git a/addons/ooh323c/src/Makefile.in b/addons/ooh323c/src/Makefile.in index 15b14f7dfd..8e170dc6a4 100644 --- a/addons/ooh323c/src/Makefile.in +++ b/addons/ooh323c/src/Makefile.in @@ -96,7 +96,7 @@ libooh323c_a_SOURCES = ooLogChan.h ooLogChan.c ooUtils.c ooUtils.h ooGkClient.h INCLUDES = -Ih323 -#include_HEADERS = ooUtils.h memheap.h ooCommon.h ooDateTime.h ooGkClient.h ooasn1.h oochannels.h ootrace.h ooh245.h ooports.h ooq931.h oohdr.h ooper.h ooSocket.h ooTimer.h ootypes.h eventHandler.h ooCapability.h ooCalls.h ooStackCmds.h ooh323.h ooh323ep.h printHandler.h rtctype.h h323/H235-SECURITY-MESSAGES.h h323/H323-MESSAGES.h h323/MULTIMEDIA-SYSTEM-CONTROL.h +#include_HEADERS = ooUtils.h memheap.h ooCommon.h ooDateTime.h ooGkClient.h ooasn1.h oochannels.h ootrace.h ooh245.h ooports.h ooq931.h oohdr.h ooper.h ooSocket.h ooTimer.h ootypes.h eventHandler.h ooCapability.h ooCalls.h ooStackCmds.h ooh323.h ooh323ep.h printHandler.h rtctype.h h323/H235-SECURITY-MESSAGES.h h323/H323-MESSAGES.h h323/MULTIMEDIA-SYSTEM-CONTROL.h EXTRA_DIST = oostk.dsp subdir = ooh323c/src mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -187,7 +187,7 @@ MULTIMEDIA-SYSTEM-CONTROLDec.$(OBJEXT): \ h323/MULTIMEDIA-SYSTEM-CONTROLDec.c MULTIMEDIA-SYSTEM-CONTROLEnc.$(OBJEXT): \ h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c -libooh323c.a: $(libooh323c_a_OBJECTS) $(libooh323c_a_DEPENDENCIES) +libooh323c.a: $(libooh323c_a_OBJECTS) $(libooh323c_a_DEPENDENCIES) -rm -f libooh323c.a $(libooh323c_a_AR) libooh323c.a $(libooh323c_a_OBJECTS) $(libooh323c_a_LIBADD) $(RANLIB) libooh323c.a diff --git a/addons/ooh323c/src/context.c b/addons/ooh323c/src/context.c index fe6c180ace..bc3db43878 100644 --- a/addons/ooh323c/src/context.c +++ b/addons/ooh323c/src/context.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -35,13 +35,13 @@ int initContext (OOCTXT* pctxt) return ASN_OK; } -int initContextBuffer +int initContextBuffer (OOCTXT* pctxt, const ASN1OCTET* bufaddr, ASN1UINT bufsiz) { if (bufaddr == 0) { /* dynamic buffer */ if (bufsiz == 0) bufsiz = ASN_K_ENCBUFSIZ; - pctxt->buffer.data = (ASN1OCTET*) + pctxt->buffer.data = (ASN1OCTET*) memHeapAlloc (&pctxt->pMsgMemHeap, bufsiz); if (!pctxt->buffer.data) return ASN_E_NOMEM; pctxt->buffer.size = bufsiz; @@ -60,7 +60,7 @@ int initContextBuffer return ASN_OK; } -int initSubContext (OOCTXT* pctxt, OOCTXT* psrc) +int initSubContext (OOCTXT* pctxt, OOCTXT* psrc) { /* ast_mutex_lock(&pctxt->pLock); */ int stat = ASN_OK; @@ -85,7 +85,7 @@ void freeContext (OOCTXT* pctxt) ASN1BOOL saveBuf; ast_mutex_lock(&pctxt->pLock); saveBuf = (pctxt->flags & ASN1SAVEBUF) != 0; - + if (pctxt->buffer.dynamic && pctxt->buffer.data) { if (saveBuf) { memHeapMarkSaved (&pctxt->pMsgMemHeap, pctxt->buffer.data, TRUE); @@ -130,7 +130,7 @@ int setPERBufferUsingCtxt (OOCTXT* pTarget, OOCTXT* pSource) { int stat; ast_mutex_lock(&pTarget->pLock); ast_mutex_lock(&pSource->pLock); - stat = initContextBuffer + stat = initContextBuffer (pTarget, pSource->buffer.data, pSource->buffer.size); if (ASN_OK == stat) { @@ -151,11 +151,11 @@ int setPERBuffer (OOCTXT* pctxt, ast_mutex_unlock(&pctxt->pLock); if(stat != ASN_OK) return stat; - + return ASN_OK; } -OOCTXT* newContext () +OOCTXT* newContext () { /* OOCTXT* pctxt = (OOCTXT*) ASN1CRTMALLOC0 (sizeof(OOCTXT)); */ OOCTXT* pctxt = ast_malloc(sizeof(OOCTXT)); diff --git a/addons/ooh323c/src/decode.c b/addons/ooh323c/src/decode.c index 3d7fc04c89..3ce74bfb8c 100644 --- a/addons/ooh323c/src/decode.c +++ b/addons/ooh323c/src/decode.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -19,16 +19,16 @@ #include "ooasn1.h" -static int decode16BitConstrainedString +static int decode16BitConstrainedString (OOCTXT* pctxt, Asn116BitCharString* pString, Asn116BitCharSet* pCharSet); -static int decodeOctets +static int decodeOctets (OOCTXT* pctxt, ASN1OCTET* pbuffer, ASN1UINT bufsiz, ASN1UINT nbits); static int getComponentLength (OOCTXT* pctxt, ASN1UINT itemBits); int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) -{ +{ unsigned char mask; if (nbits == 0) { @@ -47,7 +47,7 @@ int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) pctxt->buffer.bitOffset -= nbits; - *pvalue = ((pctxt->buffer.data[pctxt->buffer.byteIndex]) >> + *pvalue = ((pctxt->buffer.data[pctxt->buffer.byteIndex]) >> pctxt->buffer.bitOffset) & ((1 << nbits) - 1); return ASN_OK; @@ -62,7 +62,7 @@ int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) /* Check if buffer contains number of bits requested */ int nbytes = (((nbits - pctxt->buffer.bitOffset) + 7) / 8); - + if ((pctxt->buffer.byteIndex + nbytes) >= pctxt->buffer.size) { return LOG_ASN1ERR (pctxt, ASN_E_ENDOFBUF); } @@ -78,7 +78,7 @@ int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) /* second read bytes from next byteIndex */ while (nbits >= 8) { - *pvalue = (*pvalue << 8) | + *pvalue = (*pvalue << 8) | (pctxt->buffer.data[pctxt->buffer.byteIndex]); pctxt->buffer.byteIndex++; nbits -= 8; @@ -87,8 +87,8 @@ int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) /* third read bits & set bitoffset of the byteIndex */ if (nbits > 0) { pctxt->buffer.bitOffset = 8 - nbits; - *pvalue = (*pvalue << nbits) | - ((pctxt->buffer.data[pctxt->buffer.byteIndex]) >> + *pvalue = (*pvalue << nbits) | + ((pctxt->buffer.data[pctxt->buffer.byteIndex]) >> pctxt->buffer.bitOffset); } @@ -96,7 +96,7 @@ int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits) } } -int decodeBitString +int decodeBitString (OOCTXT* pctxt, ASN1UINT* numbits_p, ASN1OCTET* buffer, ASN1UINT bufsiz) { ASN1UINT bitcnt; @@ -111,7 +111,7 @@ int decodeBitString if (bitcnt > 0) { *numbits_p += bitcnt; - stat = bitAndOctetStringAlignmentTest + stat = bitAndOctetStringAlignmentTest (pSizeList, bitcnt, TRUE, &doAlign); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -133,7 +133,7 @@ int decodeBitString return ASN_OK; } -int decodeBMPString +int decodeBMPString (OOCTXT* pctxt, ASN1BMPString* pvalue, Asn116BitCharSet* permCharSet) { Asn116BitCharSet charSet; @@ -164,7 +164,7 @@ int decodeByteAlign (OOCTXT* pctxt) return ASN_OK; } -int decodeConstrainedStringEx +int decodeConstrainedStringEx (OOCTXT* pctxt, const char** string, const char* charSet, ASN1UINT abits, ASN1UINT ubits, ASN1UINT canSetBits) { @@ -227,9 +227,9 @@ int decodeConstrainedStringEx return ASN_OK; } -int decodeConsInteger +int decodeConsInteger (OOCTXT* pctxt, ASN1INT* pvalue, ASN1INT lower, ASN1INT upper) -{ +{ ASN1UINT range_value = upper - lower; ASN1UINT adjusted_value; int stat = ASN_OK; @@ -254,9 +254,9 @@ int decodeConsInteger return stat; } -int decodeConsUInt8 +int decodeConsUInt8 (OOCTXT* pctxt, ASN1UINT8* pvalue, ASN1UINT lower, ASN1UINT upper) -{ +{ ASN1UINT range_value, value; ASN1UINT adjusted_value; int stat = ASN_OK; @@ -299,9 +299,9 @@ int decodeConsUInt8 return stat; } -int decodeConsUInt16 +int decodeConsUInt16 (OOCTXT* pctxt, ASN1USINT* pvalue, ASN1UINT lower, ASN1UINT upper) -{ +{ ASN1UINT range_value, value; ASN1UINT adjusted_value; int stat = ASN_OK; @@ -328,9 +328,9 @@ int decodeConsUInt16 return stat; } -int decodeConsUnsigned +int decodeConsUnsigned (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT lower, ASN1UINT upper) -{ +{ ASN1UINT range_value; ASN1UINT adjusted_value; int stat = ASN_OK; @@ -354,9 +354,9 @@ int decodeConsUnsigned return stat; } -int decodeConsWholeNumber +int decodeConsWholeNumber (OOCTXT* pctxt, ASN1UINT* padjusted_value, ASN1UINT range_value) -{ +{ ASN1UINT nocts, range_bitcnt; int stat; @@ -419,9 +419,9 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) /* If "fast copy" option is not set (ASN1FATSCOPY) or if constructed, * copy the bit string value into a dynamic memory buffer; - * otherwise, store the pointer to the value in the decode + * otherwise, store the pointer to the value in the decode * buffer in the data pointer argument. */ - + if (pctxt->flags & ASN1FASTCOPY) { /* check is it possible to do optimized decoding */ @@ -433,7 +433,7 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); stat = DECODEBIT (pctxt, &bit); /* read first bit of length determinant */ - if (bit == 1 && stat == ASN_OK) + if (bit == 1 && stat == ASN_OK) stat = DECODEBIT (pctxt, &bit); /* read second bit */ pctxt->buffer.byteIndex = byteIndex; /* restore byte index */ @@ -441,9 +441,9 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) /* if either first or second bit != 0 - not fragmented */ - if (bit == 0 && stat == ASN_OK) { + if (bit == 0 && stat == ASN_OK) { ASN1UINT bitcnt; - + stat = decodeLength (pctxt, &bitcnt); if (stat != 0) return LOG_ASN1ERR (pctxt, stat); @@ -454,9 +454,9 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) stat = moveBitCursor (pctxt, bitcnt); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); } - else + else pBitStr->data = 0; - + return stat; } } @@ -470,13 +470,13 @@ int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr) } nocts = (nbits + 7) / 8; - + /* Allocate memory for the target string */ if (nocts > 0) { ptmp = (ASN1OCTET*) ASN1MALLOC (pctxt, nocts); if (0 == ptmp) return LOG_ASN1ERR (pctxt, ASN_E_NOMEM); - + /* Call static bit string decode function */ stat = decodeBitString (pctxt, &pBitStr->numbits, ptmp, nocts); @@ -493,7 +493,7 @@ int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr) /* If "fast copy" option is not set (ASN1FASTCOPY) or if constructed, * copy the octet string value into a dynamic memory buffer; - * otherwise, store the pointer to the value in the decode + * otherwise, store the pointer to the value in the decode * buffer in the data pointer argument. */ if (pctxt->flags & ASN1FASTCOPY) { @@ -507,7 +507,7 @@ int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr) if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); stat = DECODEBIT (pctxt, &bit); /* read first bit of length determinant */ - if (bit == 1 && stat == ASN_OK) + if (bit == 1 && stat == ASN_OK) stat = DECODEBIT (pctxt, &bit); /* read second bit */ pctxt->buffer.byteIndex = byteIndex; /* restore byte index */ @@ -515,9 +515,9 @@ int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr) /* if either first or second bit != 0 - not fragmented */ - if (bit == 0 && stat == ASN_OK) { + if (bit == 0 && stat == ASN_OK) { ASN1UINT octcnt; - + stat = decodeLength (pctxt, &octcnt); if (stat != 0) return LOG_ASN1ERR (pctxt, stat); @@ -528,13 +528,13 @@ int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr) stat = moveBitCursor (pctxt, octcnt * 8); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); } - else + else pOctStr->data = 0; - + return stat; } } - + nocts = getComponentLength (pctxt, 8); if (nocts < 0) return LOG_ASN1ERR (pctxt, nocts); @@ -671,14 +671,14 @@ int decodeObjectIdentifier (OOCTXT* pctxt, ASN1OBJID* pvalue) if (j == 0) { subid = pvalue->subid[0]; pvalue->subid[0] = ((subid / 40) >= 2) ? 2 : subid / 40; - pvalue->subid[1] = (pvalue->subid[0] == 2) ? + pvalue->subid[1] = (pvalue->subid[0] == 2) ? subid - 80 : subid % 40; j = 2; } else j++; } else - stat = ASN_E_INVOBJID; + stat = ASN_E_INVOBJID; } pvalue->numids = j; @@ -687,9 +687,9 @@ int decodeObjectIdentifier (OOCTXT* pctxt, ASN1OBJID* pvalue) return (stat); } -static int decodeOctets +static int decodeOctets (OOCTXT* pctxt, ASN1OCTET* pbuffer, ASN1UINT bufsiz, ASN1UINT nbits) -{ +{ ASN1UINT nbytes = (nbits + 7) / 8 ; ASN1UINT i = 0, j; ASN1UINT rshift = pctxt->buffer.bitOffset; @@ -740,20 +740,20 @@ static int decodeOctets /* Copy last partial byte */ if (nbits >= rshift) { - pbuffer[i] = + pbuffer[i] = pctxt->buffer.data[pctxt->buffer.byteIndex++] << lshift; nbitsInLastOctet = nbits - rshift; if (nbitsInLastOctet > 0) { - pbuffer[i] |= + pbuffer[i] |= pctxt->buffer.data[pctxt->buffer.byteIndex] >> rshift; } pctxt->buffer.bitOffset = 8 - nbitsInLastOctet; } else if (nbits > 0) { /* nbits < rshift */ - pbuffer[i] = + pbuffer[i] = pctxt->buffer.data[pctxt->buffer.byteIndex] << lshift; pctxt->buffer.bitOffset = rshift - nbits; } @@ -773,7 +773,7 @@ static int decodeOctets return ASN_OK; } -int decodeOctetString +int decodeOctetString (OOCTXT* pctxt, ASN1UINT* numocts_p, ASN1OCTET* buffer, ASN1UINT bufsiz) { ASN1UINT octcnt; @@ -790,7 +790,7 @@ int decodeOctetString if (TRUE) { ASN1BOOL doAlign; - stat = bitAndOctetStringAlignmentTest + stat = bitAndOctetStringAlignmentTest (pSizeList, octcnt, FALSE, &doAlign); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -800,7 +800,7 @@ int decodeOctetString } } - stat = decodeOctets (pctxt, &buffer[octidx], + stat = decodeOctets (pctxt, &buffer[octidx], bufsiz - octidx, (octcnt * 8)); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -815,7 +815,7 @@ int decodeOctetString return ASN_OK; } -int decodeOpenType +int decodeOpenType (OOCTXT* pctxt, const ASN1OCTET** object_p2, ASN1UINT* numocts_p) { ASN1DynOctStr octStr; @@ -883,7 +883,7 @@ int decodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT lower) stat = decodeLength (pctxt, &nbytes); if (stat < 0) return LOG_ASN1ERR (pctxt, stat); - + if (nbytes > 0) { stat = decodeByteAlign (pctxt); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -898,7 +898,7 @@ int decodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT lower) } int decodeSmallNonNegWholeNumber (OOCTXT* pctxt, ASN1UINT* pvalue) -{ +{ ASN1BOOL bitValue; ASN1UINT len; int ret; @@ -959,7 +959,7 @@ int decodeVarWidthCharString (OOCTXT* pctxt, const char** pvalue) return ASN_OK; } -static int decode16BitConstrainedString +static int decode16BitConstrainedString (OOCTXT* pctxt, Asn116BitCharString* pString, Asn116BitCharSet* pCharSet) { ASN1UINT i, idx, nbits = pCharSet->alignedBits; @@ -985,7 +985,7 @@ static int decode16BitConstrainedString stat = decodeBits (pctxt, &idx, nbits); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); - pString->data[i] = (pCharSet->charSet.data == 0) ? + pString->data[i] = (pCharSet->charSet.data == 0) ? idx + pCharSet->firstChar : pCharSet->charSet.data[idx]; } } @@ -1048,6 +1048,6 @@ int moveBitCursor (OOCTXT* pctxt, int bitOffset) if (pctxt->buffer.byteIndex > pctxt->buffer.size) { return (ASN_E_ENDOFBUF); } - + return ASN_OK; } diff --git a/addons/ooh323c/src/dlist.c b/addons/ooh323c/src/dlist.c index 71dd9ee11f..12b15b1525 100644 --- a/addons/ooh323c/src/dlist.c +++ b/addons/ooh323c/src/dlist.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -30,7 +30,7 @@ void dListInit (DList* pList) DListNode* dListAppend (OOCTXT* pctxt, DList* pList, void* pData) { - DListNode* pListNode = (DListNode*) + DListNode* pListNode = (DListNode*) memAlloc (pctxt, sizeof(DListNode)); if (0 != pListNode) { @@ -53,7 +53,7 @@ DListNode* dListAppend (OOCTXT* pctxt, DList* pList, void* pData) DListNode* dListAppendNode (OOCTXT* pctxt, DList* pList, void* pData) { - DListNode* pListNode = + DListNode* pListNode = (DListNode*) (((char*)pData) - sizeof(DListNode)); if (0 != pListNode) { @@ -109,7 +109,7 @@ void dListFreeAll (OOCTXT* pctxt, DList* pList) for (pNode = pList->head; pNode != 0; pNode = pNextNode) { pNextNode = pNode->next; - + memFreePtr (pctxt, pNode->data); memFreePtr (pctxt, pNode); } @@ -148,8 +148,8 @@ void dListFindAndRemove(struct OOCTXT* pctxt, DList* pList, void *data) memFreePtr(pctxt, pNode); } } - -DListNode* dListFindByIndex (DList* pList, int index) + +DListNode* dListFindByIndex (DList* pList, int index) { DListNode* curNode; int i; @@ -163,11 +163,11 @@ DListNode* dListFindByIndex (DList* pList, int index) /* Insert item before given node */ -DListNode* dListInsertBefore +DListNode* dListInsertBefore (OOCTXT* pctxt, DList* pList, DListNode* node, const void* pData) { DListNode* pListNode = (DListNode*) memAlloc (pctxt, sizeof(DListNode)); - + if (0 != pListNode) { pListNode->data = (void*)pData; @@ -212,7 +212,7 @@ DListNode* dListInsertBefore /* Insert item after given node */ -DListNode* dListInsertAfter +DListNode* dListInsertAfter (OOCTXT* pctxt, DList* pList, DListNode* node, const void* pData) { DListNode* pListNode = (DListNode*) memAlloc (pctxt, sizeof(DListNode)); @@ -258,4 +258,3 @@ DListNode* dListInsertAfter return pListNode; } - diff --git a/addons/ooh323c/src/dlist.h b/addons/ooh323c/src/dlist.h index 34a73c80de..9f735574eb 100644 --- a/addons/ooh323c/src/dlist.h +++ b/addons/ooh323c/src/dlist.h @@ -1,20 +1,20 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file dlist.h +/** + * @file dlist.h * Doubly-linked list structures and utility functions. */ #ifndef _OODLIST_H_ @@ -74,26 +74,26 @@ extern "C" { * @param pData A pointer to a data item to be appended to the list. * @return A pointer to an allocated node structure used to link * the given data value into the list. - */ -EXTERN DListNode* dListAppend + */ +EXTERN DListNode* dListAppend (struct OOCTXT* pctxt, DList* pList, void* pData); -EXTERN DListNode* dListAppendNode +EXTERN DListNode* dListAppendNode (struct OOCTXT* pctxt, DList* pList, void* pData); /** - * This function delete the head item from the list and returns a pointer - * the data item stored in that node. The memory for the node structure + * This function delete the head item from the list and returns a pointer + * the data item stored in that node. The memory for the node structure * is released. * * @param pctxt A pointer to a context structure. This provides a * storage area for the function to store all working * variables that must be maintained between function * calls. - * @param pList A pointer to the linked list structure from which + * @param pList A pointer to the linked list structure from which * the node will be deleted. * @return A pointer to the data item stored in the deleted node. - */ + */ EXTERN void* dListDeleteHead (struct OOCTXT* pctxt, DList* pList); EXTERN DListNode* dListFindByIndex (DList* pList, int index); @@ -101,7 +101,7 @@ EXTERN DListNode* dListFindByIndex (DList* pList, int index); /** * This function initializes a doubly linked list structure. It sets the number * of elements to zero and sets all internal pointer values to NULL. A doubly - * linked-list structure is described by the DList type. Nodes of the list + * linked-list structure is described by the DList type. Nodes of the list * are of type DListNode. * * Memory for the structures is allocated using the memAlloc run-time @@ -130,7 +130,7 @@ EXTERN void dListInit (DList* pList); */ EXTERN void dListFreeNodes (struct OOCTXT* pctxt, DList* pList); -/** +/** * This function removes all nodes from the linked list structure and releases * the memory that was allocated for storing the node structures * (DListNode) and for data. The memory for data in each node must have @@ -146,37 +146,37 @@ EXTERN void dListFreeNodes (struct OOCTXT* pctxt, DList* pList); EXTERN void dListFreeAll (struct OOCTXT* pctxt, DList* pList); /** - * This function inserts an item into the linked list structure before the + * This function inserts an item into the linked list structure before the * specified element. - * + * * @param pctxt Pointer to a context structure. - * @param pList A pointer to a linked list structure into which the + * @param pList A pointer to a linked list structure into which the * data item is to be inserted. - * @param node The position in the list where the item is to be - * inserted. The item will be inserted before this + * @param node The position in the list where the item is to be + * inserted. The item will be inserted before this * node or appended to the list if node is null. * @param pData A pointer to the data item to be inserted to the list. - * @return A pointer to an allocated node structure used to + * @return A pointer to an allocated node structure used to * link the given data value into the list. */ -EXTERN DListNode* dListInsertBefore +EXTERN DListNode* dListInsertBefore (struct OOCTXT* pctxt, DList* pList, DListNode* node, const void* pData); /** - * This function inserts an item into the linked list structure after the + * This function inserts an item into the linked list structure after the * specified element. - * + * * @param pctxt Pointer to a context structure. - * @param pList A pointer to a linked list structure into which the + * @param pList A pointer to a linked list structure into which the * data item is to be inserted. - * @param node The position in the list where the item is to be - * inserted. The item will be inserted after this + * @param node The position in the list where the item is to be + * inserted. The item will be inserted after this * node or added as the head element if node is null. * @param pData A pointer to the data item to be inserted to the list. - * @return A pointer to an allocated node structure used to + * @return A pointer to an allocated node structure used to * link the given data value into the list. */ -EXTERN DListNode* dListInsertAfter +EXTERN DListNode* dListInsertAfter (struct OOCTXT* pctxt, DList* pList, DListNode* node, const void* pData); /** @@ -194,7 +194,7 @@ EXTERN DListNode* dListInsertAfter EXTERN void dListRemove (DList* pList, DListNode* node); EXTERN void dListFindAndRemove(struct OOCTXT* pctxt, DList* pList, void* data); -/** +/** * @} */ #ifdef __cplusplus diff --git a/addons/ooh323c/src/encode.c b/addons/ooh323c/src/encode.c index 22fc1f31d3..b48733be84 100644 --- a/addons/ooh323c/src/encode.c +++ b/addons/ooh323c/src/encode.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -20,7 +20,7 @@ #include "ooasn1.h" -static int encode16BitConstrainedString +static int encode16BitConstrainedString (OOCTXT* pctxt, Asn116BitCharString value, Asn116BitCharSet* pCharSet); static int encode2sCompBinInt (OOCTXT* pctxt, ASN1INT value); @@ -34,7 +34,7 @@ int encodeIdent (OOCTXT* pctxt, ASN1UINT ident); int encodeBit (OOCTXT* pctxt, ASN1BOOL value) -{ +{ int stat = ASN_OK; /* If start of new byte, init to zero */ @@ -58,7 +58,7 @@ int encodeBit (OOCTXT* pctxt, ASN1BOOL value) /* Set single-bit value */ if (value) { - pctxt->buffer.data[pctxt->buffer.byteIndex] |= + pctxt->buffer.data[pctxt->buffer.byteIndex] |= ( 1 << pctxt->buffer.bitOffset ); } @@ -74,7 +74,7 @@ int encodeBit (OOCTXT* pctxt, ASN1BOOL value) } int encodeBits (OOCTXT* pctxt, ASN1UINT value, ASN1UINT nbits) -{ +{ int nbytes = (nbits + 7)/ 8, stat = ASN_OK; if (nbits == 0) return stat; @@ -94,7 +94,7 @@ int encodeBits (OOCTXT* pctxt, ASN1UINT value, ASN1UINT nbits) if (nbits < (unsigned)pctxt->buffer.bitOffset) { pctxt->buffer.bitOffset -= nbits; - pctxt->buffer.data[pctxt->buffer.byteIndex] |= + pctxt->buffer.data[pctxt->buffer.byteIndex] |= ( value << pctxt->buffer.bitOffset ); return stat; } @@ -108,22 +108,22 @@ int encodeBits (OOCTXT* pctxt, ASN1UINT value, ASN1UINT nbits) /* to set bits in subsequent bytes.. */ nbits -= pctxt->buffer.bitOffset; - pctxt->buffer.data[pctxt->buffer.byteIndex++] |= + pctxt->buffer.data[pctxt->buffer.byteIndex++] |= (ASN1OCTET)( value >> nbits ); - pctxt->buffer.data[pctxt->buffer.byteIndex] = 0; + pctxt->buffer.data[pctxt->buffer.byteIndex] = 0; while (nbits >= 8) { nbits -= 8; - pctxt->buffer.data[pctxt->buffer.byteIndex++] = + pctxt->buffer.data[pctxt->buffer.byteIndex++] = (ASN1OCTET)( value >> nbits ); - pctxt->buffer.data[pctxt->buffer.byteIndex] = 0; + pctxt->buffer.data[pctxt->buffer.byteIndex] = 0; } /* copy final partial byte */ pctxt->buffer.bitOffset = 8 - nbits; if (nbits > 0) { - pctxt->buffer.data[pctxt->buffer.byteIndex] = + pctxt->buffer.data[pctxt->buffer.byteIndex] = (ASN1OCTET)((value & ((1 << nbits)-1)) << pctxt->buffer.bitOffset); } else @@ -133,11 +133,11 @@ int encodeBits (OOCTXT* pctxt, ASN1UINT value, ASN1UINT nbits) } int encodeBitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits) -{ +{ int lshift = pctxt->buffer.bitOffset; int rshift = 8 - pctxt->buffer.bitOffset; int stat = ASN_OK; - ASN1OCTET mask = 0x0; + ASN1OCTET mask = 0x0; if (nbits == 0) return ASN_OK; @@ -173,14 +173,14 @@ int encodeBitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits) /* possibly some bits in the following octet.. */ else { - pctxt->buffer.data[pctxt->buffer.byteIndex] |= + pctxt->buffer.data[pctxt->buffer.byteIndex] |= (ASN1OCTET)(value >> rshift); pctxt->buffer.bitOffset -= nbits; if (pctxt->buffer.bitOffset < 0) { pctxt->buffer.byteIndex++; - pctxt->buffer.data[pctxt->buffer.byteIndex] = + pctxt->buffer.data[pctxt->buffer.byteIndex] = (ASN1OCTET)(value << lshift); pctxt->buffer.bitOffset += 8; } @@ -202,7 +202,7 @@ int encodeBitString (OOCTXT* pctxt, ASN1UINT numbits, const ASN1OCTET* data) if (enclen > 0) { ASN1BOOL doAlign; - stat = bitAndOctetStringAlignmentTest + stat = bitAndOctetStringAlignmentTest (pSizeList, numbits, TRUE, &doAlign); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -225,7 +225,7 @@ int encodeBitString (OOCTXT* pctxt, ASN1UINT numbits, const ASN1OCTET* data) return ASN_OK; } -int encodeBMPString +int encodeBMPString (OOCTXT* pctxt, ASN1BMPString value, Asn116BitCharSet* permCharSet) { Asn116BitCharSet charSet; @@ -278,9 +278,9 @@ int encodeCheckBuffer (OOCTXT* pctxt, ASN1UINT nbytes) return (stat); } -int encodeConsInteger +int encodeConsInteger (OOCTXT* pctxt, ASN1INT value, ASN1INT lower, ASN1INT upper) -{ +{ ASN1UINT range_value; ASN1UINT adjusted_value; int stat; @@ -301,7 +301,7 @@ int encodeConsInteger else { range_value = upper + abs(lower); adjusted_value = value + abs(lower); - } + } if (range_value != ASN1UINT_MAX) { range_value += 1; } @@ -316,9 +316,9 @@ int encodeConsInteger return stat; } -int encodeConsUnsigned +int encodeConsUnsigned (OOCTXT* pctxt, ASN1UINT value, ASN1UINT lower, ASN1UINT upper) -{ +{ ASN1UINT range_value; ASN1UINT adjusted_value; int stat; @@ -340,9 +340,9 @@ int encodeConsUnsigned return stat; } -int encodeConsWholeNumber +int encodeConsWholeNumber (OOCTXT* pctxt, ASN1UINT adjusted_value, ASN1UINT range_value) -{ +{ ASN1UINT nocts, range_bitcnt = getUIntBitCount (range_value - 1); int stat; @@ -396,8 +396,8 @@ int encodeConsWholeNumber } } -int encodeConstrainedStringEx (OOCTXT* pctxt, - const char* string, +int encodeConstrainedStringEx (OOCTXT* pctxt, + const char* string, const char* charSet, ASN1UINT abits, /* aligned char bits */ ASN1UINT ubits, /* unaligned char bits */ @@ -460,7 +460,7 @@ int encodeExpandBuffer (OOCTXT* pctxt, ASN1UINT nbytes) pctxt->buffer.data = (ASN1OCTET*) memHeapRealloc (&pctxt->pMsgMemHeap, pctxt->buffer.data, pctxt->buffer.size); - + if (!pctxt->buffer.data) return (ASN_E_NOMEM); return (ASN_OK); @@ -481,7 +481,7 @@ ASN1OCTET* encodeGetMsgPtr (OOCTXT* pctxt, int* pLength) return pctxt->buffer.data; } -int encodeIdent (OOCTXT* pctxt, ASN1UINT ident) +int encodeIdent (OOCTXT* pctxt, ASN1UINT ident) { ASN1UINT mask; int nshifts = 0, stat; @@ -508,9 +508,9 @@ int encodeIdent (OOCTXT* pctxt, ASN1UINT ident) } int encodeLength (OOCTXT* pctxt, ASN1UINT value) -{ +{ ASN1BOOL extendable; - Asn1SizeCnst* pSize = + Asn1SizeCnst* pSize = checkSize (pctxt->pSizeConstraint, value, &extendable); ASN1UINT lower = (pSize) ? pSize->lower : 0; ASN1UINT upper = (pSize) ? pSize->upper : ASN1UINT_MAX; @@ -520,7 +520,7 @@ int encodeLength (OOCTXT* pctxt, ASN1UINT value) /* within the range of any of them, signal constraint violation */ /* error.. */ - if (pctxt->pSizeConstraint && !pSize) + if (pctxt->pSizeConstraint && !pSize) return LOG_ASN1ERR (pctxt, ASN_E_CONSVIO); /* Reset the size constraint in the context block structure */ @@ -578,11 +578,11 @@ int encodeObjectIdentifier (OOCTXT* pctxt, ASN1OBJID* pvalue) if (0 == pvalue) return LOG_ASN1ERR (pctxt, ASN_E_INVOBJID); if (numids < 2) return LOG_ASN1ERR (pctxt, ASN_E_INVOBJID); if (pvalue->subid[0] > 2) return LOG_ASN1ERR (pctxt, ASN_E_INVOBJID); - if (pvalue->subid[0] != 2 && pvalue->subid[1] > 39) + if (pvalue->subid[0] != 2 && pvalue->subid[1] > 39) return LOG_ASN1ERR (pctxt, ASN_E_INVOBJID); /* Passed checks, encode object identifier */ - + /* Munge first two sub ID's and encode */ temp = ((pvalue->subid[0] * 40) + pvalue->subid[1]); @@ -600,7 +600,7 @@ int encodeObjectIdentifier (OOCTXT* pctxt, ASN1OBJID* pvalue) } int encodebitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits) -{ +{ int lshift = pctxt->buffer.bitOffset; int rshift = 8 - pctxt->buffer.bitOffset; int stat = ASN_OK; @@ -640,14 +640,14 @@ int encodebitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits) /* possibly some bits in the following octet.. */ else { - pctxt->buffer.data[pctxt->buffer.byteIndex] |= + pctxt->buffer.data[pctxt->buffer.byteIndex] |= (ASN1OCTET)(value >> rshift); pctxt->buffer.bitOffset -= nbits; if (pctxt->buffer.bitOffset < 0) { pctxt->buffer.byteIndex++; - pctxt->buffer.data[pctxt->buffer.byteIndex] = + pctxt->buffer.data[pctxt->buffer.byteIndex] = (ASN1OCTET)(value << lshift); pctxt->buffer.bitOffset += 8; } @@ -657,7 +657,7 @@ int encodebitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits) } int encodeOctets (OOCTXT* pctxt, const ASN1OCTET* pvalue, ASN1UINT nbits) -{ +{ int i = 0, stat; int numFullOcts = nbits / 8; @@ -675,7 +675,7 @@ int encodeOctets (OOCTXT* pctxt, const ASN1OCTET* pvalue, ASN1UINT nbits) /* encode buffer.. */ if (pctxt->buffer.bitOffset == 8) { - memcpy (&pctxt->buffer.data[pctxt->buffer.byteIndex], pvalue, + memcpy (&pctxt->buffer.data[pctxt->buffer.byteIndex], pvalue, numFullOcts); pctxt->buffer.byteIndex += numFullOcts; pctxt->buffer.data[pctxt->buffer.byteIndex] = 0; @@ -714,7 +714,7 @@ int encodeOctetString (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data) if (enclen > 0) { ASN1BOOL doAlign; - stat = bitAndOctetStringAlignmentTest + stat = bitAndOctetStringAlignmentTest (pSizeList, numocts, FALSE, &doAlign); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -793,7 +793,7 @@ int encodeOpenTypeExt (OOCTXT* pctxt, DList* pElemList) stat = encodeByteAlign (pctxt); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); - stat = encodeOpenType + stat = encodeOpenType (pctxt, pOpenType->numocts, pOpenType->data); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); @@ -833,7 +833,7 @@ int encodeSemiConsInteger (OOCTXT* pctxt, ASN1INT value, ASN1INT lower) if (lower > ASN1INT_MIN) value -= lower; - + /* Calculate signed number value length */ for ( ; shift > 0; shift -= 8) { @@ -889,10 +889,10 @@ int encodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT value, ASN1UINT lower) if ((stat = encodeLength (pctxt, nbytes)) < 0) { return stat; } - + if ((stat = encodeByteAlign (pctxt)) != ASN_OK) return stat; - + /* Encode additional zero byte if necessary */ if (nbytes > sizeof(value)) { @@ -908,7 +908,7 @@ int encodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT value, ASN1UINT lower) } int encodeSmallNonNegWholeNumber (OOCTXT* pctxt, ASN1UINT value) -{ +{ int stat; if (value < 64) { @@ -964,7 +964,7 @@ int encodeVarWidthCharString (OOCTXT* pctxt, const char* value) return ASN_OK; } -static int encode16BitConstrainedString +static int encode16BitConstrainedString (OOCTXT* pctxt, Asn116BitCharString value, Asn116BitCharSet* pCharSet) { ASN1UINT i, pos; @@ -985,7 +985,7 @@ static int encode16BitConstrainedString for (i = 0; i < value.nchars; i++) { if (pCharSet->charSet.data == 0) { - stat = encodeBits + stat = encodeBits (pctxt, value.data[i] - pCharSet->firstChar, nbits); if (stat != ASN_OK) return LOG_ASN1ERR (pctxt, stat); } @@ -1051,7 +1051,7 @@ static int encodeNonNegBinInt (OOCTXT* pctxt, ASN1UINT value) /* multiple of 8 bits and also satisifies the condition that the */ /* leading eight bits of the field shall not be zero unless the */ /* field is precisely 8 bits long. */ - + ASN1UINT bitcnt = (value == 0) ? 1 : getUIntBitCount (value); /* round-up to nearest 8-bit boundary */ @@ -1093,7 +1093,7 @@ static int encodeUnconsLength (OOCTXT* pctxt, ASN1UINT value) return enclen; } -static int getIdentByteCount (ASN1UINT ident) +static int getIdentByteCount (ASN1UINT ident) { if (ident < (1u << 7)) { /* 7 */ return 1; diff --git a/addons/ooh323c/src/errmgmt.c b/addons/ooh323c/src/errmgmt.c index 6aef0f4805..81e4cc3f0d 100644 --- a/addons/ooh323c/src/errmgmt.c +++ b/addons/ooh323c/src/errmgmt.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -49,21 +49,21 @@ static const char* g_status_text[] = { "Value constraint violation: field %s, value %s", "Value range error: lower bound is greater than upper", "Unexpected end of file detected", - "Invalid UTF-8 character at index %d", - "List error: concurrent modification attempt while iterating", + "Invalid UTF-8 character at index %d", + "List error: concurrent modification attempt while iterating", "List error: illegal state for attempted operation", "Array index out of bounds", "Invalid parameter passed to function or method", "Invalid time string format", - "Context is not initialized", - "ASN.1 value will not fit in target variable", - "Character is not within the defined character set", - "Invalid XML state for attempted operation", - "Error condition returned from XML parser:\n%s", + "Context is not initialized", + "ASN.1 value will not fit in target variable", + "Character is not within the defined character set", + "Invalid XML state for attempted operation", + "Error condition returned from XML parser:\n%s", "SEQUENCE elements not in correct order", "Invalid index for table constraint identifier", - "Invalid value for relational table constraint fixed type field", - "File not found", + "Invalid value for relational table constraint fixed type field", + "File not found", "File read error", "File write error", "Invalid Base64 string", @@ -153,7 +153,7 @@ char* errFmtMsg (ASN1ErrInfo* pErrInfo, char* bufp) j = pcnt = 0; tp = g_status_text[i]; - while (*tp) + while (*tp) { if (*tp == '%' && *(tp+1) == 's') { @@ -177,14 +177,14 @@ char* errFmtMsg (ASN1ErrInfo* pErrInfo, char* bufp) } else strcpy (bufp, "unrecognized completion status"); - } + } else strcpy (bufp, "normal completion status"); return (bufp); } /* Get error text in a dynamic memory buffer. This allocates memory */ -/* using the 'memAlloc' function. This memory is automatically freed */ +/* using the 'memAlloc' function. This memory is automatically freed */ /* at the time the 'memFree' function is called. */ char* errGetText (OOCTXT* pctxt) @@ -199,7 +199,7 @@ char* errGetText (OOCTXT* pctxt) while (pctxt->errInfo.stkx > 0) { pctxt->errInfo.stkx--; - sprintf (lbuf, " Module: %s, Line %d\n", + sprintf (lbuf, " Module: %s, Line %d\n", pctxt->errInfo.stack[pctxt->errInfo.stkx].module, pctxt->errInfo.stack[pctxt->errInfo.stkx].lineno); strcat(pBuf, lbuf); @@ -220,7 +220,7 @@ void errPrint (ASN1ErrInfo* pErrInfo) printf ("Stack trace:"); while (pErrInfo->stkx > 0) { pErrInfo->stkx--; - printf (" Module: %s, Line %d\n", + printf (" Module: %s, Line %d\n", pErrInfo->stack[pErrInfo->stkx].module, pErrInfo->stack[pErrInfo->stkx].lineno); } @@ -244,9 +244,9 @@ int errCopyData (ASN1ErrInfo* pSrcErrInfo, ASN1ErrInfo* pDestErrInfo) for (i = 0; i < pSrcErrInfo->stkx; i++) { if (pDestErrInfo->stkx < ASN_K_MAXERRSTK) { - pDestErrInfo->stack[pDestErrInfo->stkx].module = + pDestErrInfo->stack[pDestErrInfo->stkx].module = pSrcErrInfo->stack[i].module; - pDestErrInfo->stack[pDestErrInfo->stkx++].lineno = + pDestErrInfo->stack[pDestErrInfo->stkx++].lineno = pSrcErrInfo->stack[i].lineno; } } @@ -255,12 +255,12 @@ int errCopyData (ASN1ErrInfo* pSrcErrInfo, ASN1ErrInfo* pDestErrInfo) } -int errSetData (ASN1ErrInfo* pErrInfo, int status, - const char* module, int lno) -{ +int errSetData (ASN1ErrInfo* pErrInfo, int status, + const char* module, int lno) +{ if (pErrInfo->status == 0) { pErrInfo->status = status; } ooLogAsn1Error(status, module, lno); - return status; + return status; } diff --git a/addons/ooh323c/src/eventHandler.c b/addons/ooh323c/src/eventHandler.c index 82e1eb4359..ba25d0bef3 100644 --- a/addons/ooh323c/src/eventHandler.c +++ b/addons/ooh323c/src/eventHandler.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -64,7 +64,7 @@ void invokeUIntValue (OOCTXT* pctxt, ASN1UINT value) } } -void invokeBitStrValue (OOCTXT* pctxt, ASN1UINT numbits, +void invokeBitStrValue (OOCTXT* pctxt, ASN1UINT numbits, const ASN1OCTET* data) { if (0 != pctxt->pEventHandler) { @@ -72,7 +72,7 @@ void invokeBitStrValue (OOCTXT* pctxt, ASN1UINT numbits, } } -void invokeOctStrValue (OOCTXT* pctxt, ASN1UINT numocts, +void invokeOctStrValue (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data) { if (0 != pctxt->pEventHandler) { @@ -87,7 +87,7 @@ void invokeCharStrValue (OOCTXT* pctxt, const char* value) } } -void invokeCharStr16BitValue (OOCTXT* pctxt, ASN1UINT nchars, +void invokeCharStr16BitValue (OOCTXT* pctxt, ASN1UINT nchars, ASN116BITCHAR* data) { if (0 != pctxt->pEventHandler) { @@ -116,7 +116,7 @@ void invokeEnumValue (OOCTXT* pctxt, ASN1UINT value) } } -void invokeOpenTypeValue (OOCTXT* pctxt, ASN1UINT numocts, +void invokeOpenTypeValue (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data) { if (0 != pctxt->pEventHandler) { diff --git a/addons/ooh323c/src/eventHandler.h b/addons/ooh323c/src/eventHandler.h index e5eff605bd..32719c58a8 100644 --- a/addons/ooh323c/src/eventHandler.h +++ b/addons/ooh323c/src/eventHandler.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file eventHandler.h - * C event handler structure. This structure holds event handler function + * @file eventHandler.h + * C event handler structure. This structure holds event handler function * callbacks for use by the generated code. */ /** @@ -44,8 +44,8 @@ extern "C" { /** - * This is a function pointer for a callback function which is invoked - * from within a decode function when an element of a SEQUENCE, SET, + * This is a function pointer for a callback function which is invoked + * from within a decode function when an element of a SEQUENCE, SET, * SEQUENCE OF, SET OF, or CHOICE construct is parsed. * * @param name For SEQUENCE, SET, or CHOICE, this is the name of the @@ -63,8 +63,8 @@ typedef void (*StartElement) (const char* name, int index) ; /** - * This is a function pointer for a callback function which is invoked from - * within a decode function when parsing is complete on an element of a + * This is a function pointer for a callback function which is invoked from + * within a decode function when parsing is complete on an element of a * SEQUENCE, SET, SEQUENCE OF, SET OF, or CHOICE construct. * * @param name For SEQUENCE, SET, or CHOICE, this is the name of the @@ -82,7 +82,7 @@ typedef void (*EndElement) (const char* name, int index) ; /** - * This is a function pointer for a callback function which is invoked from + * This is a function pointer for a callback function which is invoked from * within a decode function when a value of the BOOLEAN ASN.1 type is parsed. * * @param value Parsed value. @@ -91,7 +91,7 @@ typedef void (*EndElement) (const char* name, int index) ; typedef void (*BoolValue) (ASN1BOOL value); /** - * This is a function pointer for a callback function which is invoked from + * This is a function pointer for a callback function which is invoked from * within a decode function when a value of the INTERGER ASN.1 type is parsed. * * @param value Parsed value. @@ -100,9 +100,9 @@ typedef void (*BoolValue) (ASN1BOOL value); typedef void (*IntValue) (ASN1INT value); /** - * This is a function pointer for a callback function which is invoked - * from within a decode function when a value of the INTEGER ASN.1 type - * is parsed. In this case, constraints on the integer value forced the + * This is a function pointer for a callback function which is invoked + * from within a decode function when a value of the INTEGER ASN.1 type + * is parsed. In this case, constraints on the integer value forced the * use of unsigned integer C type to represent the value. * * @param value Parsed value. @@ -111,19 +111,19 @@ typedef void (*IntValue) (ASN1INT value); typedef void (*UIntValue) (ASN1UINT value); /** - * This is a function pointer for a callback function which is invoked from - * within a decode function when a value of the BIT STRING ASN.1 type is + * This is a function pointer for a callback function which is invoked from + * within a decode function when a value of the BIT STRING ASN.1 type is * parsed. * - * @param numbits - Number of bits in the parsed value. - * @param data - Pointer to a byte array that contains the bit + * @param numbits - Number of bits in the parsed value. + * @param data - Pointer to a byte array that contains the bit * string data. * @return - none - */ + */ typedef void (*BitStrValue) (ASN1UINT numbits, const ASN1OCTET* data); /** - * This is a function pointer for a callback function which is invoked from + * This is a function pointer for a callback function which is invoked from * within a decode function when a value of one of the OCTET STRING ASN.1 type * is parsed. * @@ -135,8 +135,8 @@ typedef void (*BitStrValue) (ASN1UINT numbits, const ASN1OCTET* data); typedef void (*OctStrValue) (ASN1UINT numocts, const ASN1OCTET* data) ; /** - * This is a function pointer for a callback function which is invoked from - * within a decode function when a value of one of the 8-bit ASN.1 character + * This is a function pointer for a callback function which is invoked from + * within a decode function when a value of one of the 8-bit ASN.1 character * string types is parsed. * * @param value Null terminated character string value. @@ -145,8 +145,8 @@ typedef void (*OctStrValue) (ASN1UINT numocts, const ASN1OCTET* data) ; typedef void (*CharStrValue) (const char* value) ; /** - * This is a function pointer for a callback function which is invoked from - * within a decode function when a value of one of the 16-bit ASN.1 character + * This is a function pointer for a callback function which is invoked from + * within a decode function when a value of one of the 16-bit ASN.1 character * string types is parsed. * * This is used for the ASN.1 BmpString type. @@ -160,7 +160,7 @@ typedef void (*CharStrValue) (const char* value) ; typedef void (*CharStrValue16Bit) (ASN1UINT nchars, ASN116BITCHAR* data) ; /** - * This is a function pointer for a callback function which is invoked from + * This is a function pointer for a callback function which is invoked from * within a decode function when a value of the NULL ASN.1 type is parsed. * * @param - none @@ -169,8 +169,8 @@ typedef void (*CharStrValue16Bit) (ASN1UINT nchars, ASN116BITCHAR* data) ; typedef void (*NullValue) (void) ; /** - * This is a function pointer for a callback function which is invoked from - * within a decode function whn a value the OBJECT IDENTIFIER ASN.1 type is + * This is a function pointer for a callback function which is invoked from + * within a decode function whn a value the OBJECT IDENTIFIER ASN.1 type is * parsed. * * @param numSubIds Number of subidentifiers in the object identifier. @@ -180,8 +180,8 @@ typedef void (*NullValue) (void) ; typedef void (*OidValue) (ASN1UINT numSubIds, ASN1UINT* pSubIds) ; /** - * This is a function pointer for a callback function which is invoked from - * within a decode function when a value of the ENUMERATED ASN.1 type is + * This is a function pointer for a callback function which is invoked from + * within a decode function when a value of the ENUMERATED ASN.1 type is * parsed. * * @param value - Parsed enumerated value @@ -190,7 +190,7 @@ typedef void (*OidValue) (ASN1UINT numSubIds, ASN1UINT* pSubIds) ; typedef void (*EnumValue) (ASN1UINT value) ; /** - * This is a function pointer for a callback function which is invoked from + * This is a function pointer for a callback function which is invoked from * within a decode function when an ASN.1 open type is parsed. * * @param numocts Number of octets in the parsed value. @@ -223,7 +223,7 @@ typedef struct EventHandler { /** - * This function sets the event handler object within the context. It + * This function sets the event handler object within the context. It * will overwrite the definition of any handler that was set previously. * * @param pctxt Context to which event handler has to be added. @@ -233,8 +233,8 @@ typedef struct EventHandler { EXTERN void setEventHandler (OOCTXT* pctxt, EventHandler* pHandler); /** - * This function is called to remove the event handler current defined - * in the context. This is done by setting the event handler object + * This function is called to remove the event handler current defined + * in the context. This is done by setting the event handler object * pointer to NULL. * * @param pctxt Context from which event handler has to be removed. @@ -243,7 +243,7 @@ EXTERN void setEventHandler (OOCTXT* pctxt, EventHandler* pHandler); EXTERN void removeEventHandler (OOCTXT* pctxt); /** - * The following functions are invoked from within the generated + * The following functions are invoked from within the generated * code to call the various user-defined event handler methods .. */ EXTERN void invokeStartElement (OOCTXT* pctxt, const char* name, int index); @@ -252,33 +252,33 @@ EXTERN void invokeBoolValue (OOCTXT* pctxt, ASN1BOOL value); EXTERN void invokeIntValue (OOCTXT* pctxt, ASN1INT value); EXTERN void invokeUIntValue (OOCTXT* pctxt, ASN1UINT value); -EXTERN void invokeBitStrValue +EXTERN void invokeBitStrValue (OOCTXT* pctxt, ASN1UINT numbits, const ASN1OCTET* data); -EXTERN void invokeOctStrValue +EXTERN void invokeOctStrValue (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data); EXTERN void invokeCharStrValue (OOCTXT* pctxt, const char* value); -EXTERN void invokeCharStr16BitValue +EXTERN void invokeCharStr16BitValue (OOCTXT* pctxt, ASN1UINT nchars, ASN116BITCHAR* data); EXTERN void invokeNullValue (OOCTXT* pctxt); -EXTERN void invokeOidValue +EXTERN void invokeOidValue (OOCTXT* pctxt, ASN1UINT numSubIds, ASN1UINT* pSubIds); EXTERN void invokeEnumValue (OOCTXT* pctxt, ASN1UINT value); -EXTERN void invokeOpenTypeValue +EXTERN void invokeOpenTypeValue (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data); -/** - * @} +/** + * @} */ #ifdef __cplusplus } #endif -#endif +#endif diff --git a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h index 2f401b39af..9884f8b231 100644 --- a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h +++ b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c index 5ee4069567..cf8e0a7997 100644 --- a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c +++ b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -1797,4 +1797,3 @@ EXTERN int asn1PD_H235CryptoToken (OOCTXT* pctxt, H235CryptoToken* pvalue) return (stat); } - diff --git a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c index 8530c5198f..75f83f5120 100644 --- a/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c +++ b/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -1266,4 +1266,3 @@ EXTERN int asn1PE_H235CryptoToken (OOCTXT* pctxt, H235CryptoToken* pvalue) return (stat); } - diff --git a/addons/ooh323c/src/h323/H323-MESSAGES.c b/addons/ooh323c/src/h323/H323-MESSAGES.c index 2c27f3b930..8f750b9fb7 100644 --- a/addons/ooh323c/src/h323/H323-MESSAGES.c +++ b/addons/ooh323c/src/h323/H323-MESSAGES.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -109,4 +109,3 @@ EXTERN const char* gs_H323_MESSAGES_GSM_UIM_vplmn_CharSet = EXTERN const char* gs_H323_MESSAGES_AliasAddress_dialedDigits_CharSet = "#*,0123456789"; - diff --git a/addons/ooh323c/src/h323/H323-MESSAGES.h b/addons/ooh323c/src/h323/H323-MESSAGES.h index 733b58f862..eb32ad9c9d 100644 --- a/addons/ooh323c/src/h323/H323-MESSAGES.h +++ b/addons/ooh323c/src/h323/H323-MESSAGES.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/ooh323c/src/h323/H323-MESSAGESDec.c b/addons/ooh323c/src/h323/H323-MESSAGESDec.c index 503d7965f7..4a641e43b8 100644 --- a/addons/ooh323c/src/h323/H323-MESSAGESDec.c +++ b/addons/ooh323c/src/h323/H323-MESSAGESDec.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -27197,4 +27197,3 @@ EXTERN int asn1PD_H225RasMessage (OOCTXT* pctxt, H225RasMessage* pvalue) return (stat); } - diff --git a/addons/ooh323c/src/h323/H323-MESSAGESEnc.c b/addons/ooh323c/src/h323/H323-MESSAGESEnc.c index f818fb20c9..20159008ac 100644 --- a/addons/ooh323c/src/h323/H323-MESSAGESEnc.c +++ b/addons/ooh323c/src/h323/H323-MESSAGESEnc.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -22593,4 +22593,3 @@ EXTERN int asn1PE_H225RasMessage (OOCTXT* pctxt, H225RasMessage* pvalue) return (stat); } - diff --git a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c index ca69407a64..3771d1ab77 100644 --- a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c +++ b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -37,4 +37,3 @@ EXTERN const char* gs_MULTIMEDIA_SYSTEM_CONTROL_NetworkAccessParameters_networkA EXTERN const char* gs_MULTIMEDIA_SYSTEM_CONTROL_UserInputIndication_signal_signalType_CharSet = "!#*0123456789ABCD"; - diff --git a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h index 6923cba5af..240a800aee 100644 --- a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h +++ b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c index 0875f689df..7d6aecb51c 100644 --- a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c +++ b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -42167,4 +42167,3 @@ EXTERN int asn1PD_H245MultimediaSystemControlMessage (OOCTXT* pctxt, H245Multime return (stat); } - diff --git a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c index ac124d96da..65adf6f8ca 100644 --- a/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c +++ b/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -26596,4 +26596,3 @@ EXTERN int asn1PE_H245MultimediaSystemControlMessage (OOCTXT* pctxt, H245Multime return (stat); } - diff --git a/addons/ooh323c/src/memheap.c b/addons/ooh323c/src/memheap.c index 99a530848a..4bcbd7a3da 100644 --- a/addons/ooh323c/src/memheap.c +++ b/addons/ooh323c/src/memheap.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2004 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the LICENSE.txt file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the LICENSE.txt file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -21,7 +21,7 @@ ASN1UINT g_defBlkSize = XM_K_MEMBLKSIZ; -static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, +static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, void* pMemBlk, int blockType); typedef void OSMemElemDescr; @@ -110,39 +110,39 @@ pMemBlk->freeElemOff = (ASN1USINT)(QOFFSETOF (pElem, pMemBlk->data) + 1); \ #define SET_FREE_ELEM(pMemBlk, pElem) setLastElem (pMemBlk, pElem) /* Memory debugging macros */ -#define RTMEMDIAG1(msg) -#define RTMEMDIAG2(msg,a) +#define RTMEMDIAG1(msg) +#define RTMEMDIAG2(msg,a) #define RTMEMDIAG3(msg,a,b) #define RTMEMDIAG4(msg,a,b,c) #define FILLFREEMEM(mem,size) -#define FILLNEWMEM(mem,size) +#define FILLNEWMEM(mem,size) #define CHECKMEMELEM(memblk,elem) #define CHECKMEMBLOCK(memheap,memblk) -#define CHECKMEMHEAP(memheap) +#define CHECKMEMHEAP(memheap) #define TRACEMEMELEM(memblk, elem, name) #define TRACEFREE(memlink,name) -static void setLastElem (OSMemBlk* pMemBlk, OSMemElemDescr* pElem) +static void setLastElem (OSMemBlk* pMemBlk, OSMemElemDescr* pElem) { - if (pElem == 0) { - pMemBlk->freeElemOff = 0; - return; + if (pElem == 0) { + pMemBlk->freeElemOff = 0; + return; } - else if (ISLAST (pElem)) - return; + else if (ISLAST (pElem)) + return; else if (pMemBlk->freeElemOff > QOFFSETOF (pElem, pMemBlk->data) + 1) { - pElem_nextFreeOff (pElem) = QOFFSETOF (GET_FREE_ELEM (pMemBlk), pElem); - FORCE_SET_FREE_ELEM (pMemBlk, pElem); - } - else if (pMemBlk->freeElemOff == 0) { - pElem_nextFreeOff (pElem) = 0; - FORCE_SET_FREE_ELEM (pMemBlk, pElem); - } - else { - SET_FREE (pElem); - pElem_nextFreeOff (pElem) = 0; + pElem_nextFreeOff (pElem) = QOFFSETOF (GET_FREE_ELEM (pMemBlk), pElem); + FORCE_SET_FREE_ELEM (pMemBlk, pElem); + } + else if (pMemBlk->freeElemOff == 0) { + pElem_nextFreeOff (pElem) = 0; + FORCE_SET_FREE_ELEM (pMemBlk, pElem); + } + else { + SET_FREE (pElem); + pElem_nextFreeOff (pElem) = 0; } } @@ -171,7 +171,7 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) ppMemLink = &pMemHeap->phead; /* if size is greater than 2**19, then allocate as RAW block */ - + if (nunits > (1<<16) - 2) { void *data; @@ -189,9 +189,9 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) /* save size of the RAW memory block behind the pMemLink */ *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = nbytes; ast_mutex_unlock(&pMemHeap->pLock); - return data; + return data; } - + RTMEMDIAG2 ("memHeapAlloc: adjusted nbytes = %d\n", nbytes); /* Try to allocate a slot from an existing block on the list */ @@ -217,26 +217,26 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) pElem_flags (pElem) = 0; if (pMemBlk->lastElemOff != 0) - pElem_prevOff (pElem) = + pElem_prevOff (pElem) = (ASN1USINT)(pMemBlk->free_x - pMemBlk->lastElemOff + 1); - else + else pElem_prevOff (pElem) = 0; - + pPrevElem = GET_LAST_ELEM (pMemBlk); if (pPrevElem != 0) CLEAR_LAST (pPrevElem); - - pElem_nunits (pElem) = (ASN1USINT)nunits; + + pElem_nunits (pElem) = (ASN1USINT)nunits; pElem_beginOff (pElem) = QOFFSETOF (pElem, pMemBlk->data); pMemBlk->lastElemOff = (ASN1USINT)(pMemBlk->free_x + 1); mem_p = (void*) (pElem_data (pElem)); - + /* sizeof (OSMemElemDescr) == 1 unit */ - pMemBlk->free_x += nunits + 1; - + pMemBlk->free_x += nunits + 1; + SET_LAST_ELEM (pMemBlk, pElem); - + FILLNEWMEM (mem_p, nunits * 8u); TRACEMEMELEM(pMemBlk, pElem, "Allocated"); CHECKMEMELEM (pMemBlk, pElem); @@ -250,54 +250,54 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) if (0 == mem_p) { for (pMemLink = *ppMemLink; pMemLink != 0; pMemLink = pMemLink->pnext) { if (pMemLink->blockType & RTMEMRAW) continue; - + pMemBlk = (OSMemBlk*) pMemLink->pMemBlk; if (nunits <= (ASN1UINT)pMemBlk->freeMem) { OSMemElemDescr* pElem = GET_FREE_ELEM(pMemBlk), *pPrevFree = 0; - RTMEMDIAG2 - ("memHeapAlloc: try to reuse empty elems in pMemBlk = 0x%x...\n", + RTMEMDIAG2 + ("memHeapAlloc: try to reuse empty elems in pMemBlk = 0x%x...\n", pMemBlk); while (pElem != 0) { - if (ISFREE (pElem)) { + if (ISFREE (pElem)) { if (nunits <= (ASN1UINT)pElem_nunits (pElem)) { - RTMEMDIAG3 + RTMEMDIAG3 ("memHeapAlloc: " - "found an exisiting free element 0x%x, size %d\n", + "found an exisiting free element 0x%x, size %d\n", pElem, (pElem_nunits (pElem) * 8u)); - - if (pMemBlk->freeElemOff == - QOFFSETOF (pElem, pMemBlk->data) + 1) + + if (pMemBlk->freeElemOff == + QOFFSETOF (pElem, pMemBlk->data) + 1) { - + /* modify the pMemBlk->freeElemOff value if necsry */ OSMemElemDescr* nextFree = GET_NEXT_FREE (pElem); - FORCE_SET_FREE_ELEM (pMemBlk, nextFree); + FORCE_SET_FREE_ELEM (pMemBlk, nextFree); } else if (pPrevFree != 0) { OSMemElemDescr* pNextFree = GET_NEXT_FREE (pElem); if (pNextFree != 0) - pElem_nextFreeOff (pPrevFree) = QOFFSETOF (pNextFree, + pElem_nextFreeOff (pPrevFree) = QOFFSETOF (pNextFree, pPrevFree); else pElem_nextFreeOff (pPrevFree) = 0; - } + } CLEAR_FREE (pElem); /* set beginOff value */ pElem_beginOff (pElem) = QOFFSETOF (pElem, pMemBlk->data); - + pMemBlk->freeMem -= pElem_nunits (pElem); CHECKMEMELEM (pMemBlk, pElem); CHECKMEMBLOCK (pMemHeap, pMemBlk); - - mem_p = memHeapRealloc + + mem_p = memHeapRealloc (ppvMemHeap, pElem_data (pElem), nunits * 8u); if (mem_p != 0) { FILLNEWMEM (mem_p, nunits * 8u); @@ -311,7 +311,7 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) } if (mem_p != 0) break; } - } + } } /* If not successful, malloc a new block and alloc from it */ @@ -323,16 +323,16 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) RTMEMDIAG1 ("memHeapAlloc: alloc block..\n"); - allocSize = (ASN1UINT) ((((ASN1UINT)nunits) * 8u) + + allocSize = (ASN1UINT) ((((ASN1UINT)nunits) * 8u) + sizeof (OSMemBlk) + sizeof_OSMemElemDescr); - allocSize = (ASN1UINT) (allocSize < defBlkSize) ? defBlkSize : + allocSize = (ASN1UINT) (allocSize < defBlkSize) ? defBlkSize : ((allocSize + defBlkSize - 1) / defBlkSize * defBlkSize); dataUnits = (ASN1UINT)((allocSize - sizeof (OSMemBlk)) >> 3u); if (dataUnits >= (1u<<16)) { dataUnits = (ASN1UINT)((1u<<16) - 1); allocSize = (ASN1UINT) ((((ASN1UINT)dataUnits) * 8u) + sizeof (OSMemBlk)); - } + } pmem = (ASN1OCTET*) ast_malloc(allocSize + sizeof (OSMemLink)); if (0 != pmem) { @@ -348,7 +348,7 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) pElem_beginOff (pElem) = QOFFSETOF (pElem, pMemBlk->data); /* sizeof (OSMemElemDescr) == 1 unit */ - pMemBlk->free_x = (ASN1USINT)(nunits + 1); + pMemBlk->free_x = (ASN1USINT)(nunits + 1); pMemBlk->freeMem = 0; pMemBlk->nunits = (ASN1USINT)dataUnits; @@ -356,7 +356,7 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) pMemBlk->freeElemOff = 0; pMemBlk->nsaved = 0; - if (memHeapAddBlock (ppMemLink, pMemBlk, RTMEMSTD | RTMEMLINK) == 0) + if (memHeapAddBlock (ppMemLink, pMemBlk, RTMEMSTD | RTMEMLINK) == 0) { ast_free(pmem); ast_mutex_unlock(&pMemHeap->pLock); @@ -379,7 +379,7 @@ void* memHeapAlloc (void** ppvMemHeap, int nbytes) } RTMEMDIAG2 ("memHeapAlloc: pMemBlk = 0x%x\n", pMemBlk); RTMEMDIAG2 ("memHeapAlloc: pMemBlk->free_x = %d\n", pMemBlk->free_x); - RTMEMDIAG2 ("memHeapAlloc: pMemBlk->size = %d\n", + RTMEMDIAG2 ("memHeapAlloc: pMemBlk->size = %d\n", pMemBlk->nunits * 8u); RTMEMDIAG2 ("memHeapAlloc: mem_p = 0x%x\n", mem_p); RTMEMDIAG2 ("memHeapAlloc: sizeof (short) = %d\n", sizeof(short)); @@ -395,7 +395,7 @@ void* memHeapAllocZ (void** ppvMemHeap, int nbytes) return ptr; } -void memHeapFreePtr (void** ppvMemHeap, void* mem_p) +void memHeapFreePtr (void** ppvMemHeap, void* mem_p) { OSMemHeap* pMemHeap; OSMemLink** ppMemLink; @@ -417,7 +417,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) for (pMemLink = *ppMemLink; pMemLink != 0; pMemLink = pMemLink->pnextRaw) { if ((pMemLink->blockType & RTMEMRAW) && - pMemLink->pMemBlk == mem_p) + pMemLink->pMemBlk == mem_p) { if(pMemLink->pnext != 0) { pMemLink->pnext->pprev = pMemLink->pprev; @@ -430,12 +430,12 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) } if (pPrevMemLink != 0) pPrevMemLink->pnextRaw = pMemLink->pnextRaw; - else if (*ppMemLink != 0 && (*ppMemLink)->pnextRaw == 0 && + else if (*ppMemLink != 0 && (*ppMemLink)->pnextRaw == 0 && *ppMemLink != pMemLink->pnextRaw) { (*ppMemLink)->pnextRaw = pMemLink->pnextRaw; } - if ((pMemLink->blockType & RTMEMLINK) && + if ((pMemLink->blockType & RTMEMLINK) && (pMemLink->blockType & RTMEMMALLOC)) { ast_free(pMemLink); @@ -461,7 +461,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) RTMEMDIAG2 ("memHeapFreePtr: " "the element 0x%x is already freed!\n", pElem); ast_mutex_unlock(&pMemHeap->pLock); - return; + return; } if (ISSAVED (pElem)) { @@ -475,17 +475,17 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) CHECKMEMBLOCK(pMemHeap, pMemBlk); RTMEMDIAG2 ("memHeapFreePtr: pMemBlk = 0x%x\n", pMemBlk); - RTMEMDIAG2 ("memHeapFreePtr: pMemBlk->size = %d\n", + RTMEMDIAG2 ("memHeapFreePtr: pMemBlk->size = %d\n", pMemBlk->nunits * 8u); if (ISLAST (pElem)) { /* is it the last? */ OSMemElemDescr* pPrevElem = GETPREV (pElem); - + CHECKMEMELEM (pMemBlk, pPrevElem); pMemBlk->free_x -= (pElem_nunits (pElem) + 1); - FILLFREEMEM (&pMemBlk->data [pMemBlk->free_x * 8u], + FILLFREEMEM (&pMemBlk->data [pMemBlk->free_x * 8u], (pElem_nunits (pElem) + 1) * 8u); if (pPrevElem != 0 && ISFREE (pPrevElem)) { @@ -494,10 +494,10 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) pMemBlk->free_x -= (pElem_nunits (pPrevElem) + 1); pMemBlk->freeMem -= pElem_nunits (pPrevElem); SET_LAST_ELEM (pMemBlk, GETPREV (pPrevElem)); - + /* wasn't it the last elem in block? */ - if (pMemBlk->lastElemOff != 0) { - + if (pMemBlk->lastElemOff != 0) { + /* correct nextFreeOff for previous free element */ pFreeElem = GET_FREE_ELEM (pMemBlk); @@ -506,7 +506,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) } else { OSMemElemDescr* pNextFree = 0; - + while (pFreeElem < pPrevElem) { pNextFree = pFreeElem; pFreeElem = GET_NEXT_FREE (pFreeElem); @@ -519,15 +519,15 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) SET_LAST_ELEM (pMemBlk, pPrevElem); } - RTMEMDIAG2 ("memHeapFreePtr: pMemBlk->free_x = %d\n", + RTMEMDIAG2 ("memHeapFreePtr: pMemBlk->free_x = %d\n", pMemBlk->free_x); /* The question is: do we really want to get rid of the */ /* block or should we keep it around for reuse? */ if (pMemBlk->lastElemOff == 0) { /* was it the last elem in block? */ - + if ((pMemHeap->flags & RT_MH_DONTKEEPFREE) || - (pMemHeap->keepFreeUnits > 0 && + (pMemHeap->keepFreeUnits > 0 && pMemHeap->freeUnits + pMemBlk->nunits > pMemHeap->keepFreeUnits)) { ASN1OCTET blockType = pMemBlk->plink->blockType; @@ -544,7 +544,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) pMemBlk->plink->pprev->pnext = pMemBlk->plink->pnext; } else { /* head */ - if (pMemBlk->plink->pnext != 0 && + if (pMemBlk->plink->pnext != 0 && !(pMemBlk->plink->pnext->blockType & RTMEMRAW)) { pMemBlk->plink->pnext->pnextRaw = (*ppMemLink)->pnextRaw; @@ -553,14 +553,14 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) } FILLFREEMEM (pMemBlk->plink, sizeof (*pMemBlk->plink)); FILLFREEMEM (pMemBlk->data, (pMemBlk->nunits * 8u)); - + ast_free(pMemBlk->plink); - + if (!(blockType & RTMEMLINK)) { FILLFREEMEM (pMemBlk, sizeof (*pMemBlk)); ast_free(pMemBlk); } - RTMEMDIAG2 ("memHeapFreePtr: pMemBlk = 0x%x was freed\n", + RTMEMDIAG2 ("memHeapFreePtr: pMemBlk = 0x%x was freed\n", pMemBlk); } else { @@ -576,7 +576,7 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) } else { SET_LAST (GET_LAST_ELEM (pMemBlk)); - FILLFREEMEM (((char*) &pMemBlk->data[0]) + (pMemBlk->free_x * 8u), + FILLFREEMEM (((char*) &pMemBlk->data[0]) + (pMemBlk->free_x * 8u), (pMemBlk->nunits - pMemBlk->free_x) * 8u); CHECKMEMBLOCK (pMemHeap, pMemBlk); } @@ -587,25 +587,25 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) SET_FREE_ELEM(pMemBlk, pElem); pMemBlk->freeMem += pElem_nunits (pElem); - RTMEMDIAG2 ("memHeapFreePtr: element 0x%x marked as free.\n", + RTMEMDIAG2 ("memHeapFreePtr: element 0x%x marked as free.\n", pElem); /* try to unite free blocks, if possible */ if (!ISFIRST (pElem)) { if (ISFREE (GETPREV (pElem))) { OSMemElemDescr* prevelem_p = GETPREV (pElem); - + /* +1 because the OSMemElemDescr has size ONE unit (8 bytes) */ - pElem_nunits (prevelem_p) += pElem_nunits (pElem) + 1; + pElem_nunits (prevelem_p) += pElem_nunits (pElem) + 1; pElem = prevelem_p; pMemBlk->freeMem ++; /* sizeof (OSMemElemDescr) == 1 unit */ } else { /* look for nearest previous free block to correct nextFreeOff */ - + OSMemElemDescr* prevelem_p = pElem; - + do { prevelem_p = GETPREV (prevelem_p); } @@ -613,32 +613,32 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) if (prevelem_p != 0) { OSMemElemDescr* pNextFree = GET_NEXT_FREE (prevelem_p); - if (pNextFree != 0) + if (pNextFree != 0) pElem_nextFreeOff (pElem) = QOFFSETOF (pNextFree, pElem); else pElem_nextFreeOff (pElem) = 0; pElem_nextFreeOff (prevelem_p) = QOFFSETOF (pElem, prevelem_p); - + CHECKMEMELEM (pMemBlk, prevelem_p); } } } if (!ISLAST (pElem) && ISFREE (GETNEXT (pElem))) { OSMemElemDescr* nextelem_p = GETNEXT (pElem); - + /* +1 because the OSMemElemDescr has size ONE unit (8 bytes) */ - pElem_nunits (pElem) += pElem_nunits (nextelem_p) + 1; + pElem_nunits (pElem) += pElem_nunits (nextelem_p) + 1; if (pElem_nextFreeOff (nextelem_p) == 0) pElem_nextFreeOff (pElem) = 0; else - pElem_nextFreeOff (pElem) = + pElem_nextFreeOff (pElem) = QOFFSETOF (GET_NEXT_FREE (nextelem_p), pElem); pMemBlk->freeMem ++; } /* correct the prevOff field of next element */ - if (!ISLAST (pElem)) { + if (!ISLAST (pElem)) { OSMemElemDescr* nextelem_p = GETNEXT (pElem); pElem_prevOff (nextelem_p) = QOFFSETOF (nextelem_p, pElem); } @@ -649,10 +649,10 @@ void memHeapFreePtr (void** ppvMemHeap, void* mem_p) CHECKMEMBLOCK (pMemHeap, pMemBlk); } ast_mutex_unlock(&pMemHeap->pLock); -} +} -static void initNewFreeElement (OSMemBlk* pMemBlk, - OSMemElemDescr* pNewElem, OSMemElemDescr* pElem) +static void initNewFreeElement (OSMemBlk* pMemBlk, + OSMemElemDescr* pNewElem, OSMemElemDescr* pElem) { OSMemElemDescr *pNextElem, *pPrevElem = 0; @@ -663,11 +663,11 @@ static void initNewFreeElement (OSMemBlk* pMemBlk, pElem_prevOff (pNewElem) = QOFFSETOF (pNewElem, pElem); - if (pMemBlk->freeElemOff != 0 && + if (pMemBlk->freeElemOff != 0 && pMemBlk->freeElemOff < QOFFSETOF (pElem, pMemBlk->data) + 1) { /* look for nearest previous free block to correct its nextFreeOff */ - + pPrevElem = pElem; do { @@ -678,21 +678,21 @@ static void initNewFreeElement (OSMemBlk* pMemBlk, if (pPrevElem != 0) { /* if it is not first free element... */ /* correct nextFreeOff for prev free element */ - + pElem_nextFreeOff (pPrevElem) = QOFFSETOF (pNewElem, pPrevElem); } else { /* if it is first free element in the block */ FORCE_SET_FREE_ELEM (pMemBlk, pNewElem); } - + pNextElem = GETNEXT (pNewElem); if (ISFREE (pNextElem)) { - + /* if the next elem is free, then unite them together */ pElem_nunits (pNewElem) += pElem_nunits (pNextElem) + 1; if (pElem_nextFreeOff (pNextElem) != 0) - pElem_nextFreeOff (pNewElem) = QOFFSETOF (GET_NEXT_FREE (pNextElem), + pElem_nextFreeOff (pNewElem) = QOFFSETOF (GET_NEXT_FREE (pNextElem), pNewElem); else pElem_nextFreeOff (pNewElem) = 0; @@ -710,7 +710,7 @@ static void initNewFreeElement (OSMemBlk* pMemBlk, pNextElem = GETNEXT (pNextElem); /* set nextFreeOff for new element */ - + if (pNextElem != 0) pElem_nextFreeOff (pNewElem) = QOFFSETOF (pNextElem, pNewElem); else @@ -746,15 +746,15 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) for (pMemLink = *ppMemLink; pMemLink != 0; pMemLink = pMemLink->pnextRaw) { if ((pMemLink->blockType & RTMEMRAW) && - pMemLink->pMemBlk == mem_p) + pMemLink->pMemBlk == mem_p) { if (pMemLink->blockType & RTMEMMALLOC) { void *newMemBlk = ast_realloc(pMemLink->pMemBlk, nbytes_); - if (newMemBlk == 0) + if (newMemBlk == 0) return 0; pMemLink->pMemBlk = newMemBlk; } - else + else return 0; *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = nbytes_; return pMemLink->pMemBlk; @@ -768,7 +768,7 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) pElem = (OSMemElemDescr*) (((char*)mem_p) - sizeof_OSMemElemDescr); - RTMEMDIAG3 ("memHeapRealloc: mem_p = 0x%x, old size = %d,", mem_p, + RTMEMDIAG3 ("memHeapRealloc: mem_p = 0x%x, old size = %d,", mem_p, pElem_nunits (pElem) * 8u); RTMEMDIAG2 (" new nbytes = %d\n", nbytes); @@ -781,39 +781,39 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) CHECKMEMBLOCK(pMemHeap, pMemBlk); if ((unsigned)pElem_nunits (pElem) < nunits) { /* expanding */ - + if (nunits - pElem_nunits (pElem) <= (unsigned)pMemBlk->nunits) { /* Try to expand the existing element in the existing block */ if (ISLAST (pElem)) { /* if the last element in the block */ - + /* if the free space in the block is enough */ - - if ((int)(nunits - pElem_nunits (pElem)) <= - (int)(pMemBlk->nunits - pMemBlk->free_x)) - { + + if ((int)(nunits - pElem_nunits (pElem)) <= + (int)(pMemBlk->nunits - pMemBlk->free_x)) + { pMemBlk->free_x += nunits - pElem_nunits (pElem); pElem_nunits (pElem) = (ASN1USINT)nunits; RTMEMDIAG1 ("memHeapRealloc: " "memory element is expanded.\n"); - - FILLNEWMEM (&pMemBlk->data [(pMemBlk->free_x - - (nunits - pElem_nunits (pElem))) * 8u], + + FILLNEWMEM (&pMemBlk->data [(pMemBlk->free_x - + (nunits - pElem_nunits (pElem))) * 8u], (nunits - pElem_nunits (pElem)) * 8u); - + TRACEMEMELEM (pMemBlk, pElem, "Reallocated"); CHECKMEMELEM (pMemBlk, pElem); CHECKMEMBLOCK (pMemHeap, pMemBlk); return (mem_p); - } + } } else { - OSMemElemDescr* pNextElem, *pFreeElem; + OSMemElemDescr* pNextElem, *pFreeElem; unsigned sumSize = pElem_nunits (pElem), freeMem = 0; - + RTMEMDIAG1 ("memHeapRealloc: look for free element after " "current block.\n"); @@ -822,10 +822,10 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) pNextElem = GETNEXT (pElem); if (ISFREE (pNextElem)) { /* +1 'cos sizeof (OSMemElemDescr) == 1 unit */ - sumSize += pElem_nunits (pNextElem) + 1; + sumSize += pElem_nunits (pNextElem) + 1; freeMem++; } - + if (sumSize >= nunits) { RTMEMDIAG1 ("memHeapRealloc: reuse free element.\n"); @@ -836,15 +836,15 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) FORCE_SET_FREE_ELEM (pMemBlk, GET_NEXT_FREE (pNextElem)); } else if (pFreeElem < pElem) { - + /* look for previous free elem to correct nextFreeOff */ for (; pFreeElem != 0 && pFreeElem < pNextElem;) { - OSMemElemDescr* pNextFreeElem = + OSMemElemDescr* pNextFreeElem = GET_NEXT_FREE (pFreeElem); if (pNextFreeElem == pNextElem) { if (pElem_nextFreeOff (pNextElem) != 0) - pElem_nextFreeOff (pFreeElem) = QOFFSETOF + pElem_nextFreeOff (pFreeElem) = QOFFSETOF (GET_NEXT_FREE (pNextElem), pFreeElem); else pElem_nextFreeOff (pFreeElem) = 0; @@ -857,15 +857,15 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) } /* reuse empty elements after the pElem */ - + pMemBlk->freeMem += freeMem; - + if (sumSize - nunits > 1) { OSMemElemDescr* pNewElem; - + /* if sumSize is too large, then create new empty element */ - pNewElem = (OSMemElemDescr*) + pNewElem = (OSMemElemDescr*) (pElem_data (pElem) + nbytes); pElem_nunits (pNewElem) = (ASN1USINT)(sumSize - nunits - 1); @@ -885,7 +885,7 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) if (pNextElem != 0) pElem_prevOff (pNextElem) = QOFFSETOF (pNextElem, pElem); } - + TRACEMEMELEM (pMemBlk, pElem, "Reallocated"); CHECKMEMELEM (pMemBlk, pElem); CHECKMEMELEM (pMemBlk, (!ISLAST (pElem)) ? GETNEXT (pElem) : 0); @@ -902,14 +902,14 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) CHECKMEMHEAP (pMemHeap); newMem_p = memHeapAlloc (ppvMemHeap, nbytes); - + if (newMem_p == 0) return 0; /* if the old memory block is marked as saved then mark the new block as saved as well. */ - if (ISSAVED (pElem)) + if (ISSAVED (pElem)) memHeapMarkSaved (ppvMemHeap, newMem_p, TRUE); CHECKMEMHEAP (pMemHeap); @@ -928,7 +928,7 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) } else { /* shrinking */ RTMEMDIAG1 ("memHeapRealloc: shrinking ...\n"); - + /* just free the pointer, if nbytes == 0 */ if (nbytes == 0) { @@ -940,15 +940,15 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) /* do not shrink, if size diff is too small */ /* sizeof (OSMemElemDescr) == 1 unit */ - if (pElem_nunits (pElem) - nunits > 1) { - - /* if it is the last element in the block, then just change the size + if (pElem_nunits (pElem) - nunits > 1) { + + /* if it is the last element in the block, then just change the size and free_x. */ if (ISLAST (pElem)) { pMemBlk->free_x -= (pElem_nunits (pElem) - nunits); - FILLFREEMEM (&pMemBlk->data [pMemBlk->free_x * 8u], + FILLFREEMEM (&pMemBlk->data [pMemBlk->free_x * 8u], (pElem_nunits (pElem) - nunits) * 8u); } else { @@ -959,14 +959,14 @@ void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_) pNewElem = (OSMemElemDescr*) (pElem_data (pElem) + nbytes); /* sizeof (OSMemElemDescr) == 1 unit */ - pElem_nunits (pNewElem) = (ASN1USINT)(pElem_nunits (pElem) - nunits - 1); - + pElem_nunits (pNewElem) = (ASN1USINT)(pElem_nunits (pElem) - nunits - 1); + initNewFreeElement (pMemBlk, pNewElem, pElem); - + pMemBlk->freeMem += (pElem_nunits (pElem) - nunits) - 1; } pElem_nunits (pElem) = (ASN1USINT)nunits; - + TRACEMEMELEM (pMemBlk, pElem, "Reallocated"); CHECKMEMELEM (pMemBlk, pElem); CHECKMEMELEM (pMemBlk, (!ISLAST (pElem)) ? GETNEXT (pElem) : pElem); @@ -1000,9 +1000,9 @@ void memHeapFreeAll (void** ppvMemHeap) pMemLink2 = pMemLink; pMemLink = pMemLink2->pnext; - RTMEMDIAG3 ("memHeapFreeAll: pMemLink2 = 0x%x, pMemLink = 0x%x\n", + RTMEMDIAG3 ("memHeapFreeAll: pMemLink2 = 0x%x, pMemLink = 0x%x\n", pMemLink2, pMemLink); - + #ifdef _MEMDEBUG if (pMemLink2->blockType & RTMEMSTD) { OSMemBlk* pMemBlk = (OSMemBlk*) pMemLink2->pMemBlk; @@ -1036,9 +1036,9 @@ void memHeapFreeAll (void** ppvMemHeap) /* free link and block */ - if (((pMemLink2->blockType & RTMEMSTD) || + if (((pMemLink2->blockType & RTMEMSTD) || (pMemLink2->blockType & RTMEMMALLOC)) && - !(pMemLink2->blockType & RTMEMLINK)) + !(pMemLink2->blockType & RTMEMLINK)) ast_free(pMemLink2->pMemBlk); ast_free(pMemLink2); } @@ -1089,11 +1089,11 @@ void memHeapRelease (void** ppvMemHeap) /* This function is used for marking memory block as "saved". It means * that the memory block containing the specified memory pointer won't be - * freed after calls to memHeapFreeAll/memHeapReset. User is responsible + * freed after calls to memHeapFreeAll/memHeapReset. User is responsible * for freeing the marked memory block by call to memFreeBlock */ -void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, - ASN1BOOL saved) +void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, + ASN1BOOL saved) { OSMemHeap* pMemHeap; OSMemLink* pMemLink; @@ -1101,7 +1101,7 @@ void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, RTMEMDIAG2 ("memHeapMarkSaved: for mem_p = 0x%x\n", mem_p); - if (ppvMemHeap == 0 || *ppvMemHeap == 0 || mem_p == 0) + if (ppvMemHeap == 0 || *ppvMemHeap == 0 || mem_p == 0) return 0; pMemHeap = *(OSMemHeap**)ppvMemHeap; @@ -1114,7 +1114,7 @@ void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, for (; pMemLink != 0; pMemLink = pMemLink->pnextRaw) { if ((pMemLink->blockType & RTMEMRAW) && - pMemLink->pMemBlk == mem_p) + pMemLink->pMemBlk == mem_p) { break; } @@ -1132,7 +1132,7 @@ void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, "already free!\n", pElem); ast_mutex_unlock(&pMemHeap->pLock); - return 0; + return 0; } if ((ISSAVED (pElem) && !saved) || (!ISSAVED (pElem) && saved)) { @@ -1144,7 +1144,7 @@ void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, pMemLink = pMemBlk->plink; - if (saved) + if (saved) SET_SAVED (pMemBlk, pElem); else CLEAR_SAVED (pMemBlk, pElem); @@ -1154,7 +1154,7 @@ void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, ast_mutex_unlock(&pMemHeap->pLock); return 0; } - if (saved && nsaved > 0) + if (saved && nsaved > 0) pMemLink->blockType |= RTMEMSAVED; else if (nsaved == 0) pMemLink->blockType &= (~RTMEMSAVED); @@ -1204,16 +1204,16 @@ void memHeapReset (void** ppvMemHeap) /* add memory block to list */ -static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, +static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, void* pMemBlk, int blockType) { OSMemLink* pMemLink; - /* if pMemBlk has RTMEMLINK flags it means that it is allocated + /* if pMemBlk has RTMEMLINK flags it means that it is allocated * cooperatively with OSMemLink, and we don't need to do additional * allocations for it. Just use pointer's arithemtic. */ - if (blockType & RTMEMLINK) + if (blockType & RTMEMLINK) pMemLink = (OSMemLink*) (((ASN1OCTET*)pMemBlk) - sizeof (OSMemLink)); else { pMemLink = ast_malloc(sizeof(OSMemLink) + sizeof(int)); @@ -1222,7 +1222,7 @@ static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, to perform rtMemRealloc through malloc/memcpy/free */ *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = (int)-1; } - if (pMemLink == NULL) + if (pMemLink == NULL) return NULL; pMemLink->blockType = (ASN1OCTET)blockType; pMemLink->pMemBlk = pMemBlk; @@ -1241,15 +1241,15 @@ static OSMemLink* memHeapAddBlock (OSMemLink** ppMemLink, pMemLink->pnextRaw = 0; } - *ppMemLink = pMemLink; + *ppMemLink = pMemLink; if (pMemLink->pnext != 0) pMemLink->pnext->pprev = pMemLink; ((OSMemBlk*)pMemBlk)->plink = pMemLink; /*!AB */ RTMEMDIAG2 ("memHeapAddBlock: pMemLink = 0x%x\n", pMemLink); - RTMEMDIAG2 ("memHeapAddBlock: pMemLink->pnext = 0x%x\n", + RTMEMDIAG2 ("memHeapAddBlock: pMemLink->pnext = 0x%x\n", pMemLink->pnext); - RTMEMDIAG2 ("memHeapAddBlock: pMemLink->pprev = 0x%x\n", + RTMEMDIAG2 ("memHeapAddBlock: pMemLink->pprev = 0x%x\n", pMemLink->pprev); return pMemLink; @@ -1262,7 +1262,7 @@ int memHeapCheckPtr (void** ppvMemHeap, void* mem_p) RTMEMDIAG2 ("memHeapCheckPtr: for mem_p = 0x%x\n", mem_p); - if (ppvMemHeap == 0 || *ppvMemHeap == 0 || mem_p == 0) + if (ppvMemHeap == 0 || *ppvMemHeap == 0 || mem_p == 0) return 0; pMemHeap = *(OSMemHeap**)ppvMemHeap; @@ -1272,7 +1272,7 @@ int memHeapCheckPtr (void** ppvMemHeap, void* mem_p) for (; pMemLink != 0; pMemLink = pMemLink->pnext) { if (pMemLink->blockType & RTMEMRAW) { - + /* if RAW block, the pointer should be stored in pMemBlk */ if (pMemLink->pMemBlk == mem_p) { @@ -1282,17 +1282,17 @@ int memHeapCheckPtr (void** ppvMemHeap, void* mem_p) } else { OSMemBlk* pMemBlk = (OSMemBlk*)pMemLink->pMemBlk; - + /* Check, is the pointer inside this memory page */ - if (mem_p > pMemLink->pMemBlk && + if (mem_p > pMemLink->pMemBlk && mem_p < (void*)(((ASN1OCTET*)pMemLink->pMemBlk) + pMemBlk->nunits * 8u)) { /* Check, is the pointer a correct element of the mem page */ OSMemElemDescr* pElem = (OSMemElemDescr*) pMemBlk->data; for (; pElem != 0; pElem = GETNEXT (pElem)) { - + void* curMem_p = (void*) pElem_data (pElem); if (curMem_p == mem_p && !ISFREE (pElem)) { ast_mutex_unlock(&pMemHeap->pLock); @@ -1311,7 +1311,7 @@ void memHeapSetProperty (void** ppvMemHeap, ASN1UINT propId, void* pProp) { OSMemHeap* pMemHeap; - if (ppvMemHeap == 0) + if (ppvMemHeap == 0) return; if (*ppvMemHeap == 0) @@ -1332,9 +1332,9 @@ void memHeapSetProperty (void** ppvMemHeap, ASN1UINT propId, void* pProp) break; } ast_mutex_unlock(&pMemHeap->pLock); -} +} -int memHeapCreate (void** ppvMemHeap) +int memHeapCreate (void** ppvMemHeap) { OSMemHeap* pMemHeap; if (ppvMemHeap == 0) return ASN_E_INVPARAM; @@ -1349,4 +1349,3 @@ int memHeapCreate (void** ppvMemHeap) *ppvMemHeap = (void*)pMemHeap; return ASN_OK; } - diff --git a/addons/ooh323c/src/memheap.h b/addons/ooh323c/src/memheap.h index 8cc36d9025..26e5f486b1 100644 --- a/addons/ooh323c/src/memheap.h +++ b/addons/ooh323c/src/memheap.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/ooh323c/src/ooCalls.c b/addons/ooh323c/src/ooCalls.c index c920e6a23c..3097c6d289 100644 --- a/addons/ooh323c/src/ooCalls.c +++ b/addons/ooh323c/src/ooCalls.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -62,7 +62,7 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) { OOTRACEERR1("ERROR:Memory - ooCreateCall - call\n"); return NULL; - } + } memset(call, 0, sizeof(OOH323CallData)); ast_cond_init(&call->gkWait, NULL); ast_mutex_init(&call->GkLock); @@ -80,7 +80,7 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) else { call->ourCallerId[0] = '\0'; } - + memset(&call->callIdentifier, 0, sizeof(H225CallIdentifier)); memset(&call->confIdentifier, 0, sizeof(H225ConferenceIdentifier)); @@ -107,7 +107,7 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) // May 20090713. Fix it for Video session OO_SETFLAG(call->flags, OO_M_AUDIOSESSION); - + call->callState = OO_CALL_CREATED; call->callEndReason = OO_REASON_UNKNOWN; call->pCallFwdData = NULL; @@ -116,13 +116,13 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) { call->callingPartyNumber = NULL; } - else{ + else{ if(ooUtilsIsStrEmpty(gH323ep.callingPartyNumber)) { call->callingPartyNumber = NULL; } else{ - call->callingPartyNumber = (char*) memAlloc(call->pctxt, + call->callingPartyNumber = (char*) memAlloc(call->pctxt, strlen(gH323ep.callingPartyNumber)+1); if(call->callingPartyNumber) { @@ -156,14 +156,14 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) call->masterSlaveState = OO_MasterSlave_Idle; call->statusDeterminationNumber = 0; call->localTermCapState = OO_LocalTermCapExchange_Idle; - call->remoteTermCapState = OO_RemoteTermCapExchange_Idle; + call->remoteTermCapState = OO_RemoteTermCapExchange_Idle; call->ourCaps = NULL; call->remoteCaps = NULL; call->jointCaps = NULL; dListInit(&call->remoteFastStartOLCs); call->remoteTermCapSeqNo =0; call->localTermCapSeqNo = 0; - memcpy(&call->capPrefs, &gH323ep.capPrefs, sizeof(OOCapPrefs)); + memcpy(&call->capPrefs, &gH323ep.capPrefs, sizeof(OOCapPrefs)); call->logicalChans = NULL; call->noOfLogicalChannels = 0; call->logicalChanNoBase = 1001; @@ -175,7 +175,7 @@ OOH323CallData* ooCreateCall(char* type, char*callToken) call->pFastStartRes = NULL; call->usrData = NULL; ooCreateCallCmdConnection(call); - OOTRACEINFO3("Created a new call (%s, %s)\n", call->callType, + OOTRACEINFO3("Created a new call (%s, %s)\n", call->callType, call->callToken); /* Add new call to calllist */ ooAddCallToList (call); @@ -209,8 +209,8 @@ int ooAddCallToList(OOH323CallData *call) int ooEndCall(OOH323CallData *call) { - OOTRACEDBGA4("In ooEndCall call state is - %s (%s, %s)\n", - ooGetCallStateText(call->callState), call->callType, + OOTRACEDBGA4("In ooEndCall call state is - %s (%s, %s)\n", + ooGetCallStateText(call->callState), call->callType, call->callToken); if(call->callState == OO_CALL_REMOVED) { @@ -229,7 +229,7 @@ int ooEndCall(OOH323CallData *call) if(call->callState == OO_CALL_CLEARED || ((strcmp(call->callType, "incoming")) && call->callState == OO_CALL_CLEAR_RELEASESENT)) { - ooCleanCall(call); + ooCleanCall(call); call->callState = OO_CALL_REMOVED; return OO_OK; } @@ -252,16 +252,16 @@ int ooEndCall(OOH323CallData *call) } - if(!OO_TESTFLAG(call->flags, OO_M_RELEASE_BUILT)) + if(!OO_TESTFLAG(call->flags, OO_M_RELEASE_BUILT)) { - if(call->callState == OO_CALL_CLEAR || + if(call->callState == OO_CALL_CLEAR || call->callState == OO_CALL_CLEAR_RELEASERECVD) { ooSendReleaseComplete(call); OO_SETFLAG(call->flags, OO_M_RELEASE_BUILT); } } - + return OO_OK; } @@ -300,8 +300,8 @@ int ooCleanCall(OOH323CallData *call) { OOCTXT *pctxt; - OOTRACEWARN4 ("Cleaning Call (%s, %s)- reason:%s\n", - call->callType, call->callToken, + OOTRACEWARN4 ("Cleaning Call (%s, %s)- reason:%s\n", + call->callType, call->callToken, ooGetReasonCodeText (call->callEndReason)); /* First clean all the logical channels, if not already cleaned. */ @@ -324,7 +324,7 @@ int ooCleanCall(OOH323CallData *call) { ooCloseH245Listener(call); } - + /* Close H225 connection, if not already closed. */ if (0 != call->pH225Channel && 0 != call->pH225Channel->sock) { @@ -343,7 +343,7 @@ int ooCleanCall(OOH323CallData *call) } ooRemoveCallFromList (call); - OOTRACEINFO3("Removed call (%s, %s) from list\n", call->callType, + OOTRACEINFO3("Removed call (%s, %s) from list\n", call->callType, call->callToken); if(call->pCallFwdData && call->pCallFwdData->fwdedByRemote) @@ -396,7 +396,7 @@ int ooCallSetCallerId(OOH323CallData* call, const char* callerid) int ooCallSetCallingPartyNumber(OOH323CallData *call, const char *number) { - if(call->callingPartyNumber) + if(call->callingPartyNumber) memFreePtr(call->pctxt, call->callingPartyNumber); call->callingPartyNumber = (char*) memAlloc(call->pctxt, strlen(number)+1); @@ -406,7 +406,7 @@ int ooCallSetCallingPartyNumber(OOH323CallData *call, const char *number) } else{ OOTRACEERR3("Error:Memory - ooCallSetCallingPartyNumber - " - "callingPartyNumber.(%s, %s)\n", call->callType, + "callingPartyNumber.(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -428,14 +428,14 @@ int ooCallGetCallingPartyNumber(OOH323CallData *call, char *buffer, int len) return OO_OK; } } - + return OO_FAILED; } int ooCallSetCalledPartyNumber(OOH323CallData *call, const char *number) { - if(call->calledPartyNumber) + if(call->calledPartyNumber) memFreePtr(call->pctxt, call->calledPartyNumber); call->calledPartyNumber = (char*) memAlloc(call->pctxt, strlen(number)+1); @@ -445,7 +445,7 @@ int ooCallSetCalledPartyNumber(OOH323CallData *call, const char *number) } else{ OOTRACEERR3("Error:Memory - ooCallSetCalledPartyNumber - " - "calledPartyNumber.(%s, %s)\n", call->callType, + "calledPartyNumber.(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -462,7 +462,7 @@ int ooCallGetCalledPartyNumber(OOH323CallData *call, char *buffer, int len) return OO_OK; } } - + return OO_FAILED; } @@ -507,7 +507,7 @@ int ooCallAddAlias call->remoteAliases = psNewAlias; } - OOTRACEDBGC5("Added %s alias %s to call. (%s, %s)\n", + OOTRACEDBGC5("Added %s alias %s to call. (%s, %s)\n", local?"local":"remote", value, call->callType, call->callToken); return OO_OK; } @@ -534,8 +534,8 @@ int ooCallAddAliasEmailID(OOH323CallData *call, const char* email) int ooCallAddAliasURLID(OOH323CallData *call, const char* url) { return ooCallAddAlias(call, T_H225AliasAddress_url_ID, url, TRUE); -} - +} + int ooCallAddRemoteAliasH323ID(OOH323CallData *call, const char* h323id) { @@ -551,63 +551,63 @@ int ooCallAddRemoteAliasDialedDigits -/* Used to override global end point capabilities and add call specific +/* Used to override global end point capabilities and add call specific capabilities */ -int ooCallAddG726Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG726Capability(OOH323CallData *call, int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooCallAddAMRNBCapability(OOH323CallData *call, int cap, int txframes, +int ooCallAddAMRNBCapability(OOH323CallData *call, int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooCallAddSpeexCapability(OOH323CallData *call, int cap, int txframes, +int ooCallAddSpeexCapability(OOH323CallData *call, int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -615,12 +615,12 @@ int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } /* -int ooCallAddG726Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG726Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -628,12 +628,12 @@ int ooCallAddG726Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } */ -int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -641,11 +641,11 @@ int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, +int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -653,28 +653,28 @@ int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(call, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } int ooCallAddGSMCapability - (OOH323CallData* call, int cap, ASN1USINT framesPerPkt, + (OOH323CallData* call, int cap, ASN1USINT framesPerPkt, OOBOOL comfortNoise, OOBOOL scrambled, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddGSMCapability(call, cap, framesPerPkt, comfortNoise, - scrambled, dir, startReceiveChannel, + return ooCapabilityAddGSMCapability(call, cap, framesPerPkt, comfortNoise, + scrambled, dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } int ooCallAddH263VideoCapability - (OOH323CallData *call, int cap, unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, unsigned cif16MPI, unsigned maxBitRate, + (OOH323CallData *call, int cap, unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, unsigned cif16MPI, unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, @@ -684,7 +684,7 @@ int ooCallAddH263VideoCapability return ooCapabilityAddH263VideoCapability(call, sqcifMPI, qcifMPI, cifMPI, cif4MPI, cif16MPI, maxBitRate,dir, startReceiveChannel, startTransmitChannel, - stopReceiveChannel, stopTransmitChannel, + stopReceiveChannel, stopTransmitChannel, FALSE); } @@ -766,7 +766,7 @@ OOH323CallData* ooFindCallByToken(const char *callToken) else call = call->next; } - + if(!call) { OOTRACEERR2("ERROR:Call with token %s not found\n", callToken); @@ -791,7 +791,7 @@ ASN1BOOL ooIsSessionEstablished(OOH323CallData *call, int sessionID, char* dir) while(temp) { if(temp->sessionID == sessionID && - temp->state == OO_LOGICALCHAN_ESTABLISHED && + temp->state == OO_LOGICALCHAN_ESTABLISHED && !strcmp(temp->dir, dir) ) return TRUE; temp = temp->next; @@ -819,7 +819,7 @@ int ooAddMediaInfo(OOH323CallData *call, OOMediaInfo mediaInfo) memcpy (newMediaInfo, &mediaInfo, sizeof(OOMediaInfo)); - OOTRACEDBGC4("Configured mediainfo for cap %s (%s, %s)\n", + OOTRACEDBGC4("Configured mediainfo for cap %s (%s, %s)\n", ooGetCapTypeText(mediaInfo.cap), call->callType, call->callToken); if(!call->mediaInfo) { @@ -849,7 +849,7 @@ unsigned ooCallGenerateSessionID sessionID = call->nextSessionID++; else{ OOTRACEDBGC4("Session id for %s channel of type audio has to be " - "provided by remote.(%s, %s)\n", dir, call->callType, + "provided by remote.(%s, %s)\n", dir, call->callType, call->callToken); sessionID = 0; /* Will be assigned by remote */ } @@ -868,7 +868,7 @@ unsigned ooCallGenerateSessionID else{ sessionID = 0; /* Will be assigned by remote */ OOTRACEDBGC4("Session id for %s channel of type video has to be " - "provided by remote.(%s, %s)\n", dir, call->callType, + "provided by remote.(%s, %s)\n", dir, call->callType, call->callToken); } } @@ -885,7 +885,7 @@ unsigned ooCallGenerateSessionID else{ sessionID = 0; /* Will be assigned by remote */ OOTRACEDBGC4("Session id for %s channel of type data has to be " - "provided by remote.(%s, %s)\n", dir, call->callType, + "provided by remote.(%s, %s)\n", dir, call->callType, call->callToken); } } @@ -900,8 +900,8 @@ int ooCallH245ConnectionRetryTimerExpired(void *data) ooTimerCallback *cbData = (ooTimerCallback*) data; OOH323CallData *call = cbData->call; - OOTRACEINFO3("H245 connection retry timer expired. (%s, %s)\n", - call->callType, call->callToken); + OOTRACEINFO3("H245 connection retry timer expired. (%s, %s)\n", + call->callType, call->callToken); memFreePtr(call->pctxt, cbData); call->h245ConnectionAttempts++; @@ -914,9 +914,9 @@ int ooCallH245ConnectionRetryTimerExpired(void *data) const char* ooGetReasonCodeText (OOUINT32 code) { static const char* reasonCodeText[] = { - "OO_REASON_UNKNOWN", + "OO_REASON_UNKNOWN", "OO_REASON_INVALIDMESSAGE", - "OO_REASON_TRANSPORTFAILURE", + "OO_REASON_TRANSPORTFAILURE", "OO_REASON_NOROUTE", "OO_REASON_NOUSER", "OO_REASON_NOBW", @@ -926,10 +926,10 @@ const char* ooGetReasonCodeText (OOUINT32 code) "OO_REASON_GK_UNREACHABLE", "OO_REASON_GK_CLEARED", "OO_REASON_NOCOMMON_CAPABILITIES", - "OO_REASON_REMOTE_FWDED", + "OO_REASON_REMOTE_FWDED", "OO_REASON_LOCAL_FWDED", - "OO_REASON_REMOTE_CLEARED", - "OO_REASON_LOCAL_CLEARED", + "OO_REASON_REMOTE_CLEARED", + "OO_REASON_LOCAL_CLEARED", "OO_REASON_REMOTE_BUSY", "OO_REASON_LOCAL_BUSY", "OO_REASON_REMOTE_NOANSWER", @@ -957,4 +957,3 @@ const char* ooGetCallStateText (OOCallState callState) }; return ooUtilsGetText (callState, callStateText, OONUMBEROF(callStateText)); } - diff --git a/addons/ooh323c/src/ooCalls.h b/addons/ooh323c/src/ooCalls.h index f9a93f113a..d05ccf0b74 100644 --- a/addons/ooh323c/src/ooCalls.h +++ b/addons/ooh323c/src/ooCalls.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooCalls.h - * This file contains call management functions. + * @file ooCalls.h + * This file contains call management functions. */ #ifndef _OOCALLS_H_ #define _OOCALLS_H_ @@ -29,7 +29,7 @@ extern "C" { #endif -/** +/** * @defgroup callmgmt Call Management * @{ */ @@ -60,7 +60,7 @@ extern "C" { #define OO_M_DATASESSION ASN1UINTCNT(0x00000200) #define OO_M_T38SUPPORTED ASN1UINTCNT(0x00000400) -/** +/** * Call states. */ typedef enum { @@ -76,20 +76,20 @@ typedef enum { OO_CALL_REMOVED /* call removed */ } OOCallState; -/** +/** * H.245 session states. */ typedef enum { OO_H245SESSION_IDLE, OO_H245SESSION_PAUSED, OO_H245SESSION_ACTIVE, - OO_H245SESSION_ENDSENT, + OO_H245SESSION_ENDSENT, OO_H245SESSION_ENDRECVD, OO_H245SESSION_CLOSED } OOH245SessionState; /** - * Structure to store local and remote media endpoint info for a + * Structure to store local and remote media endpoint info for a * given media type. */ typedef struct OOMediaInfo{ @@ -115,10 +115,10 @@ typedef struct OOCallFwdData { int port; struct OOAliases *aliases; OOBOOL fwdedByRemote; /*Set when we are being fwded by remote*/ -} OOCallFwdData; +} OOCallFwdData; /** - * Structure to store information on an H.323 channel (H.225 or H.245) for + * Structure to store information on an H.323 channel (H.225 or H.245) for * a particular call. */ typedef struct OOH323Channel { @@ -128,7 +128,7 @@ typedef struct OOH323Channel { } OOH323Channel; /** - * Structure to store information on fast start response (H.225) to + * Structure to store information on fast start response (H.225) to * reply same answer in CALL PROCEEDING, ALERTING & CONNECT. */ typedef struct EXTERN FastStartResponse { @@ -144,8 +144,8 @@ typedef struct OOH323Regex { /** - * This structure is used to maintain all information on an active call. - * A list of these structures is maintained within the global endpoint + * This structure is used to maintain all information on an active call. + * A list of these structures is maintained within the global endpoint * structure. */ typedef struct OOH323CallData { @@ -166,10 +166,10 @@ typedef struct OOH323CallData { int transfercap; ASN1USINT callReference; char ourCallerId[256]; - H225CallIdentifier callIdentifier;/* The call identifier for the active + H225CallIdentifier callIdentifier;/* The call identifier for the active call. */ char *callingPartyNumber; - char *calledPartyNumber; + char *calledPartyNumber; H225ConferenceIdentifier confIdentifier; ASN1UINT flags; OOCallState callState; @@ -207,8 +207,8 @@ typedef struct OOH323CallData { DList remoteFastStartOLCs; ASN1UINT8 remoteTermCapSeqNo; ASN1UINT8 localTermCapSeqNo; - OOCapPrefs capPrefs; - OOLogicalChannel* logicalChans; + OOCapPrefs capPrefs; + OOLogicalChannel* logicalChans; int noOfLogicalChannels; int logicalChanNoBase; int logicalChanNoMax; @@ -237,7 +237,7 @@ typedef struct OOH323CallData { #define ooCallData OOH323CallData /** - * This callback function is triggered when a new call structure is + * This callback function is triggered when a new call structure is * created inside the stack for an incoming or outgoing call. * * @param call H.323 call data structure @@ -246,8 +246,8 @@ typedef struct OOH323CallData { typedef int (*cb_OnNewCallCreated)(OOH323CallData* call); /** - * This callback function is triggered when a Q.931 alerting message is - * received for an outgoing call or when a Q.931 alerting message is sent + * This callback function is triggered when a Q.931 alerting message is + * received for an outgoing call or when a Q.931 alerting message is sent * for an incoming call. * * @param call H.323 call data structure @@ -256,8 +256,8 @@ typedef int (*cb_OnNewCallCreated)(OOH323CallData* call); typedef int (*cb_OnAlerting)(OOH323CallData * call); /** - * This callback function is triggered when there is an incoming call. - * In the case where a gatekeeper is in use, the call must first be + * This callback function is triggered when there is an incoming call. + * In the case where a gatekeeper is in use, the call must first be * admitted by the gatekeeper before this callback is triggered. * * @param call H.323 call data structure @@ -266,7 +266,7 @@ typedef int (*cb_OnAlerting)(OOH323CallData * call); typedef int (*cb_OnIncomingCall)(OOH323CallData* call ); /** - * This callback function is triggered after a Q.931 setup message + * This callback function is triggered after a Q.931 setup message * is sent for an outgoing call. * * @param call H.323 call data structure @@ -275,10 +275,10 @@ typedef int (*cb_OnIncomingCall)(OOH323CallData* call ); typedef int (*cb_OnOutgoingCall)(OOH323CallData* call ); /** - * This callback function is triggered when a Q.931 connect message is - * sent in case of incoming call. In case of outgoing call, this is invoked - * when a Q.931 connect message is received. It is not invoked until after - * fast start and H.245 tunneling messages within the connect message are + * This callback function is triggered when a Q.931 connect message is + * sent in case of incoming call. In case of outgoing call, this is invoked + * when a Q.931 connect message is received. It is not invoked until after + * fast start and H.245 tunneling messages within the connect message are * processed. * * @param call H.323 call data structure @@ -295,8 +295,8 @@ typedef int (*cb_OnCallEstablished)(struct OOH323CallData* call); typedef int (*cb_OnCallCleared)(struct OOH323CallData* call); /** - * This callback function is triggered when master-slave determination - * and capabilities negotiation procedures are successfully completed + * This callback function is triggered when master-slave determination + * and capabilities negotiation procedures are successfully completed * for a call. * * @param call H.323 call data structure @@ -332,7 +332,7 @@ typedef void (*cb_OnMediaChanged) (struct OOH323CallData *call, char* remoteIP, int remotePort); /** - * This structure holds all of the H.323 signaling callback function + * This structure holds all of the H.323 signaling callback function * addresses. * @see ooH323EpSetH323Callbacks */ @@ -428,7 +428,7 @@ EXTERN int ooCallSetCalledPartyNumber EXTERN int ooCallClearAliases(OOH323CallData *call); /** - * This function is used to add an H323ID alias to be used by local endpoint + * This function is used to add an H323ID alias to be used by local endpoint * for a particular call. * @param call Handle to the call * @param h323id H323ID to add for the local endpoint for the call. @@ -438,7 +438,7 @@ EXTERN int ooCallClearAliases(OOH323CallData *call); EXTERN int ooCallAddAliasH323ID(OOH323CallData *call, const char* h323id); /** - * This function is used to add an dialedDigits alias to be used by local + * This function is used to add an dialedDigits alias to be used by local * endpoint for a particular call. * @param call Handle to the call * @param dialedDigits DialedDigits to add for the local endpoint for call. @@ -449,7 +449,7 @@ EXTERN int ooCallAddAliasDialedDigits (OOH323CallData *call, const char* dialedDigits); /** - * This function is used to add an email-id alias to be used by local + * This function is used to add an email-id alias to be used by local * endpoint for a particular call. * @param call Handle to the call * @param email Email-id to add for the local endpoint for call. @@ -460,7 +460,7 @@ EXTERN int ooCallAddAliasEmailID(OOH323CallData *call, const char* email); /** - * This function is used to add an email-id alias to be used by local + * This function is used to add an email-id alias to be used by local * endpoint for a particular call. * @param call Handle to the call * @param url URL-id to add for the local endpoint for call. @@ -471,8 +471,8 @@ EXTERN int ooCallAddAliasURLID(OOH323CallData *call, const char* url); /** - * This is a helper function used by other call related add aliases functions - * to add a particular alias. This function is not supposed to be called + * This is a helper function used by other call related add aliases functions + * to add a particular alias. This function is not supposed to be called * directly. * @param call Handle to the call * @param aliasType Type of alias being added @@ -486,7 +486,7 @@ int ooCallAddAlias /** - * This function is used to add an dialed digits alias for the remote endpoint + * This function is used to add an dialed digits alias for the remote endpoint * involved in a particular call. * @param call Handle to the call * @param dialedDigits dialedDigits alias to add for the remote endpoint. @@ -497,7 +497,7 @@ EXTERN int ooCallAddRemoteAliasDialedDigits (OOH323CallData *call, const char* dialedDigits); /** - * This function is used to add an H323ID alias for the remote endpoint + * This function is used to add an H323ID alias for the remote endpoint * involved in a particular call. * @param call Handle to the call * @param h323id H323ID to add for the remote endpoint. @@ -508,12 +508,12 @@ EXTERN int ooCallAddRemoteAliasH323ID(OOH323CallData *call, const char* h323id); /** - * This function is used to add G7231 capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add G7231 capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Capability to be added. - * @param txframes Number of frames per packet for transmission. + * @param txframes Number of frames per packet for transmission. * @param rxframes Number of frames per packet for reception. * @param silenceSuppression Indicates support for silenceSuppression. * @param dir Direction of capability.OORX, OOTX, OORXANDTX @@ -522,9 +522,9 @@ EXTERN int ooCallAddRemoteAliasH323ID(OOH323CallData *call, const char* h323id); * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, +EXTERN int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -532,12 +532,12 @@ EXTERN int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel); /** - * This function is used to add G728 capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add G728 capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Capability to be added. - * @param txframes Number of frames per packet for transmission. + * @param txframes Number of frames per packet for transmission. * @param rxframes Number of frames per packet for reception. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -545,9 +545,9 @@ EXTERN int ooCallAddG7231Capability(OOH323CallData *call, int cap, int txframes, * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, +EXTERN int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -555,12 +555,12 @@ EXTERN int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel); /** - * This function is used to add G729 capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add G729 capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Capability to be added. - * @param txframes Number of frames per packet for transmission. + * @param txframes Number of frames per packet for transmission. * @param rxframes Number of frames per packet for reception. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -568,9 +568,9 @@ EXTERN int ooCallAddG728Capability(OOH323CallData *call, int cap, int txframes, * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, +EXTERN int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -578,12 +578,12 @@ EXTERN int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, cb_StopTransmitChannel stopTransmitChannel); /** - * This function is used to add G711 capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add G711 capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Capability to be added. - * @param txframes Number of frames per packet for transmission. + * @param txframes Number of frames per packet for transmission. * @param rxframes Number of frames per packet for reception. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -591,9 +591,9 @@ EXTERN int ooCallAddG729Capability(OOH323CallData *call, int cap, int txframes, * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, +EXTERN int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, int rxframes, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -602,13 +602,13 @@ EXTERN int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, /** - * This function is used to add GSM capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add GSM capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Type of GSM capability to be added. - * @param framesPerPkt Number of GSM frames pre packet. - * @param comfortNoise Comfort noise spec for the capability. + * @param framesPerPkt Number of GSM frames pre packet. + * @param comfortNoise Comfort noise spec for the capability. * @param scrambled Scrambled enabled/disabled for the capability. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -616,10 +616,10 @@ EXTERN int ooCallAddG711Capability(OOH323CallData *call, int cap, int txframes, * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddGSMCapability(OOH323CallData* call, int cap, - ASN1USINT framesPerPkt, OOBOOL comfortNoise, +EXTERN int ooCallAddGSMCapability(OOH323CallData* call, int cap, + ASN1USINT framesPerPkt, OOBOOL comfortNoise, OOBOOL scrambled, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, @@ -630,23 +630,23 @@ EXTERN int ooCallAddGSMCapability(OOH323CallData* call, int cap, /** - * This function is used to add H263 video capability for the call. The - * "ooCallAdd...Capability" functions allow to override the global endpoint + * This function is used to add H263 video capability for the call. The + * "ooCallAdd...Capability" functions allow to override the global endpoint * capabilities and use specific capabilities for specific calls. * @param call Call for which capability has to be added. * @param cap Capability type - OO_H263VIDEO - * @param sqcifMPI Minimum picture interval for encoding/decoding + * @param sqcifMPI Minimum picture interval for encoding/decoding * of SQCIF pictures. - * @param qcifMPI Minimum picture interval for encoding/decoding + * @param qcifMPI Minimum picture interval for encoding/decoding * of QCIF pictures. - * @param cifMPI Minimum picture interval for encoding/decoding + * @param cifMPI Minimum picture interval for encoding/decoding * of CIF pictures. - * @param cif4MPI Minimum picture interval for encoding/decoding + * @param cif4MPI Minimum picture interval for encoding/decoding * of CIF4 pictures. - * @param cif16MPI Minimum picture interval for encoding/decoding + * @param cif16MPI Minimum picture interval for encoding/decoding * of CIF16 pictures. * @param maxBitRate Maximum bit rate in units of 100 bits/s at - * which a transmitter can transmit video or a + * which a transmitter can transmit video or a * receiver can receive video. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -654,13 +654,13 @@ EXTERN int ooCallAddGSMCapability(OOH323CallData* call, int cap, * @param stopReceiveChannel Callback function to stop receive channel. * @param stopTransmitChannel Callback function to stop transmit channel. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCallAddH263VideoCapability(OOH323CallData *call, int cap, - unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, - unsigned cif16MPI, unsigned maxBitRate, - int dir, +EXTERN int ooCallAddH263VideoCapability(OOH323CallData *call, int cap, + unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, + unsigned cif16MPI, unsigned maxBitRate, + int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, @@ -682,9 +682,9 @@ EXTERN int ooCallEnableDTMFRFC2833 /** - * This function is used to disable rfc 2833 capability for the call. - * By default the stack uses the dtmf settings for the endpoint. But if you - * want to enable/disable dtmf for a specific call, then you can override + * This function is used to disable rfc 2833 capability for the call. + * By default the stack uses the dtmf settings for the endpoint. But if you + * want to enable/disable dtmf for a specific call, then you can override * end-point settings using this function * @param call Call for which rfc2833 has to be disabled. * @@ -694,9 +694,9 @@ EXTERN int ooCallDisableDTMFRFC2833(OOH323CallData *call); /** - * This function is used to enable H.245(alphanumeric) dtmf support for the - * call. By default the stack uses the dtmf settings for the endpoint. But if - * you want to enable H.245(alphanumeric) dtmf for a specific call, then you + * This function is used to enable H.245(alphanumeric) dtmf support for the + * call. By default the stack uses the dtmf settings for the endpoint. But if + * you want to enable H.245(alphanumeric) dtmf for a specific call, then you * can override end-point settings using this function * @param call Call for which H.245(alphanumeric) dtmf support * has to be enabled. @@ -706,9 +706,9 @@ EXTERN int ooCallDisableDTMFRFC2833(OOH323CallData *call); EXTERN int ooCallEnableDTMFH245Alphanumeric(OOH323CallData *call); /** - * This function is used to disable H.245(alphanumeric) dtmf support for the - * call. By default the stack uses the dtmf settings for the endpoint. But if - * you want to disable H.245(alphanumeric) dtmf for a specific call, then you + * This function is used to disable H.245(alphanumeric) dtmf support for the + * call. By default the stack uses the dtmf settings for the endpoint. But if + * you want to disable H.245(alphanumeric) dtmf for a specific call, then you * can override end-point settings using this function * @param call Call for which H.245(alphanumeric) dtmf support * has to be disabled. @@ -718,8 +718,8 @@ EXTERN int ooCallEnableDTMFH245Alphanumeric(OOH323CallData *call); EXTERN int ooCallDisableDTMFH245Alphanumeric(OOH323CallData *call); /** - * This function is used to enable H.245(signal) dtmf support for the call. - * By default the stack uses the dtmf settings for the endpoint. But if you + * This function is used to enable H.245(signal) dtmf support for the call. + * By default the stack uses the dtmf settings for the endpoint. But if you * want to enable H.245(signal) dtmf for a specific call, then you can override * end-point settings using this function * @param call Call for which H.245(signal) dtmf support @@ -731,9 +731,9 @@ EXTERN int ooCallEnableDTMFH245Signal(OOH323CallData *call); /** - * This function is used to disable H.245(signal) dtmf support for the call. - * By default the stack uses the dtmf settings for the endpoint. But if you - * want to disable H.245(signal) dtmf for a specific call, then you can + * This function is used to disable H.245(signal) dtmf support for the call. + * By default the stack uses the dtmf settings for the endpoint. But if you + * want to disable H.245(signal) dtmf for a specific call, then you can * override end-point settings using this function * @param call Call for which H.245(signal) dtmf support * has to be disabled. @@ -745,7 +745,7 @@ EXTERN int ooCallDisableDTMFH245Signal(OOH323CallData *call); /** * This function is used to enable Q.931(keypad) dtmf support for the call. - * By default the stack uses the dtmf settings for the endpoint. But if you + * By default the stack uses the dtmf settings for the endpoint. But if you * want to enable Q.931(keypad) dtmf support for a specific call, then you can * override end-point settings using this function * @param call Call for which Q.931(keypad) dtmf support @@ -757,7 +757,7 @@ EXTERN int ooCallEnableDTMFQ931Keypad(OOH323CallData *call); /** * This function is used to disable Q.931(keypad) dtmf support for the call. - * By default the stack uses the dtmf settings for the endpoint. But if you + * By default the stack uses the dtmf settings for the endpoint. But if you * want to disable Q.931(keypad) dtmf support for a specific call, then you can * override end-point settings using this function * @param call Call for which Q.931(keypad) dtmf support @@ -787,14 +787,14 @@ EXTERN int ooEndCall(OOH323CallData *call); /** * This function is used to remove a call from the list of existing calls. - * + * * @param call Pointer to the call to be removed. * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooRemoveCallFromList (OOH323CallData *call); /** - * This function is used to clean up a call. It closes all associated sockets, + * This function is used to clean up a call. It closes all associated sockets, * removes the call from the global list and frees up associated memory. * * @param call Pointer to the call to be cleared. @@ -803,25 +803,25 @@ EXTERN int ooRemoveCallFromList (OOH323CallData *call); EXTERN int ooCleanCall(OOH323CallData *call); /** - * This function is used to check whether a specified session in specified + * This function is used to check whether a specified session in specified * direction is active for the call. * @param call Handle to call for which session has to be queried. - * @param sessionID Session id to identify the type of session(1 for audio, + * @param sessionID Session id to identify the type of session(1 for audio, * 2 for voice and 3 for data) * @param dir Direction of the session(transmit/receive) * - * @return 1, if session active. 0, otherwise. + * @return 1, if session active. 0, otherwise. */ EXTERN ASN1BOOL ooIsSessionEstablished (OOH323CallData *call, int sessionID, char* dir); /** - * This function can be used by an application to specify media endpoint + * This function can be used by an application to specify media endpoint * information for different types of media. The stack by default uses local IP - * and port for media. An application can provide mediainfo if it wants to + * and port for media. An application can provide mediainfo if it wants to * override default. * @param call Handle to the call - * @param mediaInfo Structure which defines the media endpoint to be + * @param mediaInfo Structure which defines the media endpoint to be * used. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -829,7 +829,7 @@ EXTERN ASN1BOOL ooIsSessionEstablished EXTERN int ooAddMediaInfo(OOH323CallData *call, OOMediaInfo mediaInfo); /** - * This function is used to generate a media session id for the new media + * This function is used to generate a media session id for the new media * session for the call. * @param call Handle to the call. * @param type Type of media session. @@ -841,7 +841,7 @@ EXTERN unsigned ooCallGenerateSessionID (OOH323CallData *call, OOCapType type, char *dir); /** - * This is an handler for H245 connection retry timer. When remote end is not + * This is an handler for H245 connection retry timer. When remote end is not * yet listening for H245 connections, this timer provides a wait and retry * mechanism to establish H245 connection. * @param data Timer callback data. @@ -868,8 +868,8 @@ EXTERN const char* ooGetReasonCodeText (OOUINT32 code); */ EXTERN const char* ooGetCallStateText (OOCallState callState); -/** - * @} +/** + * @} */ int isRunning(char *callToken); diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c index c5b1f87e9d..7314783464 100644 --- a/addons/ooh323c/src/ooCapability.c +++ b/addons/ooh323c/src/ooCapability.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -40,7 +40,7 @@ int ooCapabilityEnableDTMFRFC2833 } else{ call->dtmfmode |= OO_CAP_DTMF_RFC2833; - OOTRACEINFO3("Enabled RFC2833 DTMF capability for (%s, %s) \n", + OOTRACEINFO3("Enabled RFC2833 DTMF capability for (%s, %s) \n", call->callType, call->callToken); if(dynamicRTPPayloadType >= 96 && dynamicRTPPayloadType <= 127) call->dtmfcodec = dynamicRTPPayloadType; @@ -67,7 +67,7 @@ int ooCapabilityEnableDTMFCISCO } else{ call->dtmfmode |= OO_CAP_DTMF_CISCO; - OOTRACEINFO3("Enabled RTP/CISCO DTMF capability for (%s, %s) \n", + OOTRACEINFO3("Enabled RTP/CISCO DTMF capability for (%s, %s) \n", call->callType, call->callToken); if(dynamicRTPPayloadType >= 96 && dynamicRTPPayloadType <= 127) call->dtmfcodec = dynamicRTPPayloadType; @@ -89,7 +89,7 @@ int ooCapabilityDisableDTMFRFC2833(OOH323CallData *call) } else{ call->dtmfmode ^= OO_CAP_DTMF_RFC2833; - OOTRACEINFO3("Disabled RFC2833 DTMF capability for (%s, %s)\n", + OOTRACEINFO3("Disabled RFC2833 DTMF capability for (%s, %s)\n", call->callType, call->callToken); } @@ -104,7 +104,7 @@ int ooCapabilityDisableDTMFCISCO(OOH323CallData *call) } else{ call->dtmfmode ^= OO_CAP_DTMF_CISCO; - OOTRACEINFO3("Disabled RTP/CISCO DTMF capability for (%s, %s)\n", + OOTRACEINFO3("Disabled RTP/CISCO DTMF capability for (%s, %s)\n", call->callType, call->callToken); } @@ -119,7 +119,7 @@ int ooCapabilityEnableDTMFH245Alphanumeric(OOH323CallData *call) } else { call->dtmfmode |= OO_CAP_DTMF_H245_alphanumeric; - OOTRACEINFO3("Dtmf mode set to H.245(alphanumeric) for (%s, %s)\n", + OOTRACEINFO3("Dtmf mode set to H.245(alphanumeric) for (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -133,7 +133,7 @@ int ooCapabilityDisableDTMFH245Alphanumeric(OOH323CallData *call) } else { call->dtmfmode ^= OO_CAP_DTMF_H245_alphanumeric; - OOTRACEINFO3("Dtmf mode H.245(alphanumeric) disabled for (%s, %s)\n", + OOTRACEINFO3("Dtmf mode H.245(alphanumeric) disabled for (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -147,7 +147,7 @@ int ooCapabilityEnableDTMFH245Signal(OOH323CallData *call) } else { call->dtmfmode |= OO_CAP_DTMF_H245_signal; - OOTRACEINFO3("Dtmf mode set to H.245(signal) for (%s, %s)\n", + OOTRACEINFO3("Dtmf mode set to H.245(signal) for (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -161,7 +161,7 @@ int ooCapabilityDisableDTMFH245Signal(OOH323CallData *call) } else { call->dtmfmode ^= OO_CAP_DTMF_H245_signal; - OOTRACEINFO3("Dtmf mode H.245(signal) disabled for (%s, %s)\n", + OOTRACEINFO3("Dtmf mode H.245(signal) disabled for (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -175,7 +175,7 @@ int ooCapabilityEnableDTMFQ931Keypad(struct OOH323CallData *call) } else { call->dtmfmode |= OO_CAP_DTMF_Q931; - OOTRACEINFO3("Dtmf mode set to Q.931(keypad) for the call (%s, %s)\n", + OOTRACEINFO3("Dtmf mode set to Q.931(keypad) for the call (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -189,26 +189,26 @@ int ooCapabilityDisableDTMFQ931Keypad(struct OOH323CallData *call) } else { call->dtmfmode ^= OO_CAP_DTMF_Q931; - OOTRACEINFO3("Dtmf mode Q.931(keypad) disabled for the call (%s, %s)\n", + OOTRACEINFO3("Dtmf mode Q.931(keypad) disabled for the call (%s, %s)\n", call->callType, call->callToken); } return OO_OK; } -int ooCapabilityAddH263VideoCapability(ooCallData *call, - unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, - unsigned cif16MPI, unsigned maxBitRate, int dir, +int ooCapabilityAddH263VideoCapability(ooCallData *call, + unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, + unsigned cif16MPI, unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote) { int ret = OO_OK; if(sqcifMPI>0) { - ret = ooCapabilityAddH263VideoCapability_helper(call, sqcifMPI, 0, + ret = ooCapabilityAddH263VideoCapability_helper(call, sqcifMPI, 0, 0, 0, 0, maxBitRate, dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, remote); @@ -232,7 +232,7 @@ int ooCapabilityAddH263VideoCapability(ooCallData *call, } if(cifMPI>0) { - ret = ooCapabilityAddH263VideoCapability_helper(call, 0, 0, cifMPI, + ret = ooCapabilityAddH263VideoCapability_helper(call, 0, 0, cifMPI, 0, 0, maxBitRate, dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, remote); @@ -244,8 +244,8 @@ int ooCapabilityAddH263VideoCapability(ooCallData *call, } if(cif4MPI>0) { - ret = ooCapabilityAddH263VideoCapability_helper(call, 0, 0, 0, - cif4MPI, 0, maxBitRate, dir, + ret = ooCapabilityAddH263VideoCapability_helper(call, 0, 0, 0, + cif4MPI, 0, maxBitRate, dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, remote); @@ -257,7 +257,7 @@ int ooCapabilityAddH263VideoCapability(ooCallData *call, } if(cif16MPI>0) { - ret = ooCapabilityAddH263VideoCapability_helper(call, dir, 0, 0, 0, 0, + ret = ooCapabilityAddH263VideoCapability_helper(call, dir, 0, 0, 0, 0, cif16MPI, maxBitRate, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, remote); @@ -272,18 +272,18 @@ int ooCapabilityAddH263VideoCapability(ooCallData *call, } int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, - unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, - unsigned cif16MPI, unsigned maxBitRate, int dir, + unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, + unsigned cif16MPI, unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote) { ooH323EpCapability *epCap = NULL, *cur=NULL; - OOH263CapParams *params=NULL; + OOH263CapParams *params=NULL; OOCTXT *pctxt=NULL; char *pictureType = NULL; int cap = OO_H263VIDEO; @@ -299,7 +299,7 @@ int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, ".\n"); return OO_FAILED; } - + if(sqcifMPI>0) { params->MPI = sqcifMPI; @@ -341,7 +341,7 @@ int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, } else epCap->dir = dir; - + epCap->cap = OO_H263VIDEO; epCap->capType = OO_CAP_TYPE_VIDEO; epCap->params = (void*)params; @@ -349,7 +349,7 @@ int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, epCap->startTransmitChannel = startTransmitChannel; epCap->stopReceiveChannel = stopReceiveChannel; epCap->stopTransmitChannel = stopTransmitChannel; - + epCap->next = NULL; if(!call) @@ -380,7 +380,7 @@ int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, else{ /*Add as our capability */ OOTRACEDBGC4("Adding call specific H263 video capability %s. " - "(%s, %s)\n", pictureType, call->callType, + "(%s, %s)\n", pictureType, call->callType, call->callToken); if(!call->ourCaps){ call->ourCaps = epCap; @@ -399,8 +399,8 @@ int ooCapabilityAddH263VideoCapability_helper(ooCallData *call, /* Used for g711 ulaw/alaw, g728, g729 and g7231 */ int ooCapabilityAddSimpleCapability - (OOH323CallData *call, int cap, int txframes, - int rxframes, OOBOOL silenceSuppression, int dir, + (OOH323CallData *call, int cap, int txframes, + int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, @@ -408,7 +408,7 @@ int ooCapabilityAddSimpleCapability OOBOOL remote) { ooH323EpCapability *epCap = NULL, *cur=NULL; - OOCapParams *params=NULL; + OOCapParams *params=NULL; OOCTXT *pctxt=NULL; if(!call) pctxt = &gH323ep.ctxt; else pctxt = call->pctxt; @@ -438,7 +438,7 @@ int ooCapabilityAddSimpleCapability else { epCap->dir = dir; } - + epCap->cap = cap; epCap->capType = OO_CAP_TYPE_AUDIO; epCap->params = (void*)params; @@ -451,7 +451,7 @@ int ooCapabilityAddSimpleCapability if(!call) { /* Add as local capability */ - OOTRACEDBGC2("Adding endpoint capability %s. \n", + OOTRACEDBGC2("Adding endpoint capability %s. \n", ooGetCapTypeText(epCap->cap)); if(!gH323ep.myCaps) { gH323ep.myCaps = epCap; @@ -479,8 +479,8 @@ int ooCapabilityAddSimpleCapability } else{ /* Add as our capability */ - OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); if(!call->ourCaps){ call->ourCaps = epCap; @@ -494,7 +494,7 @@ int ooCapabilityAddSimpleCapability ooAppendCapToCapPrefs(call, cap); } } - + return OO_OK; } @@ -513,20 +513,20 @@ int epCapIsPreferred(OOH323CallData *call, ooH323EpCapability *epCap) return 0; } -int ooCapabilityAddGSMCapability(OOH323CallData *call, int cap, +int ooCapabilityAddGSMCapability(OOH323CallData *call, int cap, unsigned framesPerPkt, OOBOOL comfortNoise, - OOBOOL scrambled, int dir, + OOBOOL scrambled, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote) { ooH323EpCapability *epCap = NULL, *cur=NULL; - OOGSMCapParams *params=NULL; + OOGSMCapParams *params=NULL; OOCTXT *pctxt = NULL; - + if(!call) pctxt = &gH323ep.ctxt; else pctxt = call->pctxt; @@ -559,7 +559,7 @@ int ooCapabilityAddGSMCapability(OOH323CallData *call, int cap, epCap->startTransmitChannel = startTransmitChannel; epCap->stopReceiveChannel = stopReceiveChannel; epCap->stopTransmitChannel = stopTransmitChannel; - + epCap->next = NULL; /* Add as local capability */ if(!call) @@ -587,8 +587,8 @@ int ooCapabilityAddGSMCapability(OOH323CallData *call, int cap, } } else{ - OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); /*Add as our capability */ if(!call->ourCaps){ @@ -617,7 +617,7 @@ int ooCapabilityAddT38Capability OOBOOL remote) { ooH323EpCapability *epCap = NULL, *cur=NULL; - OOCapParams *params=NULL; + OOCapParams *params=NULL; OOCTXT *pctxt=NULL; if(!call) pctxt = &gH323ep.ctxt; else pctxt = call->pctxt; @@ -639,7 +639,7 @@ int ooCapabilityAddT38Capability else { epCap->dir = dir; } - + epCap->cap = cap; epCap->capType = OO_CAP_TYPE_DATA; epCap->params = (void*)params; @@ -652,7 +652,7 @@ int ooCapabilityAddT38Capability if(!call) { /* Add as local capability */ - OOTRACEDBGC2("Adding endpoint capability %s. \n", + OOTRACEDBGC2("Adding endpoint capability %s. \n", ooGetCapTypeText(epCap->cap)); if(!gH323ep.myCaps) { gH323ep.myCaps = epCap; @@ -681,8 +681,8 @@ int ooCapabilityAddT38Capability } else{ /* Add as our capability */ - OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); if(!call->ourCaps){ call->ourCaps = epCap; @@ -697,7 +697,7 @@ int ooCapabilityAddT38Capability call->t38sides |= 1; } } - + return OO_OK; } @@ -714,7 +714,7 @@ struct H245VideoCapability* ooCapabilityCreateVideoCapability "ooCapabilityCreateVideoCapability.\n"); return NULL; } - + if(!(epCap->dir & dir)) { OOTRACEERR1("Error:Failed to create capability due to direction " @@ -741,7 +741,7 @@ struct H245VideoCapability* ooCapabilityCreateVideoCapability } - + struct H245AudioCapability* ooCapabilityCreateAudioCapability (ooH323EpCapability *epCap, OOCTXT *pctxt, int dir) { @@ -752,7 +752,7 @@ struct H245AudioCapability* ooCapabilityCreateAudioCapability "ooCapabilityCreateAudioCapability.\n"); return NULL; } - + if(!(epCap->dir & dir)) { OOTRACEERR1("Error:Failed to create capability due to direction " @@ -799,7 +799,7 @@ void* ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt) switch(cap) { case OO_CAP_DTMF_RFC2833: - pATECap = (H245AudioTelephonyEventCapability*)memAlloc(pctxt, + pATECap = (H245AudioTelephonyEventCapability*)memAlloc(pctxt, sizeof(H245AudioTelephonyEventCapability)); if(!pATECap) { @@ -820,7 +820,7 @@ void* ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt) pATECap->audioTelephoneEvent = events; return pATECap; case OO_CAP_DTMF_CISCO: - pCSDTMFCap = (H245DataApplicationCapability*)memAlloc(pctxt, + pCSDTMFCap = (H245DataApplicationCapability*)memAlloc(pctxt, sizeof(H245DataApplicationCapability)); if(!pCSDTMFCap) { @@ -851,10 +851,10 @@ void* ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt) pCSDTMFCap->application.u.nonStandard->nonStandardIdentifier.u.h221NonStandard->t35CountryCode = 181; pCSDTMFCap->application.u.nonStandard->nonStandardIdentifier.u.h221NonStandard->t35Extension = 0; pCSDTMFCap->application.u.nonStandard->nonStandardIdentifier.u.h221NonStandard->manufacturerCode = 18; - + return pCSDTMFCap; case OO_CAP_DTMF_H245_alphanumeric: - userInput = (H245UserInputCapability*)memAllocZ(pctxt, + userInput = (H245UserInputCapability*)memAllocZ(pctxt, sizeof(H245UserInputCapability)); if(!userInput) { @@ -865,7 +865,7 @@ void* ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt) userInput->t = T_H245UserInputCapability_basicString; return userInput; case OO_CAP_DTMF_H245_signal: - userInput = (H245UserInputCapability*)memAllocZ(pctxt, + userInput = (H245UserInputCapability*)memAllocZ(pctxt, sizeof(H245UserInputCapability)); if(!userInput) { @@ -898,9 +898,9 @@ struct H245VideoCapability* ooCapabilityCreateH263VideoCapability } params =(OOH263CapParams*)epCap->params; - pVideo = (H245VideoCapability*)memAllocZ(pctxt, + pVideo = (H245VideoCapability*)memAllocZ(pctxt, sizeof(H245VideoCapability)); - pH263Cap = (H245H263VideoCapability*) memAllocZ(pctxt, + pH263Cap = (H245H263VideoCapability*) memAllocZ(pctxt, sizeof(H245H263VideoCapability)); if(!pVideo || !pH263Cap) { @@ -964,9 +964,9 @@ struct H245AudioCapability* ooCapabilityCreateGSMFullRateCapability return NULL; } - pAudio = (H245AudioCapability*)memAlloc(pctxt, + pAudio = (H245AudioCapability*)memAlloc(pctxt, sizeof(H245AudioCapability)); - pGSMCap = (H245GSMAudioCapability*)memAlloc(pctxt, + pGSMCap = (H245GSMAudioCapability*)memAlloc(pctxt, sizeof(H245GSMAudioCapability)); if(!pAudio || !pGSMCap) { @@ -989,7 +989,7 @@ struct H245AudioCapability* ooCapabilityCreateGSMFullRateCapability pGSMCap->audioUnitSize = ((OOGSMCapParams*)epCap->params)->rxframes*OO_GSMFRAMESIZE; else pGSMCap->audioUnitSize = ((OOGSMCapParams*)epCap->params)->txframes*OO_GSMFRAMESIZE; - + pGSMCap->comfortNoise = ((OOGSMCapParams*)epCap->params)->comfortNoise; pGSMCap->scrambled = ((OOGSMCapParams*)epCap->params)->scrambled; @@ -1009,7 +1009,7 @@ struct H245AudioCapability* ooCapabilityCreateSimpleCapability return NULL; } params =(OOCapParams*)epCap->params; - pAudio = (H245AudioCapability*)memAlloc(pctxt, + pAudio = (H245AudioCapability*)memAlloc(pctxt, sizeof(H245AudioCapability)); if(!pAudio) { @@ -1017,7 +1017,7 @@ struct H245AudioCapability* ooCapabilityCreateSimpleCapability return NULL; } - + switch(epCap->cap) { case OO_G711ALAW64K: @@ -1032,7 +1032,7 @@ struct H245AudioCapability* ooCapabilityCreateSimpleCapability if(dir & OORX) pAudio->u.g711Alaw56k = params->rxframes; else - pAudio->u.g711Alaw56k = params->txframes; + pAudio->u.g711Alaw56k = params->txframes; return pAudio; case OO_G711ULAW64K: pAudio->t = T_H245AudioCapability_g711Ulaw64k; @@ -1078,7 +1078,7 @@ struct H245AudioCapability* ooCapabilityCreateSimpleCapability return pAudio; case OO_G7231: pAudio->t = T_H245AudioCapability_g7231; - pAudio->u.g7231 = (H245AudioCapability_g7231*)memAlloc(pctxt, + pAudio->u.g7231 = (H245AudioCapability_g7231*)memAlloc(pctxt, sizeof(H245AudioCapability_g7231)); if(!pAudio->u.g7231) { @@ -1112,7 +1112,7 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability return NULL; } - pAudio = (H245AudioCapability*)memAlloc(pctxt, + pAudio = (H245AudioCapability*)memAlloc(pctxt, sizeof(H245AudioCapability)); if(!pAudio) { @@ -1120,7 +1120,7 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability return NULL; } - + switch(epCap->cap) { case OO_AMRNB: @@ -1128,7 +1128,7 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability case OO_G726AAL2: case OO_SPEEX: pAudio->t = T_H245AudioCapability_nonStandard; - pAudio->u.nonStandard = (H245NonStandardParameter*)memAlloc(pctxt, + pAudio->u.nonStandard = (H245NonStandardParameter*)memAlloc(pctxt, sizeof(H245NonStandardParameter)); if(!pAudio->u.nonStandard) { @@ -1139,7 +1139,7 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability pAudio->u.nonStandard->nonStandardIdentifier.t=T_H245NonStandardIdentifier_h221NonStandard; pAudio->u.nonStandard->nonStandardIdentifier.u.h221NonStandard = - (H245NonStandardIdentifier_h221NonStandard *) memAlloc(pctxt, + (H245NonStandardIdentifier_h221NonStandard *) memAlloc(pctxt, sizeof(H245NonStandardIdentifier_h221NonStandard)); if (!pAudio->u.nonStandard->nonStandardIdentifier.u.h221NonStandard) { OOTRACEERR2("Error:Memory - ooCapabilityCreateSimpleCapability - %d\n", epCap->cap); @@ -1199,7 +1199,7 @@ struct H245DataMode_application* ooCreateT38ApplicationData { app->t = T_H245DataApplicationCapability_application_t38fax; app->u.t38fax = - (H245DataMode_application_t38fax *) memAlloc(pctxt, + (H245DataMode_application_t38fax *) memAlloc(pctxt, sizeof(H245DataMode_application_t38fax)); if (!app->u.t38fax) { OOTRACEERR1("Error:Memory - ooCreateT38AppData\n"); @@ -1237,7 +1237,7 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability return NULL; } - pT38 = (H245DataApplicationCapability*)memAlloc(pctxt, + pT38 = (H245DataApplicationCapability*)memAlloc(pctxt, sizeof(H245DataApplicationCapability)); if(!pT38) { @@ -1246,7 +1246,7 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability } memset(pT38, 0, sizeof(H245DataApplicationCapability)); pT38app = (void *)&pT38->application; - + switch(epCap->cap) { case OO_T38: @@ -1268,7 +1268,7 @@ struct H245DataApplicationCapability* ooCapabilityCreateT38Capability /* Used for g711 ulaw/alaw, g728, g729, g729a, g7231 */ ASN1BOOL ooCapabilityCheckCompatibility_Simple - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245AudioCapability* audioCap, int dir) { int noofframes=0, cap; @@ -1308,11 +1308,11 @@ ASN1BOOL ooCapabilityCheckCompatibility_Simple case T_H245AudioCapability_g729AnnexA: cap = OO_G729A; noofframes = audioCap->u.g729AnnexA; - break; + break; case T_H245AudioCapability_g729wAnnexB: cap = OO_G729B; noofframes = audioCap->u.g729wAnnexB; - break; + break; case T_H245AudioCapability_g7231: cap = OO_G7231; noofframes = audioCap->u.g7231->maxAl_sduAudioFrames; @@ -1322,7 +1322,7 @@ ASN1BOOL ooCapabilityCheckCompatibility_Simple return FALSE; } - OOTRACEDBGC3("Comparing codecs: current=%d, requested=%d\n", + OOTRACEDBGC3("Comparing codecs: current=%d, requested=%d\n", epCap->cap, cap); if(cap != epCap->cap) { return FALSE; } @@ -1359,7 +1359,7 @@ ASN1BOOL ooCapabilityCheckCompatibility_Simple } /* Used for g726, AMRNB */ ASN1BOOL ooCapabilityCheckCompatibility_NonStandard - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245AudioCapability* audioCap, int dir) { int cap; @@ -1368,7 +1368,7 @@ ASN1BOOL ooCapabilityCheckCompatibility_NonStandard if (audioCap->t == T_H245AudioCapability_nonStandard && audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard) { switch (audioCap->u.nonStandard->data.numocts) { case sizeof("G.726-32k")-1: @@ -1386,10 +1386,10 @@ ASN1BOOL ooCapabilityCheckCompatibility_NonStandard return FALSE; break; case sizeof("AMRNB")-1: /* case sizeof("Speex")-1 */ - if (!strncmp((char *)audioCap->u.nonStandard->data.data, "AMRNB", + if (!strncmp((char *)audioCap->u.nonStandard->data.data, "AMRNB", audioCap->u.nonStandard->data.numocts)) cap = OO_AMRNB; - else if (!strncmp((char *)audioCap->u.nonStandard->data.data, "Speex", + else if (!strncmp((char *)audioCap->u.nonStandard->data.data, "Speex", audioCap->u.nonStandard->data.numocts)) cap = OO_SPEEX; else @@ -1401,7 +1401,7 @@ ASN1BOOL ooCapabilityCheckCompatibility_NonStandard } else return FALSE; - OOTRACEDBGC3("Comparing codecs: current=%d, requested=%d\n", + OOTRACEDBGC3("Comparing codecs: current=%d, requested=%d\n", epCap->cap, cap); if(cap != epCap->cap) { return FALSE; } @@ -1411,7 +1411,7 @@ ASN1BOOL ooCapabilityCheckCompatibility_NonStandard OOBOOL ooCapabilityCheckCompatibility_GSM - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245AudioCapability* audioCap, int dir) { unsigned noofframes=0, cap; @@ -1447,8 +1447,8 @@ OOBOOL ooCapabilityCheckCompatibility_GSM { if(((OOGSMCapParams*)epCap->params)->txframes > noofframes){ OOTRACEDBGA5("Reducing txframes for GSM from %d to %d to match " - "receive capability of remote end.(%s, %s)\n", - ((OOGSMCapParams*)epCap->params)->txframes, noofframes, + "receive capability of remote end.(%s, %s)\n", + ((OOGSMCapParams*)epCap->params)->txframes, noofframes, call->callType, call->callToken); ((OOGSMCapParams*)epCap->params)->txframes = noofframes; } @@ -1459,7 +1459,7 @@ OOBOOL ooCapabilityCheckCompatibility_GSM } OOBOOL ooCapabilityCheckCompatibility_T38 - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245DataApplicationCapability* t38Cap, int dir) { unsigned cap = 0; @@ -1479,20 +1479,20 @@ OOBOOL ooCapabilityCheckCompatibility_T38 OOBOOL ooCapabilityCheckCompatibility_H263Video - (struct OOH323CallData *call, ooH323EpCapability *epCap, + (struct OOH323CallData *call, ooH323EpCapability *epCap, H245VideoCapability *pVideoCap, int dir) { H245H263VideoCapability *pH263Cap = NULL; OOH263CapParams *params = epCap->params; - if(!pVideoCap->u.h263VideoCapability) + if(!pVideoCap->u.h263VideoCapability) { OOTRACEERR3("Error:No H263 video capability present in video capability" "structure. (%s, %s)\n", call->callType, call->callToken); return FALSE; } pH263Cap = pVideoCap->u.h263VideoCapability; - + /* can we receive/transmit this capability */ if(OORX & dir) { @@ -1632,14 +1632,14 @@ OOBOOL ooCapabilityCheckCompatibility_H263Video } } } - + return FALSE; } OOBOOL ooCapabilityCheckCompatibility_Audio - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245AudioCapability* audioCap, int dir) { @@ -1666,17 +1666,17 @@ OOBOOL ooCapabilityCheckCompatibility_Audio return FALSE; } - return FALSE; + return FALSE; } OOBOOL ooCapabilityCheckCompatibility_Video - (OOH323CallData *call, ooH323EpCapability* epCap, + (OOH323CallData *call, ooH323EpCapability* epCap, H245VideoCapability* videoCap, int dir) { switch(videoCap->t) { case T_H245VideoCapability_h263VideoCapability: - return ooCapabilityCheckCompatibility_H263Video(call, epCap, + return ooCapabilityCheckCompatibility_H263Video(call, epCap, videoCap, dir); default: OOTRACEDBGC3("ooCapabilityCheckCompatibility_Video - Unsupported video " @@ -1689,19 +1689,19 @@ OOBOOL ooCapabilityCheckCompatibility_Video can receive only y, then we can't reduce our transmit rate */ OOBOOL ooCapabilityCheckCompatibility - (struct OOH323CallData *call, ooH323EpCapability* epCap, + (struct OOH323CallData *call, ooH323EpCapability* epCap, H245DataType* dataType, int dir) { switch(dataType->t) { case T_H245DataType_audioData: if(epCap->capType == OO_CAP_TYPE_AUDIO) - return ooCapabilityCheckCompatibility_Audio(call, epCap, + return ooCapabilityCheckCompatibility_Audio(call, epCap, dataType->u.audioData, dir); break; case T_H245DataType_videoData: if(epCap->capType == OO_CAP_TYPE_VIDEO) - return ooCapabilityCheckCompatibility_Video(call, epCap, + return ooCapabilityCheckCompatibility_Video(call, epCap, dataType->u.videoData, dir); break; case T_H245DataType_data: @@ -1729,11 +1729,11 @@ ASN1BOOL ooCheckCompatibility if(txCap->cap != rxCap->cap) return FALSE; if(!(txCap->dir & OOTX)) return FALSE; - + if(!(rxCap->dir & OORX)) return FALSE; switch(txCap->cap) - { + { case OO_G711ALAW64K: case OO_G711ALAW56K: case OO_G711ULAW64K: @@ -1743,26 +1743,26 @@ ASN1BOOL ooCheckCompatibility case OO_G729A: case OO_G729B: case OO_G7231: - if(((OOCapParams*)txCap->params)->txframes <= + if(((OOCapParams*)txCap->params)->txframes <= ((OOCapParams*)rxCap->params)->rxframes) return TRUE; else{ - OOTRACEDBGA4("Simple caps %s are not compatible.(%s, %s)\n", - ooGetCapTypeText(txCap->cap), call->callType, + OOTRACEDBGA4("Simple caps %s are not compatible.(%s, %s)\n", + ooGetCapTypeText(txCap->cap), call->callType, call->callToken); return FALSE; } case OO_GSMFULLRATE: case OO_GSMHALFRATE: case OO_GSMENHANCEDFULLRATE: - if(((OOGSMCapParams*)txCap->params)->txframes <= + if(((OOGSMCapParams*)txCap->params)->txframes <= ((OOGSMCapParams*)rxCap->params)->rxframes) return TRUE; else{ OOTRACEDBGA3("GSM caps are not compatible. (%s, %s)\n", call->callType, call->callToken); return FALSE; - } + } default: OOTRACEWARN3("WARN: Unsupported capabilities being compared. (%s, %s)\n", call->callType, call->callToken); @@ -1796,18 +1796,18 @@ ooH323EpCapability* ooIsAudioDataTypeGSMSupported cap = OO_GSMENHANCEDFULLRATE; break; default: - OOTRACEERR3("Error:Invalid GSM capability type.(%s, %s)\n", + OOTRACEERR3("Error:Invalid GSM capability type.(%s, %s)\n", call->callType, call->callToken); return NULL; } OOTRACEDBGC4("Determined audio data type to be of type %d. Searching" - " for matching capability.(%s, %s)\n", cap, call->callType, + " for matching capability.(%s, %s)\n", cap, call->callType, call->callToken); /* If we have call specific caps then we use them, otherwise we use general endpoint caps*/ - if(call->ourCaps) + if(call->ourCaps) cur = call->ourCaps; else cur = gH323ep.myCaps; @@ -1816,31 +1816,31 @@ ooH323EpCapability* ooIsAudioDataTypeGSMSupported { OOTRACEDBGC4("Local cap being compared %d. (%s, %s)\n", cur->cap, call->callType, call->callToken); - + if(cur->cap == cap && (cur->dir & dir)) break; cur = cur->next; } - + if(!cur) return NULL; - + OOTRACEDBGC4("Found matching audio capability type %d. Comparing" - " other parameters. (%s, %s)\n", cap, call->callType, + " other parameters. (%s, %s)\n", cap, call->callType, call->callToken); - + /* can we receive this capability */ if(dir & OORX) { if(((OOGSMCapParams*)cur->params)->rxframes < framesPerPkt) return NULL; else{ - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params =(OOGSMCapParams*)memAlloc(call->pctxt,sizeof(OOGSMCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeGSMSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -1861,13 +1861,13 @@ ooH323EpCapability* ooIsAudioDataTypeGSMSupported /* Can we transmit compatible stream */ if(dir & OOTX) { - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params =(OOGSMCapParams*)memAlloc(call->pctxt,sizeof(OOGSMCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeGSMSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -1885,7 +1885,7 @@ ooH323EpCapability* ooIsAudioDataTypeGSMSupported { OOTRACEINFO5("Reducing framesPerPkt for transmission of GSM " "capability from %d to %d to match receive capability of" - " remote endpoint.(%s, %s)\n", params->txframes, + " remote endpoint.(%s, %s)\n", params->txframes, framesPerPkt, call->callType, call->callToken); params->txframes = framesPerPkt; } @@ -1957,12 +1957,12 @@ ooH323EpCapability* ooIsAudioDataTypeSimpleSupported } OOTRACEDBGC4("Determined Simple audio data type to be of type %s. Searching" - " for matching capability.(%s, %s)\n", + " for matching capability.(%s, %s)\n", ooGetCapTypeText(cap), call->callType, call->callToken); /* If we have call specific caps, we use them; otherwise use general endpoint caps - */ + */ if(call->ourCaps) cur = call->ourCaps; else @@ -1970,38 +1970,38 @@ ooH323EpCapability* ooIsAudioDataTypeSimpleSupported while(cur) { - OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", + OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", ooGetCapTypeText(cur->cap),call->callType, call->callToken); - + if(cur->cap == cap && (cur->dir & dir)) break; cur = cur->next; } - + if(!cur) return NULL; - + OOTRACEDBGC4("Found matching simple audio capability type %s. Comparing" - " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), + " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), call->callType, call->callToken); - + /* can we receive this capability */ if(dir & OORX) { if(((OOCapParams*)cur->params)->rxframes < framesPerPkt) return NULL; - if(((OOCapParams*)cur->params)->rxframes > framesPerPkt) + if(((OOCapParams*)cur->params)->rxframes > framesPerPkt) ((OOCapParams*)cur->params)->rxframes = framesPerPkt; - OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params=(OOCapParams*)memAlloc(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeSimpleSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2016,8 +2016,8 @@ ooH323EpCapability* ooIsAudioDataTypeSimpleSupported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOCapParams)); OOTRACEDBGC4("Returning copy of matched receive capability %s. " - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2025,16 +2025,16 @@ ooH323EpCapability* ooIsAudioDataTypeSimpleSupported /* Can we transmit compatible stream */ if(dir & OOTX) { - OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params =(OOCapParams*)memAlloc(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeSimpleSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2052,13 +2052,13 @@ ooH323EpCapability* ooIsAudioDataTypeSimpleSupported { OOTRACEINFO5("Reducing framesPerPkt for transmission of Simple " "capability from %d to %d to match receive capability of" - " remote endpoint.(%s, %s)\n", params->txframes, + " remote endpoint.(%s, %s)\n", params->txframes, framesPerPkt, call->callType, call->callToken); params->txframes = framesPerPkt; } OOTRACEDBGC4("Returning copy of matched transmit capability %s." - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2074,8 +2074,8 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported OOCapParams * params= NULL; if (audioCap->t == T_H245AudioCapability_nonStandard && - audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + audioCap->u.nonStandard && + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard) { switch (audioCap->u.nonStandard->data.numocts) { case sizeof("G.726-32k")-1: @@ -2109,12 +2109,12 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported return NULL; OOTRACEDBGC4("Determined Simple audio data type to be of type %s. Searching" - " for matching capability.(%s, %s)\n", + " for matching capability.(%s, %s)\n", ooGetCapTypeText(cap), call->callType, call->callToken); /* If we have call specific caps, we use them; otherwise use general endpoint caps - */ + */ if(call->ourCaps) cur = call->ourCaps; else @@ -2122,33 +2122,33 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported while(cur) { - OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", + OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", ooGetCapTypeText(cur->cap),call->callType, call->callToken); - + if(cur->cap == cap && (cur->dir & dir)) break; cur = cur->next; } - + if(!cur) return NULL; - + OOTRACEDBGC4("Found matching simple audio capability type %s. Comparing" - " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), + " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), call->callType, call->callToken); - + /* can we receive this capability */ if(dir & OORX) { - OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params=(OOCapParams*)memAlloc(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeSimpleSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2163,8 +2163,8 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOCapParams)); OOTRACEDBGC4("Returning copy of matched receive capability %s. " - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2172,16 +2172,16 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported /* Can we transmit compatible stream */ if(dir & OOTX) { - OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params =(OOCapParams*)memAlloc(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeSimpleSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2196,8 +2196,8 @@ ooH323EpCapability* ooIsAudioDataTypeNonStandardSupported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOCapParams)); OOTRACEDBGC4("Returning copy of matched transmit capability %s." - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2228,10 +2228,10 @@ ooH323EpCapability* ooIsAudioDataTypeSupported case T_H245AudioCapability_gsmFullRate: case T_H245AudioCapability_gsmHalfRate: case T_H245AudioCapability_gsmEnhancedFullRate: - return ooIsAudioDataTypeGSMSupported(call, audioCap, dir); + return ooIsAudioDataTypeGSMSupported(call, audioCap, dir); default: return NULL; - } + } } ooH323EpCapability* ooIsT38Supported @@ -2248,7 +2248,7 @@ ooH323EpCapability* ooIsT38Supported break; default: return NULL; - } + } if(call->ourCaps) cur = call->ourCaps; @@ -2257,33 +2257,33 @@ ooH323EpCapability* ooIsT38Supported while(cur) { - OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", + OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", ooGetCapTypeText(cur->cap),call->callType, call->callToken); - + if(cur->cap == cap && (cur->dir & dir)) break; cur = cur->next; } - + if(!cur) return NULL; - + OOTRACEDBGC4("Found matching t38 capability type %s. Comparing" - " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), + " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), call->callType, call->callToken); - + /* can we receive this capability */ if(dir & OORX) { - OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can receive Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAllocZ(call->pctxt, + epCap = (ooH323EpCapability*)memAllocZ(call->pctxt, sizeof(ooH323EpCapability)); params=(OOCapParams*)memAlloc(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsT38Supported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2298,8 +2298,8 @@ ooH323EpCapability* ooIsT38Supported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOCapParams)); OOTRACEDBGC4("Returning copy of matched receive capability %s. " - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2307,16 +2307,16 @@ ooH323EpCapability* ooIsT38Supported /* Can we transmit compatible stream */ if(dir & OOTX) { - OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + OOTRACEDBGC4("We can transmit Simple capability %s. (%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); params =(OOCapParams*)memAllocZ(call->pctxt,sizeof(OOCapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsAudioDataTypeSimpleSupported - " - "epCap/params (%s, %s)\n", call->callType, + "epCap/params (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2331,8 +2331,8 @@ ooH323EpCapability* ooIsT38Supported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOCapParams)); OOTRACEDBGC4("Returning copy of matched transmit capability %s." - "(%s, %s)\n", - ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", + ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2340,12 +2340,12 @@ ooH323EpCapability* ooIsT38Supported } ooH323EpCapability* ooIsVideoDataTypeH263Supported - (OOH323CallData *call, H245H263VideoCapability* pH263Cap, int dir, + (OOH323CallData *call, H245H263VideoCapability* pH263Cap, int dir, OOPictureFormat picFormat) { int cap; ooH323EpCapability *cur=NULL, *epCap=NULL; - OOH263CapParams *params= NULL; + OOH263CapParams *params= NULL; char *pictureType=NULL; unsigned mpi=0; cap = OO_H263VIDEO; @@ -2375,14 +2375,14 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported pictureType = "CIF16"; mpi = pH263Cap->cif16MPI; } - - OOTRACEDBGA4("Looking for H263 video capability(%s). (%s, %s)\n", + + OOTRACEDBGA4("Looking for H263 video capability(%s). (%s, %s)\n", pictureType, call->callType, call->callToken); /* If we have call specific caps, we use them; otherwise use general endpoint caps - */ + */ if(call->ourCaps) cur = call->ourCaps; else @@ -2390,9 +2390,9 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported while(cur) { - OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", + OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n", ooGetCapTypeText(cur->cap),call->callType, call->callToken); - + if(cur->cap == cap && (cur->dir & dir)) { if(((OOH263CapParams*)cur->params)->picFormat == picFormat) @@ -2400,25 +2400,25 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported } cur = cur->next; } - + if(!cur) return NULL; - + OOTRACEDBGC4("Found matching H.263 video capability type %s. Comparing" - " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), - call->callType, call->callToken); + " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), + call->callType, call->callToken); if(dir & OORX) { if(mpi < ((OOH263CapParams*)cur->params)->MPI) return NULL; else{ - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); - params = (OOH263CapParams*) memAlloc(call->pctxt, + params = (OOH263CapParams*) memAlloc(call->pctxt, sizeof(OOH263CapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsVideoDataTypeH263Supported - " - "epCap/params. (%s, %s)\n", call->callType, + "epCap/params. (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2433,21 +2433,21 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported epCap->next = NULL; memcpy(epCap->params, cur->params, sizeof(OOH263CapParams)); OOTRACEDBGC4("Returning copy of matched receive capability %s. " - "(%s, %s)\n", ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } } if(dir & OOTX) { - epCap = (ooH323EpCapability*)memAlloc(call->pctxt, + epCap = (ooH323EpCapability*)memAlloc(call->pctxt, sizeof(ooH323EpCapability)); - params = (OOH263CapParams*) memAlloc(call->pctxt, + params = (OOH263CapParams*) memAlloc(call->pctxt, sizeof(OOH263CapParams)); if(!epCap || !params) { OOTRACEERR3("Error:Memory - ooIsVideoDataTypeH263Supported - " - "epCap/params. (%s, %s)\n", call->callType, + "epCap/params. (%s, %s)\n", call->callType, call->callToken); return NULL; } @@ -2465,12 +2465,12 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported { OOTRACEINFO5("Increasing minimum picture interval for transmission of" " H263 video capability from %d to %d to match receive " - "capability of remote endpoint.(%s, %s)\n", params->MPI, + "capability of remote endpoint.(%s, %s)\n", params->MPI, mpi, call->callType, call->callToken); params->MPI = mpi; } OOTRACEDBGC4("Returning copy of matched receive capability %s. " - "(%s, %s)\n", ooGetCapTypeText(cur->cap), call->callType, + "(%s, %s)\n", ooGetCapTypeText(cur->cap), call->callType, call->callToken); return epCap; } @@ -2481,25 +2481,25 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported ooH323EpCapability* ooIsVideoDataTypeSupported (OOH323CallData *call, H245VideoCapability* pVideoCap, int dir) { - switch(pVideoCap->t) + switch(pVideoCap->t) { case T_H245VideoCapability_h263VideoCapability: if(pVideoCap->u.h263VideoCapability->m.sqcifMPIPresent) - return ooIsVideoDataTypeH263Supported(call, + return ooIsVideoDataTypeH263Supported(call, pVideoCap->u.h263VideoCapability, dir, OO_PICFORMAT_SQCIF); else if(pVideoCap->u.h263VideoCapability->m.qcifMPIPresent) - return ooIsVideoDataTypeH263Supported(call, + return ooIsVideoDataTypeH263Supported(call, pVideoCap->u.h263VideoCapability, dir, OO_PICFORMAT_QCIF); else if(pVideoCap->u.h263VideoCapability->m.cifMPIPresent) - return ooIsVideoDataTypeH263Supported(call, + return ooIsVideoDataTypeH263Supported(call, pVideoCap->u.h263VideoCapability, dir, OO_PICFORMAT_CIF); else if(pVideoCap->u.h263VideoCapability->m.cif4MPIPresent) - return ooIsVideoDataTypeH263Supported(call, + return ooIsVideoDataTypeH263Supported(call, pVideoCap->u.h263VideoCapability, dir, OO_PICFORMAT_CIF4); else if(pVideoCap->u.h263VideoCapability->m.cif16MPIPresent) - return ooIsVideoDataTypeH263Supported(call, + return ooIsVideoDataTypeH263Supported(call, pVideoCap->u.h263VideoCapability, dir, OO_PICFORMAT_CIF16); - break; + break; case T_H245VideoCapability_nonStandard: case T_H245VideoCapability_h261VideoCapability: case T_H245VideoCapability_h262VideoCapability: @@ -2517,17 +2517,17 @@ ooH323EpCapability* ooIsVideoDataTypeSupported ooH323EpCapability* ooIsDataTypeSupported (OOH323CallData *call, H245DataType *data, int dir) { - OOTRACEDBGC3("Looking for data type support. (%s, %s)\n", call->callType, + OOTRACEDBGC3("Looking for data type support. (%s, %s)\n", call->callType, call->callToken); - + switch(data->t) { case T_H245DataType_nonStandard: - OOTRACEDBGC3("NonStandard data type not supported.(%s, %s)\n", + OOTRACEDBGC3("NonStandard data type not supported.(%s, %s)\n", call->callType, call->callToken); return NULL; case T_H245DataType_nullData: - OOTRACEDBGC3("Null data type not supported.(%s, %s)\n", + OOTRACEDBGC3("Null data type not supported.(%s, %s)\n", call->callType, call->callToken); return NULL; case T_H245DataType_videoData: @@ -2540,12 +2540,12 @@ ooH323EpCapability* ooIsDataTypeSupported return ooIsAudioDataTypeSupported(call, data->u.audioData, dir); case T_H245DataType_data: - OOTRACEDBGC3("Looking for application data dataType support.(%s, %s)\n", + OOTRACEDBGC3("Looking for application data dataType support.(%s, %s)\n", call->callType, call->callToken); return ooIsT38Supported(call, data->u.data, dir); case T_H245DataType_encryptionData: - OOTRACEDBGC3("Encryption data type not supported.(%s, %s)\n", + OOTRACEDBGC3("Encryption data type not supported.(%s, %s)\n", call->callType, call->callToken); return NULL; case T_H245DataType_h235Control: @@ -2555,7 +2555,7 @@ ooH323EpCapability* ooIsDataTypeSupported case T_H245DataType_multiplexedStream: return NULL; default: - OOTRACEINFO3("Unknown data type (%s, %s)\n", call->callType, + OOTRACEINFO3("Unknown data type (%s, %s)\n", call->callType, call->callToken); } return NULL; @@ -2584,15 +2584,15 @@ int ooRemoveCapFromCapPrefs(OOH323CallData *call, int cap) memcpy(&oldPrefs, capPrefs, sizeof(OOCapPrefs)); memset(capPrefs, 0, sizeof(OOCapPrefs)); for(i=0; iorder[j++] = oldPrefs.order[i]; } capPrefs->index = j; return OO_OK; } - + int ooAppendCapToCapPrefs(OOH323CallData *call, int cap) { OOCapPrefs *capPrefs=NULL; @@ -2629,7 +2629,7 @@ int ooChangeCapPrefOrder(OOH323CallData *call, int cap, int pos) /* Decrease Pref order */ if(i < pos) { - for( ; iorder[i] = capPrefs->order[i+1]; capPrefs->order[i]=cap; return OO_OK; @@ -2658,12 +2658,12 @@ int ooPreppendCapToCapPrefs(OOH323CallData *call, int cap) memcpy(&oldPrefs, capPrefs, sizeof(OOCapPrefs)); - + capPrefs->order[j++] = cap; for(i=0; iorder[j++] = oldPrefs.order[i]; } capPrefs->index = j; @@ -2675,35 +2675,35 @@ int ooAddRemoteCapability(OOH323CallData *call, H245Capability *cap) switch(cap->t) { case T_H245Capability_receiveAudioCapability: - return ooAddRemoteAudioCapability(call, cap->u.receiveAudioCapability, + return ooAddRemoteAudioCapability(call, cap->u.receiveAudioCapability, OORX); case T_H245Capability_transmitAudioCapability: - return ooAddRemoteAudioCapability(call, cap->u.transmitAudioCapability, + return ooAddRemoteAudioCapability(call, cap->u.transmitAudioCapability, OOTX); case T_H245Capability_receiveAndTransmitAudioCapability: - return ooAddRemoteAudioCapability(call, + return ooAddRemoteAudioCapability(call, cap->u.receiveAndTransmitAudioCapability, OORXTX); case T_H245Capability_receiveDataApplicationCapability: - return ooAddRemoteDataApplicationCapability(call, cap->u.receiveDataApplicationCapability, + return ooAddRemoteDataApplicationCapability(call, cap->u.receiveDataApplicationCapability, OORX); case T_H245Capability_transmitDataApplicationCapability: - return ooAddRemoteDataApplicationCapability(call, cap->u.transmitDataApplicationCapability, + return ooAddRemoteDataApplicationCapability(call, cap->u.transmitDataApplicationCapability, OOTX); case T_H245Capability_receiveAndTransmitDataApplicationCapability: - return ooAddRemoteDataApplicationCapability(call, + return ooAddRemoteDataApplicationCapability(call, cap->u.receiveAndTransmitDataApplicationCapability, OORXTX); default: - OOTRACEDBGA3("Unsupported cap type encountered. Ignoring. (%s, %s)\n", + OOTRACEDBGA3("Unsupported cap type encountered. Ignoring. (%s, %s)\n", call->callType, call->callToken); } return OO_OK; } -int ooAddRemoteDataApplicationCapability(OOH323CallData *call, +int ooAddRemoteDataApplicationCapability(OOH323CallData *call, H245DataApplicationCapability *dataCap, int dir) { @@ -2720,177 +2720,177 @@ int ooAddRemoteDataApplicationCapability(OOH323CallData *call, dir, NULL, NULL, NULL, NULL,TRUE); default: OOTRACEDBGA1("Unsupported data capability type\n"); - + } return OO_OK; } -int ooAddRemoteAudioCapability(OOH323CallData *call, +int ooAddRemoteAudioCapability(OOH323CallData *call, H245AudioCapability *audioCap, int dir) { int rxframes=0, txframes=0; - + switch(audioCap->t) { case T_H245AudioCapability_g711Alaw64k: if(dir&OOTX) txframes = audioCap->u.g711Alaw64k; else if(dir&OORX) rxframes = audioCap->u.g711Alaw64k; - else{ - txframes = audioCap->u.g711Alaw64k; - rxframes = audioCap->u.g711Alaw64k; + else{ + txframes = audioCap->u.g711Alaw64k; + rxframes = audioCap->u.g711Alaw64k; } - return ooCapabilityAddSimpleCapability(call, OO_G711ALAW64K, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G711ALAW64K, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL,TRUE); case T_H245AudioCapability_g711Alaw56k: if(dir&OOTX) txframes = audioCap->u.g711Alaw56k; else if(dir&OORX) rxframes = audioCap->u.g711Alaw56k; - else{ - txframes = audioCap->u.g711Alaw56k; - rxframes = audioCap->u.g711Alaw56k; + else{ + txframes = audioCap->u.g711Alaw56k; + rxframes = audioCap->u.g711Alaw56k; } - return ooCapabilityAddSimpleCapability(call, OO_G711ALAW56K, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G711ALAW56K, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g711Ulaw64k: if(dir&OOTX) txframes = audioCap->u.g711Ulaw64k; else if(dir&OORX) rxframes = audioCap->u.g711Ulaw64k; - else{ - txframes = audioCap->u.g711Ulaw64k; - rxframes = audioCap->u.g711Ulaw64k; + else{ + txframes = audioCap->u.g711Ulaw64k; + rxframes = audioCap->u.g711Ulaw64k; } - return ooCapabilityAddSimpleCapability(call, OO_G711ULAW64K, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G711ULAW64K, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g711Ulaw56k: if(dir&OOTX) txframes = audioCap->u.g711Ulaw56k; else if(dir&OORX) rxframes = audioCap->u.g711Ulaw56k; - else{ - txframes = audioCap->u.g711Ulaw56k; - rxframes = audioCap->u.g711Ulaw56k; + else{ + txframes = audioCap->u.g711Ulaw56k; + rxframes = audioCap->u.g711Ulaw56k; } - return ooCapabilityAddSimpleCapability(call, OO_G711ULAW56K, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G711ULAW56K, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); /* case T_H245AudioCapability_g726: if(dir&OOTX) txframes = audioCap->u.g726; else if(dir&OORX) rxframes = audioCap->u.g726; - else{ - txframes = audioCap->u.g726; - rxframes = audioCap->u.g726; + else{ + txframes = audioCap->u.g726; + rxframes = audioCap->u.g726; } - return ooCapabilityAddSimpleCapability(call, OO_G726, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G726, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); */ case T_H245AudioCapability_nonStandard: - if (audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + if (audioCap->u.nonStandard && + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard && audioCap->u.nonStandard->data.numocts == sizeof("G.726-32k")-1 && - !strncmp((char *)audioCap->u.nonStandard->data.data, "G.726-32k", + !strncmp((char *)audioCap->u.nonStandard->data.data, "G.726-32k", audioCap->u.nonStandard->data.numocts)) - return ooCapabilityAddSimpleCapability(call, OO_G726, 20, + return ooCapabilityAddSimpleCapability(call, OO_G726, 20, 240, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); - if (audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + if (audioCap->u.nonStandard && + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard && audioCap->u.nonStandard->data.numocts == sizeof("G726r32")-1 && - !strncmp((char *)audioCap->u.nonStandard->data.data, "G726r32", + !strncmp((char *)audioCap->u.nonStandard->data.data, "G726r32", audioCap->u.nonStandard->data.numocts)) - return ooCapabilityAddSimpleCapability(call, OO_G726AAL2, 20, + return ooCapabilityAddSimpleCapability(call, OO_G726AAL2, 20, 240, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); - if (audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + if (audioCap->u.nonStandard && + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard && audioCap->u.nonStandard->data.numocts == sizeof("AMRNB")-1 && - !strncmp((char *)audioCap->u.nonStandard->data.data, "AMRNB", + !strncmp((char *)audioCap->u.nonStandard->data.data, "AMRNB", audioCap->u.nonStandard->data.numocts)) - return ooCapabilityAddSimpleCapability(call, OO_AMRNB, 4, + return ooCapabilityAddSimpleCapability(call, OO_AMRNB, 4, 4, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); - if (audioCap->u.nonStandard && - audioCap->u.nonStandard->nonStandardIdentifier.t == + if (audioCap->u.nonStandard && + audioCap->u.nonStandard->nonStandardIdentifier.t == T_H245NonStandardIdentifier_h221NonStandard && audioCap->u.nonStandard->data.numocts == sizeof("Speex")-1 && - !strncmp((char *)audioCap->u.nonStandard->data.data, "Speex", + !strncmp((char *)audioCap->u.nonStandard->data.data, "Speex", audioCap->u.nonStandard->data.numocts)) - return ooCapabilityAddSimpleCapability(call, OO_SPEEX, 4, + return ooCapabilityAddSimpleCapability(call, OO_SPEEX, 4, 4, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); break; case T_H245AudioCapability_g728: if(dir&OOTX) txframes = audioCap->u.g728; else if(dir&OORX) rxframes = audioCap->u.g728; - else{ - txframes = audioCap->u.g728; - rxframes = audioCap->u.g728; + else{ + txframes = audioCap->u.g728; + rxframes = audioCap->u.g728; } - return ooCapabilityAddSimpleCapability(call, OO_G728, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G728, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g729: if(dir&OOTX) txframes = audioCap->u.g729; else if(dir&OORX) rxframes = audioCap->u.g729; - else{ - txframes = audioCap->u.g729; - rxframes = audioCap->u.g729; + else{ + txframes = audioCap->u.g729; + rxframes = audioCap->u.g729; } - return ooCapabilityAddSimpleCapability(call, OO_G729, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G729, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g729AnnexA: if(dir&OOTX) txframes = audioCap->u.g729AnnexA; else if(dir&OORX) rxframes = audioCap->u.g729AnnexA; - else{ - txframes = audioCap->u.g729AnnexA; - rxframes = audioCap->u.g729AnnexA; + else{ + txframes = audioCap->u.g729AnnexA; + rxframes = audioCap->u.g729AnnexA; } - return ooCapabilityAddSimpleCapability(call, OO_G729A, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G729A, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g729wAnnexB: if(dir&OOTX) txframes = audioCap->u.g729wAnnexB; else if(dir&OORX) rxframes = audioCap->u.g729wAnnexB; - else{ - txframes = audioCap->u.g729wAnnexB; - rxframes = audioCap->u.g729wAnnexB; + else{ + txframes = audioCap->u.g729wAnnexB; + rxframes = audioCap->u.g729wAnnexB; } - return ooCapabilityAddSimpleCapability(call, OO_G729B, txframes, + return ooCapabilityAddSimpleCapability(call, OO_G729B, txframes, rxframes, FALSE, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_g7231: if(dir&OOTX) txframes = audioCap->u.g7231->maxAl_sduAudioFrames; else if(dir&OORX) rxframes = audioCap->u.g7231->maxAl_sduAudioFrames; - else{ - txframes = audioCap->u.g7231->maxAl_sduAudioFrames; - rxframes = audioCap->u.g7231->maxAl_sduAudioFrames; + else{ + txframes = audioCap->u.g7231->maxAl_sduAudioFrames; + rxframes = audioCap->u.g7231->maxAl_sduAudioFrames; } return ooCapabilityAddSimpleCapability(call, OO_G7231, txframes,rxframes, audioCap->u.g7231->silenceSuppression, - dir, NULL, NULL, NULL, NULL, TRUE); + dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_gsmFullRate: - return ooCapabilityAddGSMCapability(call, OO_GSMFULLRATE, + return ooCapabilityAddGSMCapability(call, OO_GSMFULLRATE, (unsigned)(audioCap->u.gsmFullRate->audioUnitSize/OO_GSMFRAMESIZE), audioCap->u.gsmFullRate->comfortNoise, - audioCap->u.gsmFullRate->scrambled, + audioCap->u.gsmFullRate->scrambled, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_gsmHalfRate: return ooCapabilityAddGSMCapability(call, OO_GSMHALFRATE, (unsigned)(audioCap->u.gsmHalfRate->audioUnitSize/OO_GSMFRAMESIZE), audioCap->u.gsmHalfRate->comfortNoise, - audioCap->u.gsmHalfRate->scrambled, + audioCap->u.gsmHalfRate->scrambled, dir, NULL, NULL, NULL, NULL, TRUE); case T_H245AudioCapability_gsmEnhancedFullRate: - return ooCapabilityAddGSMCapability(call, OO_GSMENHANCEDFULLRATE, + return ooCapabilityAddGSMCapability(call, OO_GSMENHANCEDFULLRATE, (unsigned)(audioCap->u.gsmEnhancedFullRate->audioUnitSize/OO_GSMFRAMESIZE), audioCap->u.gsmEnhancedFullRate->comfortNoise, - audioCap->u.gsmEnhancedFullRate->scrambled, + audioCap->u.gsmEnhancedFullRate->scrambled, dir, NULL, NULL, NULL, NULL, TRUE); default: OOTRACEDBGA1("Unsupported audio capability type\n"); - + } return OO_OK; @@ -2902,11 +2902,11 @@ int ooCapabilityUpdateJointCapabilities ooH323EpCapability * epCap = NULL, *cur = NULL; OOTRACEDBGC3("checking whether we need to add cap to joint capabilities" "(%s, %s)\n", call->callType, call->callToken); - + switch(cap->t) { case T_H245Capability_receiveAudioCapability: - epCap= ooIsAudioDataTypeSupported(call, cap->u.receiveAudioCapability, + epCap= ooIsAudioDataTypeSupported(call, cap->u.receiveAudioCapability, OOTX); break; case T_H245Capability_transmitAudioCapability: @@ -2919,14 +2919,14 @@ int ooCapabilityUpdateJointCapabilities epCap = ooIsAudioDataTypeSupported(call, cap->u.transmitAudioCapability, OORX); break; case T_H245Capability_receiveVideoCapability: - return ooCapabilityUpdateJointCapabilitiesVideo(call, + return ooCapabilityUpdateJointCapabilitiesVideo(call, cap->u.receiveVideoCapability, OOTX); case T_H245Capability_transmitVideoCapability: - return ooCapabilityUpdateJointCapabilitiesVideo(call, + return ooCapabilityUpdateJointCapabilitiesVideo(call, cap->u.transmitVideoCapability, OORX); case T_H245Capability_receiveDataApplicationCapability: - epCap= ooIsT38Supported(call, cap->u.receiveDataApplicationCapability, + epCap= ooIsT38Supported(call, cap->u.receiveDataApplicationCapability, OOTX); break; case T_H245Capability_transmitDataApplicationCapability: @@ -2941,7 +2941,7 @@ int ooCapabilityUpdateJointCapabilities case T_H245Capability_receiveAndTransmitUserInputCapability: - if((cap->u.receiveAndTransmitUserInputCapability->t == + if((cap->u.receiveAndTransmitUserInputCapability->t == T_H245UserInputCapability_basicString) && (call->dtmfmode & OO_CAP_DTMF_H245_alphanumeric)) { @@ -2957,7 +2957,7 @@ int ooCapabilityUpdateJointCapabilities } case T_H245Capability_receiveUserInputCapability: - if((cap->u.receiveUserInputCapability->t == + if((cap->u.receiveUserInputCapability->t == T_H245UserInputCapability_basicString) && (call->dtmfmode & OO_CAP_DTMF_H245_alphanumeric)) { @@ -2973,7 +2973,7 @@ int ooCapabilityUpdateJointCapabilities } //break; default: - OOTRACEDBGA3("Unsupported cap type encountered. Ignoring. (%s, %s)\n", + OOTRACEDBGA3("Unsupported cap type encountered. Ignoring. (%s, %s)\n", call->callType, call->callToken); } @@ -3006,11 +3006,11 @@ int ooCapabilityUpdateJointCapabilitiesVideo switch(videoCap->t) { case T_H245VideoCapability_h263VideoCapability: - return ooCapabilityUpdateJointCapabilitiesVideoH263(call, + return ooCapabilityUpdateJointCapabilitiesVideoH263(call, videoCap->u.h263VideoCapability, dir); default: OOTRACEDBGC3("ooCapabilityUpdateJointCapabilitiesVideo - Unsupported" - "capability type. (%s, %s)\n", call->callType, + "capability type. (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -3023,7 +3023,7 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 ooH323EpCapability *epCap = NULL, *cur = NULL; if(pH263Cap->m.sqcifMPIPresent) { - epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, + epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, OO_PICFORMAT_SQCIF); if(epCap) { @@ -3038,14 +3038,14 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 cur->next = epCap; } - } + } } epCap = NULL; if(pH263Cap->m.qcifMPIPresent) { - epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, + epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, OO_PICFORMAT_QCIF); if(epCap) { @@ -3060,14 +3060,14 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 cur->next = epCap; } - } + } } epCap = NULL; if(pH263Cap->m.cifMPIPresent) { - epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, + epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, OO_PICFORMAT_CIF); if(epCap) { @@ -3082,14 +3082,14 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 cur->next = epCap; } - } + } } epCap = NULL; if(pH263Cap->m.cif4MPIPresent) { - epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, + epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, OO_PICFORMAT_CIF4); if(epCap) { @@ -3103,14 +3103,14 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 while(cur->next) cur = cur->next; cur->next = epCap; } - } + } } epCap = NULL; if(pH263Cap->m.cif16MPIPresent) { - epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, + epCap = ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, OO_PICFORMAT_CIF16); if(epCap) { @@ -3125,7 +3125,7 @@ int ooCapabilityUpdateJointCapabilitiesVideoH263 cur->next = epCap; } - } + } } return OO_OK; diff --git a/addons/ooh323c/src/ooCapability.h b/addons/ooh323c/src/ooCapability.h index 4e108cfd84..ce9cc392f4 100644 --- a/addons/ooh323c/src/ooCapability.h +++ b/addons/ooh323c/src/ooCapability.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooCapability.h - * This file contains Capability management functions. + * @file ooCapability.h + * This file contains Capability management functions. */ #ifndef OO_CAPABILITY_H_ #define OO_CAPABILITY_H_ @@ -29,7 +29,7 @@ #define OOTX (1<<1) #define OORXANDTX (1<<2) #define OORXTX (1<<3) /* For symmetric capabilities */ -/* Various types of caps. Note that not all +/* Various types of caps. Note that not all supported */ typedef enum OOCapabilities{ OO_CAP_AUDIO_BASE = 0, @@ -89,7 +89,7 @@ typedef enum OOCapabilities{ /** * This structure defines the preference order for capabilities. - * + * */ typedef struct OOCapPrefs { int order[20]; @@ -99,11 +99,11 @@ typedef struct OOCapPrefs { typedef struct OOCapParams { int txframes; /*!< Number of frames per packet for transmission */ int rxframes; /*!< Number of frames per packet for reception */ - OOBOOL silenceSuppression; + OOBOOL silenceSuppression; } OOCapParams; typedef struct OOGSMCapParams { - unsigned txframes; + unsigned txframes; unsigned rxframes; OOBOOL scrambled; OOBOOL comfortNoise; @@ -130,7 +130,7 @@ struct OOLogicalChannel; extern "C" { #endif -/** +/** * This callback is used for starting media receive channel. This callback * function is triggered when receive media channel has to be started. * @param call Call for which receive media channel has to be started. @@ -143,7 +143,7 @@ typedef int (*cb_StartReceiveChannel) (struct OOH323CallData *call, struct OOLogicalChannel *pChannel); -/** +/** * This callback is used for starting media transmit channel. This callback * function is triggered when transmit media channel has to be started. * @param call Call for which transmit media channel has to be started. @@ -155,7 +155,7 @@ typedef int (*cb_StartReceiveChannel) typedef int (*cb_StartTransmitChannel) (struct OOH323CallData *call, struct OOLogicalChannel *pChannel); -/** +/** * This callback is used for stopping media receive channel. This callback * function is triggered when receive media channel has to be stopped. * @param call Call for which receive media channel has to be stopped. @@ -167,7 +167,7 @@ typedef int (*cb_StartTransmitChannel) typedef int (*cb_StopReceiveChannel) (struct OOH323CallData *call, struct OOLogicalChannel *pChannel); -/** +/** * This callback is used for stopping media transmit channel. This callback * function is triggered when transmit media channel has to be stopped. * @param call Call for which transmit media channel has to be stopped. @@ -190,7 +190,7 @@ typedef enum OOCapType { * capability */ typedef struct ooH323EpCapability { - int dir; + int dir; int cap; OOCapType capType; void *params; @@ -212,14 +212,14 @@ typedef struct ooH323EpCapability { #endif /* MAKE_DLL */ #endif /* EXTERN */ -/** +/** * @defgroup capmgmt Capability Management * @{ */ /** * This function is used to add rfc2833 based dtmf detection capability - * @param call Call if enabling for call, else null for + * @param call Call if enabling for call, else null for * endpoint. * @param dynamicRTPPayloadType dynamicRTPPayloadType to be used. * @return OO_OK, on success. OO_FAILED, on failure. @@ -237,7 +237,7 @@ EXTERN int ooCapabilityDisableDTMFRFC2833(struct OOH323CallData *call); /** - * This function is used to enable support for H.245 based alphanumeric dtmf + * This function is used to enable support for H.245 based alphanumeric dtmf * capability. * @param call Handle to call, if enabling for the call, else NULL * for end-point. @@ -246,7 +246,7 @@ EXTERN int ooCapabilityDisableDTMFRFC2833(struct OOH323CallData *call); EXTERN int ooCapabilityEnableDTMFH245Alphanumeric(struct OOH323CallData *call); /** - * This function is used to disable support for H.245 based alphanumeric dtmf + * This function is used to disable support for H.245 based alphanumeric dtmf * capability. * @param call Handle to call, if disabling for the call, else NULL * for end-point. @@ -256,7 +256,7 @@ EXTERN int ooCapabilityDisableDTMFH245Alphanumeric (struct OOH323CallData *call); /** - * This function is used to enable support for H.245 based signal dtmf + * This function is used to enable support for H.245 based signal dtmf * capability. * @param call Handle to call, if enabling for the call, else NULL * for end-point. @@ -265,7 +265,7 @@ EXTERN int ooCapabilityDisableDTMFH245Alphanumeric EXTERN int ooCapabilityEnableDTMFH245Signal(struct OOH323CallData *call); /** - * This function is used to disable support for H.245 based signal dtmf + * This function is used to disable support for H.245 based signal dtmf * capability. * @param call Handle to call, if disabling for the call, else NULL * for end-point. @@ -291,14 +291,14 @@ EXTERN int ooCapabilityDisableDTMFQ931Keypad(struct OOH323CallData *call); /** * This function is used to add simple capabilities which have only rxframes - * and txframes parameters to the endpoint or call.(ex. G711, G728, G723.1, + * and txframes parameters to the endpoint or call.(ex. G711, G728, G723.1, * G729) - * @param call Handle to a call. If this is not Null, then - * capability is added to call's remote enpoint - * capability list, else it is added to local H323 + * @param call Handle to a call. If this is not Null, then + * capability is added to call's remote enpoint + * capability list, else it is added to local H323 * endpoint list. * @param cap Type of G711 capability to be added. - * @param txframes Number of frames per packet for transmission. + * @param txframes Number of frames per packet for transmission. * @param rxframes Number of frames per packet for reception. * @param silenceSuppression Indicates support for silence suppression. * Used only in case of g7231, otherwise ignored. @@ -312,8 +312,8 @@ EXTERN int ooCapabilityDisableDTMFQ931Keypad(struct OOH323CallData *call); * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooCapabilityAddSimpleCapability - (struct OOH323CallData *call, int cap, int txframes, int rxframes, - OOBOOL silenceSuppression, int dir, + (struct OOH323CallData *call, int cap, int txframes, int rxframes, + OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, @@ -325,13 +325,13 @@ EXTERN int ooCapabilityAddSimpleCapability * This is an internal helper function which is used to add a GSM capability * to local endpoints capability list or to remote endpoints capability list or * to a call's capability list. - * @param call Handle to a call. If this is not Null, then - * capability is added to call's remote enpoint - * capability list, else it is added to local H323 + * @param call Handle to a call. If this is not Null, then + * capability is added to call's remote enpoint + * capability list, else it is added to local H323 * endpoint list. * @param cap Type of GSM capability to be added. - * @param framesPerPkt Number of GSM frames per packet. - * @param comfortNoise Comfort noise spec for the capability. + * @param framesPerPkt Number of GSM frames per packet. + * @param comfortNoise Comfort noise spec for the capability. * @param scrambled Scrambled enabled/disabled for the capability. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -340,38 +340,38 @@ EXTERN int ooCapabilityAddSimpleCapability * @param stopTransmitChannel Callback function to stop transmit channel. * @param remote TRUE, if adding call's remote capabilities. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -int ooCapabilityAddGSMCapability(struct OOH323CallData *call, int cap, +int ooCapabilityAddGSMCapability(struct OOH323CallData *call, int cap, unsigned framesPerPkt, OOBOOL comfortNoise, - OOBOOL scrambled, int dir, + OOBOOL scrambled, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote); /** - * This function is used to add H263 video capability to local endpoints - * capability list or to remote endpoints capability list or to a call's + * This function is used to add H263 video capability to local endpoints + * capability list or to remote endpoints capability list or to a call's * capability list. - * @param call Handle to a call. If this is not Null, then - * capability is added to call's remote enpoint - * capability list, else it is added to local H323 + * @param call Handle to a call. If this is not Null, then + * capability is added to call's remote enpoint + * capability list, else it is added to local H323 * endpoint list. - * @param sqcifMPI Minimum picture interval for encoding/decoding + * @param sqcifMPI Minimum picture interval for encoding/decoding * of SQCIF pictures. - * @param qcifMPI Minimum picture interval for encoding/decoding + * @param qcifMPI Minimum picture interval for encoding/decoding * of QCIF pictures. - * @param cifMPI Minimum picture interval for encoding/decoding + * @param cifMPI Minimum picture interval for encoding/decoding * of CIF pictures. - * @param cif4MPI Minimum picture interval for encoding/decoding + * @param cif4MPI Minimum picture interval for encoding/decoding * of CIF4 pictures. - * @param cif16MPI Minimum picture interval for encoding/decoding + * @param cif16MPI Minimum picture interval for encoding/decoding * of CIF16 pictures. * @param maxBitRate Maximum bit rate in units of 100 bits/s at - * which a transmitter can transmit video or a + * which a transmitter can transmit video or a * receiver can receive video. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -380,37 +380,37 @@ int ooCapabilityAddGSMCapability(struct OOH323CallData *call, int cap, * @param stopTransmitChannel Callback function to stop transmit channel. * @param remote TRUE, if adding call's remote capabilities. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooCapabilityAddH263VideoCapability(struct OOH323CallData *call, - unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, +EXTERN int ooCapabilityAddH263VideoCapability(struct OOH323CallData *call, + unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, unsigned cif16MPI, unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote); /** * This function is an helper function to ooCapabilityAddH263VideoCapability. - * @param call Handle to a call. If this is not Null, then - * capability is added to call's remote enpoint - * capability list, else it is added to local H323 + * @param call Handle to a call. If this is not Null, then + * capability is added to call's remote enpoint + * capability list, else it is added to local H323 * endpoint list. - * @param sqcifMPI Minimum picture interval for encoding/decoding + * @param sqcifMPI Minimum picture interval for encoding/decoding * of SQCIF pictures. - * @param qcifMPI Minimum picture interval for encoding/decoding + * @param qcifMPI Minimum picture interval for encoding/decoding * of QCIF pictures. - * @param cifMPI Minimum picture interval for encoding/decoding + * @param cifMPI Minimum picture interval for encoding/decoding * of CIF pictures. - * @param cif4MPI Minimum picture interval for encoding/decoding + * @param cif4MPI Minimum picture interval for encoding/decoding * of CIF4 pictures. - * @param cif16MPI Minimum picture interval for encoding/decoding + * @param cif16MPI Minimum picture interval for encoding/decoding * of CIF16 pictures. * @param maxBitRate Maximum bit rate in units of 100 bits/s at - * which a transmitter can transmit video or a + * which a transmitter can transmit video or a * receiver can receive video. * @param dir Direction of capability.OORX, OOTX, OORXANDTX * @param startReceiveChannel Callback function to start receive channel. @@ -419,24 +419,24 @@ EXTERN int ooCapabilityAddH263VideoCapability(struct OOH323CallData *call, * @param stopTransmitChannel Callback function to stop transmit channel. * @param remote TRUE, if adding call's remote capabilities. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ -int ooCapabilityAddH263VideoCapability_helper(struct OOH323CallData *call, - unsigned sqcifMPI, unsigned qcifMPI, - unsigned cifMPI, unsigned cif4MPI, - unsigned cif16MPI, unsigned maxBitRate, int dir, +int ooCapabilityAddH263VideoCapability_helper(struct OOH323CallData *call, + unsigned sqcifMPI, unsigned qcifMPI, + unsigned cifMPI, unsigned cif4MPI, + unsigned cif16MPI, unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, - cb_StopTransmitChannel stopTransmitChannel, + cb_StopTransmitChannel stopTransmitChannel, OOBOOL remote); /** - * This function is used to add a audio capability to calls remote + * This function is used to add a audio capability to calls remote * capability list. * @param call Handle to the call. * @param audioCap Handle to the remote endpoint's audio capability. - * @param dir Direction in which capability is supported by + * @param dir Direction in which capability is supported by * remote endpoint. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -458,12 +458,12 @@ int ooAddRemoteCapability(struct OOH323CallData *call, H245Capability *cap); /** * This function is used to update joint capabilities for call. It checks * whether remote capability can be supported by local capabilities for the - * call and if supported makes entry into the joint capability list for the + * call and if supported makes entry into the joint capability list for the * call. * @param call Handle to the call * @param cap Remote cap which will be tested for compatibility. * - * @return returns OO_OK, if updated else OO_FAILED; + * @return returns OO_OK, if updated else OO_FAILED; */ EXTERN int ooCapabilityUpdateJointCapabilities (struct OOH323CallData* call, H245Capability *cap); @@ -472,50 +472,50 @@ EXTERN int ooCapabilityUpdateJointCapabilities /** * This function is used to update joint video capabilities for call. It checks * whether remote capability can be supported by local capabilities for the - * call and if supported makes entry into the joint capability list for the + * call and if supported makes entry into the joint capability list for the * call. * @param call Handle to the call - * @param videoCap Remote video capability which will be tested for + * @param videoCap Remote video capability which will be tested for * compatibility. * @param dir Direction of the capability * - * @return returns OO_OK, if updated else OO_FAILED; + * @return returns OO_OK, if updated else OO_FAILED; */ EXTERN int ooCapabilityUpdateJointCapabilitiesVideo (struct OOH323CallData *call, H245VideoCapability *videoCap, int dir); /** - * This function is used to update joint video H263 capabilities for call. It - * checks whether remote capability can be supported by local capabilities for + * This function is used to update joint video H263 capabilities for call. It + * checks whether remote capability can be supported by local capabilities for * the call and if supported makes entry into the joint capability list for the * call. * @param call Handle to the call - * @param pH263Cap Remote H263 video capability which will be tested for + * @param pH263Cap Remote H263 video capability which will be tested for * compatibility. * @param dir Direction of the H263 capability * - * @return returns OO_OK, if updated else OO_FAILED; + * @return returns OO_OK, if updated else OO_FAILED; */ EXTERN int ooCapabilityUpdateJointCapabilitiesVideoH263 (struct OOH323CallData *call, H245H263VideoCapability *pH263Cap, int dir); /** - * This function is used to test whether the endpoint capability in the + * This function is used to test whether the endpoint capability in the * specified direction can be supported by the audio capability. * @param call Handle to the call. * @param epCap Endpoint capability. - * @param dataType Data type with which compatibility has to + * @param dataType Data type with which compatibility has to * be tested. * @param dir Direction indicating whether endpoint capability * will be used for transmission or reception. * - * @return TRUE, if compatible. FALSE, otherwise. + * @return TRUE, if compatible. FALSE, otherwise. */ -ASN1BOOL ooCapabilityCheckCompatibility(struct OOH323CallData *call, - ooH323EpCapability *epCap, +ASN1BOOL ooCapabilityCheckCompatibility(struct OOH323CallData *call, + ooH323EpCapability *epCap, H245DataType *dataType, int dir); @@ -523,27 +523,27 @@ ASN1BOOL ooCapabilityCheckCompatibility(struct OOH323CallData *call, * This function is used to create a audio capability structure using the * capability type. * @param epCap Capability. - * @param pctxt Handle to OOCTXT which will be used to allocate memory + * @param pctxt Handle to OOCTXT which will be used to allocate memory * for new audio capability. - * @param dir Direction in which the newly created capability will be + * @param dir Direction in which the newly created capability will be * used. * - * @return Newly created audio capability on success, NULL on + * @return Newly created audio capability on success, NULL on * failure. */ -struct H245AudioCapability* ooCapabilityCreateAudioCapability +struct H245AudioCapability* ooCapabilityCreateAudioCapability (ooH323EpCapability* epCap, OOCTXT *pctxt, int dir); /** * This function is used to create a video capability structure using the * capability type. * @param epCap Capability. - * @param pctxt Handle to OOCTXT which will be used to allocate memory + * @param pctxt Handle to OOCTXT which will be used to allocate memory * for new video capability. - * @param dir Direction in which the newly created capability will be + * @param dir Direction in which the newly created capability will be * used. * - * @return Newly created video capability on success, NULL on + * @return Newly created video capability on success, NULL on * failure. */ struct H245VideoCapability* ooCapabilityCreateVideoCapability @@ -554,7 +554,7 @@ struct H245VideoCapability* ooCapabilityCreateVideoCapability * This function is used to create a dtmf capability which can be added to * a TCS message. * @param cap Type of dtmf capability to be created. - * @param pctxt Pointer to OOCTXT structure to be used for memory + * @param pctxt Pointer to OOCTXT structure to be used for memory * allocation. * * @return Pointer to the created DTMF capability, NULL in case of @@ -570,23 +570,23 @@ void * ooCapabilityCreateDTMFCapability(int cap, int dtmfcodec, OOCTXT *pctxt); * for new audio capability. * @param dir Direction for the newly created capability. * - * @return Newly created audio capability on success, NULL on + * @return Newly created audio capability on success, NULL on * failure. */ struct H245AudioCapability* ooCapabilityCreateGSMFullRateCapability (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir); /** - * This function is used to create a simple(g711, g728, g723.1, g729) audio + * This function is used to create a simple(g711, g728, g723.1, g729) audio * capability structure. * * @param epCap Handle to the endpoint capability - * @param pctxt Handle to OOCTXT which will be used to allocate memory + * @param pctxt Handle to OOCTXT which will be used to allocate memory * for new audio capability. - * @param dir Direction in which the newly created capability will be + * @param dir Direction in which the newly created capability will be * used. * - * @return Newly created audio capability on success, NULL on + * @return Newly created audio capability on success, NULL on * failure. */ struct H245AudioCapability* ooCapabilityCreateSimpleCapability @@ -596,15 +596,15 @@ struct H245AudioCapability* ooCapabilityCreateNonStandardCapability /** - * This function is used to create a H263 video capability + * This function is used to create a H263 video capability * structure. * @param epCap Handle to the endpoint capability - * @param pctxt Handle to OOCTXT which will be used to allocate memory + * @param pctxt Handle to OOCTXT which will be used to allocate memory * for new video capability. - * @param dir Direction in which the newly created capability will be + * @param dir Direction in which the newly created capability will be * used. * - * @return Newly created video capability on success, NULL on + * @return Newly created video capability on success, NULL on * failure. */ struct H245VideoCapability* ooCapabilityCreateH263VideoCapability @@ -616,9 +616,9 @@ struct H245VideoCapability* ooCapabilityCreateH263VideoCapability * can be supported by the endpoint. * @param call Handle to the call. * @param audioCap Handle to the audio capability. - * @param dir Direction in which support is desired. + * @param dir Direction in which support is desired. * - * @return Handle to the copyof capability which supports audioCap, + * @return Handle to the copyof capability which supports audioCap, * Null if none found */ ooH323EpCapability* ooIsAudioDataTypeSupported @@ -629,9 +629,9 @@ ooH323EpCapability* ooIsAudioDataTypeSupported * can be supported by the endpoint. * @param call Handle to the call. * @param pVideoCap Handle to the video capability. - * @param dir Direction in which support is desired. + * @param dir Direction in which support is desired. * - * @return Handle to the copy of capability which supports video + * @return Handle to the copy of capability which supports video * capability, Null if none found */ ooH323EpCapability* ooIsVideoDataTypeSupported @@ -642,14 +642,14 @@ ooH323EpCapability* ooIsVideoDataTypeSupported * can be supported by the endpoint. * @param call Handle to the call. * @param pH263Cap Handle to the H263 video capability. - * @param dir Direction in which support is desired. + * @param dir Direction in which support is desired. * @param picFormat Picture type(cif, qcif etc.) * - * @return Handle to the copy of capability which supports H263 + * @return Handle to the copy of capability which supports H263 * capability, Null if none found */ ooH323EpCapability* ooIsVideoDataTypeH263Supported - (struct OOH323CallData *call, H245H263VideoCapability* pH263Cap, int dir, + (struct OOH323CallData *call, H245H263VideoCapability* pH263Cap, int dir, OOPictureFormat picFormat); /** @@ -657,9 +657,9 @@ ooH323EpCapability* ooIsVideoDataTypeH263Supported * can be supported by the endpoint. * @param call Handle to the call. * @param data Handle to the capability type. - * @param dir Direction in which support is desired. + * @param dir Direction in which support is desired. * - * @return Handle to the copy of capability which supports specified + * @return Handle to the copy of capability which supports specified * capability type, Null if none found */ ooH323EpCapability* ooIsDataTypeSupported @@ -705,7 +705,7 @@ EXTERN int ooRemoveCapFromCapPrefs(struct OOH323CallData *call, int cap); EXTERN int ooAppendCapToCapPrefs(struct OOH323CallData *call, int cap); /** - * This function is used to change preference order of a particular capability + * This function is used to change preference order of a particular capability * in the preference list. * @param call Handle to call, if call's preference list has to be modified * else NULL, to modify endpoint's preference list. @@ -786,13 +786,11 @@ int ooCapabilityAddT38Capability /**/ -/** - * @} +/** + * @} */ #ifdef __cplusplus } #endif #endif - - diff --git a/addons/ooh323c/src/ooCmdChannel.c b/addons/ooh323c/src/ooCmdChannel.c index 353818d1dd..0cdb9dddfe 100644 --- a/addons/ooh323c/src/ooCmdChannel.c +++ b/addons/ooh323c/src/ooCmdChannel.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -109,7 +109,7 @@ int ooWriteStackCommand(OOStackCommand *cmd) return OO_FAILED; } ast_mutex_unlock(&gCmdChanLock); - + return OO_OK; } int ooWriteCallStackCommand(OOH323CallData* call, OOStackCommand *cmd) @@ -144,14 +144,14 @@ int ooWriteCallStackCommand(OOH323CallData* call, OOStackCommand *cmd) return OO_FAILED; } ast_mutex_unlock(call->CmdChanLock); - + return OO_OK; } int ooReadAndProcessStackCommand() { - OOH323CallData *pCall = NULL; + OOH323CallData *pCall = NULL; unsigned char buffer[MAXMSGLEN]; int i, recvLen = 0; OOStackCommand cmd; @@ -174,10 +174,10 @@ int ooReadAndProcessStackCommand() else { switch(cmd.type) { - case OO_CMD_MAKECALL: - OOTRACEINFO2("Processing MakeCall command %s\n", + case OO_CMD_MAKECALL: + OOTRACEINFO2("Processing MakeCall command %s\n", (char*)cmd.param2); - + ooH323NewCall ((char*)cmd.param2); break; @@ -210,7 +210,7 @@ int ooReadAndProcessStackCommand() } } break; - + case OO_CMD_ANSCALL: pCall = ooFindCallByToken((char*)cmd.param1); if(!pCall) { @@ -231,13 +231,13 @@ int ooReadAndProcessStackCommand() ooH323ForwardCall((char*)cmd.param1, (char*)cmd.param2); break; - case OO_CMD_HANGCALL: - OOTRACEINFO3("Processing Hang call command %s with q931 cause %d\n", + case OO_CMD_HANGCALL: + OOTRACEINFO3("Processing Hang call command %s with q931 cause %d\n", (char*)cmd.param1, *(int *) cmd.param3); - ooH323HangCall((char*)cmd.param1, + ooH323HangCall((char*)cmd.param1, *(OOCallClearReason*)cmd.param2, *(int *) cmd.param3); break; - + case OO_CMD_SENDDIGIT: pCall = ooFindCallByToken((char*)cmd.param1); if(!pCall) { @@ -259,7 +259,7 @@ int ooReadAndProcessStackCommand() break; - case OO_CMD_STOPMONITOR: + case OO_CMD_STOPMONITOR: OOTRACEINFO1("Processing StopMonitor command\n"); ooStopMonitorCalls(); break; @@ -303,7 +303,7 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) if (cmd.plen1 > 0) { cmd.param1 = ast_malloc(cmd.plen1 + 1); - if (!cmd.param1) + if (!cmd.param1) return OO_FAILED; memset(cmd.param1, 0, cmd.plen1 + 1); memcpy(cmd.param1, bPoint, cmd.plen1); @@ -312,7 +312,7 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) if (cmd.plen2 > 0) { cmd.param2 = ast_malloc(cmd.plen2 + 1); - if (!cmd.param2) + if (!cmd.param2) return OO_FAILED; memset(cmd.param2, 0, cmd.plen2 + 1); memcpy(cmd.param2, bPoint, cmd.plen2); @@ -321,7 +321,7 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) if (cmd.plen3 > 0) { cmd.param3 = ast_malloc(cmd.plen3 + 1); - if (!cmd.param3) + if (!cmd.param3) return OO_FAILED; memset(cmd.param3, 0, cmd.plen3 + 1); memcpy(cmd.param3, bPoint, cmd.plen3); @@ -333,11 +333,11 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) else { switch(cmd.type) { - case OO_CMD_MAKECALL: - OOTRACEINFO2("Processing MakeCall command %s\n", + case OO_CMD_MAKECALL: + OOTRACEINFO2("Processing MakeCall command %s\n", (char*)cmd.param2); - - ooH323MakeCall ((char*)cmd.param1, (char*)cmd.param2, + + ooH323MakeCall ((char*)cmd.param1, (char*)cmd.param2, (ooCallOptions*)cmd.param3); break; @@ -354,7 +354,7 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) } } break; - + case OO_CMD_ANSCALL: ooSendConnect(call); break; @@ -365,13 +365,13 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) ooH323ForwardCall((char*)cmd.param1, (char*)cmd.param2); break; - case OO_CMD_HANGCALL: - OOTRACEINFO2("Processing Hang call command %s with q931 cause %d\n", + case OO_CMD_HANGCALL: + OOTRACEINFO2("Processing Hang call command %s with q931 cause %d\n", (char*)cmd.param1); - ooH323HangCall((char*)cmd.param1, + ooH323HangCall((char*)cmd.param1, *(OOCallClearReason*)cmd.param2, *(int *) cmd.param3); break; - + case OO_CMD_SENDDIGIT: if(call->jointDtmfMode & OO_CAP_DTMF_H245_alphanumeric) { ooSendH245UserInputIndication_alphanumeric( @@ -427,4 +427,3 @@ int ooReadAndProcessCallStackCommand(OOH323CallData* call) return OO_OK; } - diff --git a/addons/ooh323c/src/ooCmdChannel.h b/addons/ooh323c/src/ooCmdChannel.h index b0767acc7c..6627c9b4c6 100644 --- a/addons/ooh323c/src/ooCmdChannel.h +++ b/addons/ooh323c/src/ooCmdChannel.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooCmdChannel.h + * @file ooCmdChannel.h * This file contains stack commands which an user application can use to make - * call, hang call etc. + * call, hang call etc. */ #ifndef OO_CMDCHANNEL_H @@ -40,13 +40,13 @@ extern "C" { #define OO_DEFAULT_CMDLISTENER_PORT 7575 /** - * @addtogroup channels + * @addtogroup channels * @{ */ /** - * This function is used to setup a command connection with the main stack - * thread. The application commands are sent over this connection to stack + * This function is used to setup a command connection with the main stack + * thread. The application commands are sent over this connection to stack * thread. * * @return OO_OK, on success; OO_FAILED, on failure @@ -55,7 +55,7 @@ EXTERN int ooCreateCmdConnection(void); EXTERN int ooCreateCallCmdConnection(OOH323CallData*); /** - * This function is used to close a command channel setup with the stack + * This function is used to close a command channel setup with the stack * thread. * * @return OO_OK, on success; OO_FAILED, on failure @@ -65,7 +65,7 @@ EXTERN int ooCloseCallCmdConnection(OOH323CallData*); /** - * This function is used by stack api to write stack commands to command + * This function is used by stack api to write stack commands to command * channel. * * @return OO_OK, on success; OO_FAILED, on failure @@ -74,7 +74,7 @@ EXTERN int ooWriteStackCommand(OOStackCommand *cmd); EXTERN int ooWriteCallStackCommand(OOH323CallData* call, OOStackCommand *cmd); /** - * This function is used by stack thread to read and process stack commands + * This function is used by stack thread to read and process stack commands * received over command channel. * * @return OO_OK, on success; OO_FAILED, on failure @@ -83,8 +83,8 @@ EXTERN int ooReadAndProcessStackCommand(void); EXTERN int ooReadAndProcessCallStackCommand(OOH323CallData*); -/** - * @} +/** + * @} */ #ifdef __cplusplus diff --git a/addons/ooh323c/src/ooCommon.h b/addons/ooh323c/src/ooCommon.h index 91df7428f8..e0d0b43382 100644 --- a/addons/ooh323c/src/ooCommon.h +++ b/addons/ooh323c/src/ooCommon.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the LICENSE.txt file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the LICENSE.txt file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file ooCommon.h +/** + * @file ooCommon.h * Common runtime constant and type definitions. */ #ifndef _OOCOMMON_H_ @@ -43,7 +43,7 @@ #endif #include -/** +/** * @ingroup cruntime C Runtime Common Constant and Type Definitions. * @{ */ @@ -119,7 +119,7 @@ typedef struct _OOMsgBuf { #endif /* _DLL */ #endif /* EXTERN */ -/** - * @} +/** + * @} */ #endif /* _OOCOMMON_H_ */ diff --git a/addons/ooh323c/src/ooDateTime.c b/addons/ooh323c/src/ooDateTime.c index 0d7ee68112..7795b291ea 100644 --- a/addons/ooh323c/src/ooDateTime.c +++ b/addons/ooh323c/src/ooDateTime.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the LICENSE.txt file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the LICENSE.txt file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -69,7 +69,7 @@ static uint64 calcEpocOffset() { // Gets high resolution by spinning up to 15ms. Don't call this often!!! static uint64 getRawCurMsSpin() { - FILETIME tm; + FILETIME tm; uint64 t_now; static uint64 epocOffset = 0; @@ -121,7 +121,7 @@ int gettimeofday(struct timeval* tv, void* null) { baselineMs = getRawCurMsSpin(); tickBaseline = timeGetTime(); } - + uint64 now_ms = (baselineMs + (curTicks - tickBaseline)); *tv = oo_ms_to_tv(now_ms); return 0; @@ -170,7 +170,6 @@ int ooGetTimeOfDay (struct timeval *tv, struct timezone *tz) long ooGetTimeDiff(struct timeval *tv1, struct timeval *tv2) { - return ( ((tv2->tv_sec-tv1->tv_sec)*1000) + + return ( ((tv2->tv_sec-tv1->tv_sec)*1000) + ((tv2->tv_usec-tv1->tv_usec)/1000) ); } - diff --git a/addons/ooh323c/src/ooDateTime.h b/addons/ooh323c/src/ooDateTime.h index b49c87230b..9067d18c3c 100644 --- a/addons/ooh323c/src/ooDateTime.h +++ b/addons/ooh323c/src/ooDateTime.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the LICENSE.txt file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the LICENSE.txt file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file ooDateTime.h +/** + * @file ooDateTime.h * Time functions that reconcile differences between Windows and UNIX. */ #ifndef _OOTIME_H_ @@ -28,10 +28,10 @@ extern "C" { #endif /** - * This function provides an abstraction for the UNIX 'gettimeofday' + * This function provides an abstraction for the UNIX 'gettimeofday' * function which is not available on Windows. * - * @param tv Pointer to time value structure to receive + * @param tv Pointer to time value structure to receive * current time value. * @param tz Point to time zone information. * @return Completion status of operation: 0 = success, diff --git a/addons/ooh323c/src/ooGkClient.c b/addons/ooh323c/src/ooGkClient.c index 1262f29143..a307f4eefd 100644 --- a/addons/ooh323c/src/ooGkClient.c +++ b/addons/ooh323c/src/ooGkClient.c @@ -2,22 +2,22 @@ * Copyright (C) 2005 by Page Iberica, S.A. * Copyright (C) 2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooGkClient.c - * This file contains functions to support RAS protocol. + * @file ooGkClient.c + * This file contains functions to support RAS protocol. * */ #include "asterisk.h" @@ -60,7 +60,7 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode, OOTRACEERR1("Error: Failed to allocate memory to Gatekeeper Client.\n"); return OO_FAILED; } - + memset(pGkClient, 0, sizeof(ooGkClient)); ast_mutex_init(&pGkClient->Lock); gH323ep.gkClient = pGkClient; @@ -98,14 +98,14 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode, return OO_FAILED; } } -#endif +#endif if(OO_OK != ooGkClientSetGkMode(pGkClient, eGkMode, szGkAddr, iGkPort)) { OOTRACEERR1("Error:Failed to set Gk mode\n"); memReset(&gH323ep.ctxt); return OO_FAILED; } - + /* Create default parameter set */ pGkClient->grqTimeout = DEFAULT_GRQ_TIMEOUT; pGkClient->rrqTimeout = DEFAULT_RRQ_TIMEOUT; @@ -123,11 +123,11 @@ int ooGkClientInit(enum RasGatekeeperMode eGkMode, int ooGkClientSetCallbacks (ooGkClient *pGkClient, OOGKCLIENTCALLBACKS callbacks) { - pGkClient->callbacks.onReceivedRegistrationConfirm = + pGkClient->callbacks.onReceivedRegistrationConfirm = callbacks.onReceivedRegistrationConfirm; - pGkClient->callbacks.onReceivedUnregistrationConfirm = + pGkClient->callbacks.onReceivedUnregistrationConfirm = callbacks.onReceivedUnregistrationConfirm; - pGkClient->callbacks.onReceivedUnregistrationRequest = + pGkClient->callbacks.onReceivedUnregistrationRequest = callbacks.onReceivedUnregistrationRequest; return OO_OK; } @@ -143,7 +143,7 @@ int ooGkClientReInit(ooGkClient *pGkClient) pGkClient->rrqRetries = 0; pGkClient->grqRetries = 0; pGkClient->requestSeqNum = 0; - + dListFreeAll(&pGkClient->ctxt, &pGkClient->callsPendingList); dListFreeAll(&pGkClient->ctxt, &pGkClient->callsAdmittedList); dListFreeAll(&pGkClient->ctxt, &pGkClient->timerList); @@ -157,7 +157,7 @@ void ooGkClientPrintConfig(ooGkClient *pGkClient) if(pGkClient->gkMode == RasUseSpecificGatekeeper) { OOTRACEINFO1("\tGatekeeper mode - UseSpecificGatekeeper\n"); - OOTRACEINFO3("\tGatekeeper To Use - %s:%d\n", pGkClient->gkRasIP, + OOTRACEINFO3("\tGatekeeper To Use - %s:%d\n", pGkClient->gkRasIP, pGkClient->gkRasPort); } else if(pGkClient->gkMode == RasDiscoverGatekeeper) { @@ -203,7 +203,7 @@ int ooGkClientStart(ooGkClient *pGkClient) OOTRACEERR1("Error: GkClient Channel Creation failed\n"); return OO_FAILED; } - + ast_mutex_lock(&pGkClient->Lock); pGkClient->discoveryComplete = FALSE; iRet = ooGkClientSendGRQ(pGkClient); @@ -217,9 +217,9 @@ int ooGkClientStart(ooGkClient *pGkClient) ast_mutex_unlock(&pGkClient->Lock); return OO_OK; } - -int ooGkClientSetGkMode(ooGkClient *pGkClient, enum RasGatekeeperMode eGkMode, + +int ooGkClientSetGkMode(ooGkClient *pGkClient, enum RasGatekeeperMode eGkMode, char *szGkAddr, int iGkPort ) { pGkClient->gkMode = eGkMode; @@ -229,7 +229,7 @@ int ooGkClientSetGkMode(ooGkClient *pGkClient, enum RasGatekeeperMode eGkMode, if(szGkAddr) { if(strlen(szGkAddr)>MAX_IP_LEN) - { + { OOTRACEERR2("Error:Invalid IP address specified - %s\n", szGkAddr); return OO_FAILED; } @@ -240,7 +240,7 @@ int ooGkClientSetGkMode(ooGkClient *pGkClient, enum RasGatekeeperMode eGkMode, else pGkClient->gkRasPort = DEFAULT_GKPORT; - OOTRACEINFO3("Gatekeeper IP:port set to - %s:%d\n", + OOTRACEINFO3("Gatekeeper IP:port set to - %s:%d\n", szGkAddr, pGkClient->gkRasPort); } else if(eGkMode == RasDiscoverGatekeeper) { @@ -253,7 +253,7 @@ int ooGkClientSetGkMode(ooGkClient *pGkClient, enum RasGatekeeperMode eGkMode, return OO_OK; } - + /** * Create the RAS channel (socket). * @@ -273,8 +273,8 @@ int ooGkClientCreateChannel(ooGkClient *pGkClient) if(pGkClient->localRASPort) { inet_pton(AF_INET, pGkClient->localRASIP, &ipaddrs); - if( (ret=ooSocketBind( pGkClient->rasSocket, ipaddrs, - pGkClient->localRASPort))!=ASN_OK ) + if( (ret=ooSocketBind( pGkClient->rasSocket, ipaddrs, + pGkClient->localRASPort))!=ASN_OK ) { OOTRACEERR1("ERROR:Failed to create RAS channel\n"); pGkClient->state = GkClientFailed; @@ -297,7 +297,7 @@ int ooGkClientCreateChannel(ooGkClient *pGkClient) { OOTRACEDBGA1("Determining ip address for RAS channel " "multihomed mode. \n"); - ret = ooSocketGetIpAndPort(pGkClient->rasSocket, pGkClient->localRASIP, + ret = ooSocketGetIpAndPort(pGkClient->rasSocket, pGkClient->localRASIP, 20, &pGkClient->localRASPort, NULL); if(ret != ASN_OK) { @@ -307,7 +307,7 @@ int ooGkClientCreateChannel(ooGkClient *pGkClient) return OO_FAILED; } OOTRACEDBGA3("Using local ip %s and port %d for RAS channel" - "(multihomedMode).\n", pGkClient->localRASIP, + "(multihomedMode).\n", pGkClient->localRASIP, pGkClient->localRASPort); } /* End of Test code */ @@ -349,20 +349,20 @@ void ooGkClientFillVendor if(gH323ep.productID) { pVendor->m.productIdPresent = TRUE; - pVendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), + pVendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), sizeof(pVendor->productId.data)); - memcpy(pVendor->productId.data, gH323ep.productID, + memcpy(pVendor->productId.data, gH323ep.productID, pVendor->productId.numocts); } if(gH323ep.versionID) { pVendor->m.versionIdPresent = 1; - pVendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), + pVendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), sizeof(pVendor->versionId.data)); - memcpy(pVendor->versionId.data, gH323ep.versionID, - pVendor->versionId.numocts); + memcpy(pVendor->versionId.data, gH323ep.versionID, + pVendor->versionId.numocts); } -} +} int ooGkClientReceive(ooGkClient *pGkClient) @@ -374,7 +374,7 @@ int ooGkClientReceive(ooGkClient *pGkClient) OOCTXT *pctxt=NULL; H225RasMessage *pRasMsg=NULL; int iRet=OO_OK; - + ast_mutex_lock(&pGkClient->Lock); pctxt = &pGkClient->msgCtxt; @@ -387,7 +387,7 @@ int ooGkClientReceive(ooGkClient *pGkClient) return OO_FAILED; } OOTRACEDBGA1("GkClient Received RAS Message\n"); - + /* Verify the gk */ if(pGkClient->discoveryComplete) { @@ -408,7 +408,7 @@ int ooGkClientReceive(ooGkClient *pGkClient) pGkClient->state = GkClientFailed; ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; - } + } pRasMsg = (H225RasMessage*)memAlloc(pctxt, sizeof(H225RasMessage)); if(!pRasMsg) { @@ -460,40 +460,40 @@ int ooGkClientReceive(ooGkClient *pGkClient) int ooGkClientHandleRASMessage(ooGkClient *pGkClient, H225RasMessage *pRasMsg) { - int iRet = OO_OK; + int iRet = OO_OK; switch( pRasMsg->t) { case T_H225RasMessage_gatekeeperConfirm: OOTRACEINFO1("Gatekeeper Confirmed (GCF) message received.\n"); - iRet = ooGkClientHandleGatekeeperConfirm(pGkClient, + iRet = ooGkClientHandleGatekeeperConfirm(pGkClient, pRasMsg->u.gatekeeperConfirm); break; - case T_H225RasMessage_gatekeeperReject: + case T_H225RasMessage_gatekeeperReject: OOTRACEINFO1("Gatekeeper Reject (GRJ) message received\n"); - iRet = ooGkClientHandleGatekeeperReject(pGkClient, + iRet = ooGkClientHandleGatekeeperReject(pGkClient, pRasMsg->u.gatekeeperReject); break; - case T_H225RasMessage_registrationConfirm: + case T_H225RasMessage_registrationConfirm: OOTRACEINFO1("Registration Confirm (RCF) message received\n"); - iRet = ooGkClientHandleRegistrationConfirm(pGkClient, + iRet = ooGkClientHandleRegistrationConfirm(pGkClient, pRasMsg->u.registrationConfirm ); break; case T_H225RasMessage_registrationReject: OOTRACEINFO1("Registration Reject (RRJ) message received.\n"); - iRet = ooGkClientHandleRegistrationReject(pGkClient, + iRet = ooGkClientHandleRegistrationReject(pGkClient, pRasMsg->u.registrationReject); break; - case T_H225RasMessage_infoRequest: + case T_H225RasMessage_infoRequest: //ooRasSendIRR( psRasMsg->sMessage.u.infoRequest->requestSeqNum ); break; case T_H225RasMessage_admissionConfirm: OOTRACEINFO1("Admission Confirm (ACF) message received\n"); - iRet = ooGkClientHandleAdmissionConfirm(pGkClient, + iRet = ooGkClientHandleAdmissionConfirm(pGkClient, pRasMsg->u.admissionConfirm); break; case T_H225RasMessage_unregistrationRequest: OOTRACEINFO1("UnRegistration Request (URQ) message received.\n"); - iRet = ooGkClientHandleUnregistrationRequest(pGkClient, + iRet = ooGkClientHandleUnregistrationRequest(pGkClient, pRasMsg->u.unregistrationRequest); break; case T_H225RasMessage_unregistrationConfirm: @@ -504,11 +504,11 @@ int ooGkClientHandleRASMessage(ooGkClient *pGkClient, H225RasMessage *pRasMsg) break; case T_H225RasMessage_admissionReject: OOTRACEINFO1("Admission Reject (ARJ) message received.\n"); - iRet = ooGkClientHandleAdmissionReject(pGkClient, + iRet = ooGkClientHandleAdmissionReject(pGkClient, pRasMsg->u.admissionReject); break; case T_H225RasMessage_disengageConfirm: - iRet = ooGkClientHandleDisengageConfirm(pGkClient, + iRet = ooGkClientHandleDisengageConfirm(pGkClient, pRasMsg->u.disengageConfirm); break; case T_H225RasMessage_disengageReject: @@ -542,7 +542,7 @@ void ooGkClientPrintMessage { OOCTXT ctxt; H225RasMessage rasMsg; - int ret; + int ret; initContext(&ctxt); setPERBuffer(&ctxt, msg, len, TRUE); @@ -582,26 +582,26 @@ int ooGkClientSendMsg(ooGkClient *pGkClient, H225RasMessage *pRasMsg) msgPtr = encodeGetMsgPtr( pctxt, &iLen ); /* If gatekeeper specified or have been discovered */ - if(pGkClient->gkMode == RasUseSpecificGatekeeper || + if(pGkClient->gkMode == RasUseSpecificGatekeeper || pGkClient->discoveryComplete) { - if(ASN_OK != ooSocketSendTo( pGkClient->rasSocket, msgPtr, iLen, + if(ASN_OK != ooSocketSendTo( pGkClient->rasSocket, msgPtr, iLen, pGkClient->gkRasIP, pGkClient->gkRasPort)) { OOTRACEERR1("Error sending RAS message\n"); return OO_FAILED; } } - else if(pGkClient->gkMode == RasDiscoverGatekeeper && - !pGkClient->discoveryComplete) { - if(ASN_OK != ooSocketSendTo(pGkClient->rasSocket, msgPtr, iLen, + else if(pGkClient->gkMode == RasDiscoverGatekeeper && + !pGkClient->discoveryComplete) { + if(ASN_OK != ooSocketSendTo(pGkClient->rasSocket, msgPtr, iLen, MULTICAST_GKADDRESS, MULTICAST_GKPORT)) { OOTRACEERR1("Error sending multicast RAS message\n" ); return OO_FAILED; } } - else {/* should never go here */ + else {/* should never go here */ OOTRACEERR1("Error: GkClient in invalid state.\n"); return OO_FAILED; } @@ -634,7 +634,7 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient) return OO_FAILED; } - pGkReq = (H225GatekeeperRequest*)memAlloc(pctxt, + pGkReq = (H225GatekeeperRequest*)memAlloc(pctxt, sizeof(H225GatekeeperRequest)); if(!pGkReq) { @@ -656,7 +656,7 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient) pGkReq->protocolIdentifier = gProtocolID; pGkReq->m.nonStandardDataPresent=0; pGkReq->rasAddress.t=T_H225TransportAddress_ipAddress; /* IPv4 address */ - pRasAddress = (H225TransportAddress_ipAddress*)memAlloc(pctxt, + pRasAddress = (H225TransportAddress_ipAddress*)memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); if(!pRasAddress) { @@ -668,7 +668,7 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient) return OO_FAILED; } - + inet_pton(AF_INET, pGkClient->localRASIP, pRasAddress->ip.data); pRasAddress->ip.numocts = 4; @@ -688,7 +688,7 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient) pGkReq->m.endpointAliasPresent=TRUE; - if(OO_OK != ooPopulateAliasList(&pGkClient->msgCtxt, gH323ep.aliases, + if(OO_OK != ooPopulateAliasList(&pGkClient->msgCtxt, gH323ep.aliases, &pGkReq->endpointAlias, 0)) { OOTRACEERR1("Error Failed to fill alias information for GRQ message\n"); @@ -718,9 +718,9 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient) } cbData->timerType = OO_GRQ_TIMER; cbData->pGkClient = pGkClient; - if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, - &ooGkClientGRQTimerExpired, pGkClient->grqTimeout, - cbData, FALSE)) + if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, + &ooGkClientGRQTimerExpired, pGkClient->grqTimeout, + cbData, FALSE)) { OOTRACEERR1("Error:Unable to create GRQ timer.\n "); memFreePtr(&pGkClient->ctxt, cbData); @@ -754,7 +754,7 @@ int ooGkClientHandleGatekeeperReject break; } } - + pGkClient->state = GkClientGkErr; switch(pGatekeeperReject->rejectReason.t) { @@ -809,7 +809,7 @@ int ooGkClientHandleGatekeeperConfirm return OO_OK; } - if(pGatekeeperConfirm->m.gatekeeperIdentifierPresent) + if(pGatekeeperConfirm->m.gatekeeperIdentifierPresent) { pGkClient->gkId.nchars = pGatekeeperConfirm->gatekeeperIdentifier.nchars; if (pGkClient->gkId.data) { @@ -824,7 +824,7 @@ int ooGkClientHandleGatekeeperConfirm return OO_FAILED; } - memcpy(pGkClient->gkId.data, + memcpy(pGkClient->gkId.data, pGatekeeperConfirm->gatekeeperIdentifier.data, sizeof(ASN116BITCHAR)* pGkClient->gkId.nchars); } @@ -833,7 +833,7 @@ int ooGkClientHandleGatekeeperConfirm "message\n"); pGkClient->gkId.nchars = 0; } - + /* Extract Gatekeeper's RAS address */ if(pGatekeeperConfirm->rasAddress.t != T_H225TransportAddress_ipAddress) { @@ -845,10 +845,10 @@ int ooGkClientHandleGatekeeperConfirm pRasAddress = pGatekeeperConfirm->rasAddress.u.ipAddress; sprintf(pGkClient->gkRasIP, "%d.%d.%d.%d", pRasAddress->ip.data[0], pRasAddress->ip.data[1], - pRasAddress->ip.data[2], + pRasAddress->ip.data[2], pRasAddress->ip.data[3]); pGkClient->gkRasPort = pRasAddress->port; - + pGkClient->discoveryComplete = TRUE; pGkClient->state = GkClientDiscovered; OOTRACEINFO1("Gatekeeper Confirmed\n"); @@ -905,7 +905,7 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) return OO_FAILED; } - pRegReq = (H225RegistrationRequest*)memAlloc(pctxt, + pRegReq = (H225RegistrationRequest*)memAlloc(pctxt, sizeof(H225RegistrationRequest)); if(!pRegReq) { @@ -918,11 +918,11 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) memset(pRegReq, 0, sizeof(H225RegistrationRequest)); pRasMsg->t = T_H225RasMessage_registrationRequest; pRasMsg->u.registrationRequest = pRegReq; - + pRegReq->protocolIdentifier = gProtocolID; pRegReq->m.nonStandardDataPresent=0; /* Populate CallSignal Address List*/ - pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, + pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, sizeof(H225TransportAddress)); pIpAddress = (H225TransportAddress_ipAddress*) memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); @@ -940,15 +940,15 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) inet_pton(AF_INET, pGkClient->localRASIP, pIpAddress->ip.data); pIpAddress->ip.numocts = 4; pIpAddress->port = gH323ep.listenPort; - + dListInit(&pRegReq->callSignalAddress); - dListAppend(pctxt, &pRegReq->callSignalAddress, + dListAppend(pctxt, &pRegReq->callSignalAddress, (void*)pTransportAddress); /* Populate RAS Address List*/ pTransportAddress = NULL; pIpAddress = NULL; - pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, + pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, sizeof(H225TransportAddress)); pIpAddress = (H225TransportAddress_ipAddress*) memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); @@ -964,16 +964,16 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) pTransportAddress->t = T_H225TransportAddress_ipAddress; pTransportAddress->u.ipAddress = pIpAddress; - + inet_pton(AF_INET, pGkClient->localRASIP, pIpAddress->ip.data); pIpAddress->ip.numocts = 4; pIpAddress->port = pGkClient->localRASPort; - + dListInit(&pRegReq->rasAddress); - dListAppend(pctxt, &pRegReq->rasAddress, + dListAppend(pctxt, &pRegReq->rasAddress, (void*)pTransportAddress); - + /* Pose as gateway or terminal as per config */ if(gH323ep.isGateway) pRegReq->terminalType.m.gatewayPresent = TRUE; @@ -1005,23 +1005,23 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) pProtocol->t = T_H225SupportedProtocols_voice; pProtocol->u.voice = pVoiceCaps; - + dListInit(&pRegReq->terminalType.gateway.protocol); - dListAppend(pctxt, &pRegReq->terminalType.gateway.protocol, + dListAppend(pctxt, &pRegReq->terminalType.gateway.protocol, (void*)pProtocol); } pRegReq->m.terminalAliasPresent=TRUE; - if(OO_OK != ooPopulateAliasList(pctxt, gH323ep.aliases, + if(OO_OK != ooPopulateAliasList(pctxt, gH323ep.aliases, &pRegReq->terminalAlias, 0)) { OOTRACEERR1("Error filling alias for RRQ\n"); - memReset(pctxt); + memReset(pctxt); pGkClient->state = GkClientFailed; ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - + if (pGkClient->gkId.nchars) { pRegReq->m.gatekeeperIdentifierPresent=TRUE; pRegReq->gatekeeperIdentifier.nchars = pGkClient->gkId.nchars; @@ -1036,19 +1036,19 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy(pRegReq->gatekeeperIdentifier.data, pGkClient->gkId.data, + memcpy(pRegReq->gatekeeperIdentifier.data, pGkClient->gkId.data, pGkClient->gkId.nchars*sizeof(ASN116BITCHAR)); } - + ooGkClientFillVendor(pGkClient, &pRegReq->endpointVendor); - + pRegReq->m.willSupplyUUIEsPresent=TRUE; pRegReq->willSupplyUUIEs=FALSE; pRegReq->requestSeqNum = pGkClient->requestSeqNum++; if(!pRegReq->requestSeqNum) pRegReq->requestSeqNum = pGkClient->requestSeqNum++; - + pRegReq->discoveryComplete= pGkClient->discoveryComplete; pRegReq->m.keepAlivePresent=TRUE; pRegReq->keepAlive= keepAlive; @@ -1067,7 +1067,7 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) /* KeepAlive, re-registration message... allocate storage for endpoint-identifier, and populate it from what the GK told us from the previous RCF. Only allocate on the first pass thru here */ - pRegReq->endpointIdentifier.data = + pRegReq->endpointIdentifier.data = (ASN116BITCHAR*)memAlloc(pctxt, pGkClient->endpointId.nchars*sizeof(ASN116BITCHAR)); if (pRegReq->endpointIdentifier.data) { pRegReq->endpointIdentifier.nchars = pGkClient->endpointId.nchars; @@ -1109,9 +1109,9 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) } cbData->timerType = OO_RRQ_TIMER; cbData->pGkClient = pGkClient; - if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, - &ooGkClientRRQTimerExpired, pGkClient->rrqTimeout, - cbData, FALSE)) + if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, + &ooGkClientRRQTimerExpired, pGkClient->rrqTimeout, + cbData, FALSE)) { OOTRACEERR1("Error:Unable to create GRQ timer.\n "); memFreePtr(&pGkClient->ctxt, cbData); @@ -1119,7 +1119,7 @@ int ooGkClientSendRRQ(ooGkClient *pGkClient, ASN1BOOL keepAlive) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - + ast_mutex_unlock(&pGkClient->Lock); return OO_OK; } @@ -1143,7 +1143,7 @@ int ooGkClientHandleRegistrationConfirm /* Extract Endpoint Id */ if (pGkClient->endpointId.data) memFreePtr(&pGkClient->ctxt, pGkClient->endpointId.data); - pGkClient->endpointId.nchars = + pGkClient->endpointId.nchars = pRegistrationConfirm->endpointIdentifier.nchars; pGkClient->endpointId.data = (ASN116BITCHAR*)memAlloc(&pGkClient->ctxt, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); @@ -1153,13 +1153,13 @@ int ooGkClientHandleRegistrationConfirm pGkClient->state = GkClientFailed; return OO_FAILED; } - - memcpy(pGkClient->endpointId.data, + + memcpy(pGkClient->endpointId.data, pRegistrationConfirm->endpointIdentifier.data, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); /* Extract GK Identifier */ - + if(pRegistrationConfirm->m.gatekeeperIdentifierPresent && pGkClient->gkId.nchars == 0) { pGkClient->gkId.nchars = pRegistrationConfirm->gatekeeperIdentifier.nchars; @@ -1172,7 +1172,7 @@ int ooGkClientHandleRegistrationConfirm return OO_FAILED; } - memcpy(pGkClient->gkId.data, + memcpy(pGkClient->gkId.data, pRegistrationConfirm->gatekeeperIdentifier.data, sizeof(ASN116BITCHAR)* pGkClient->gkId.nchars); } @@ -1185,23 +1185,23 @@ int ooGkClientHandleRegistrationConfirm { OOTRACEERR1("Error:Invalid Registration confirmed message\n"); OOTRACEINFO1("Ignoring RCF, will retransmit RRQ after timeout\n"); - return OO_FAILED; + return OO_FAILED; } pCallSigAddr = (H225TransportAddress*)pNode->data; if(pCallSigAddr->t != T_H225TransportAddress_ipAddress) continue; - sprintf(pGkClient->gkCallSignallingIP, "%d.%d.%d.%d", + sprintf(pGkClient->gkCallSignallingIP, "%d.%d.%d.%d", pCallSigAddr->u.ipAddress->ip.data[0], pCallSigAddr->u.ipAddress->ip.data[1], pCallSigAddr->u.ipAddress->ip.data[2], pCallSigAddr->u.ipAddress->ip.data[3]); pGkClient->gkCallSignallingPort = pCallSigAddr->u.ipAddress->port; } - + /* Update list of registered aliases*/ if(pRegistrationConfirm->m.terminalAliasPresent) { - ooGkClientUpdateRegisteredAliases(pGkClient, + ooGkClientUpdateRegisteredAliases(pGkClient, &pRegistrationConfirm->terminalAlias, TRUE); } else{/* Everything registered*/ @@ -1234,16 +1234,16 @@ int ooGkClientHandleRegistrationConfirm } cbData->timerType = OO_REG_TIMER; cbData->pGkClient = pGkClient; - if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, - &ooGkClientREGTimerExpired, regTTL, + if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, + &ooGkClientREGTimerExpired, regTTL, cbData, FALSE)) { OOTRACEERR1("Error:Unable to create REG timer.\n "); memFreePtr(&pGkClient->ctxt, cbData); pGkClient->state = GkClientFailed; return OO_FAILED; - } - + } + } else{ pGkClient->regTimeout = 0; @@ -1252,7 +1252,7 @@ int ooGkClientHandleRegistrationConfirm /* Extract Pre-Granted ARQ */ if(pRegistrationConfirm->m.preGrantedARQPresent) { - memcpy(&pGkClient->gkInfo.preGrantedARQ, + memcpy(&pGkClient->gkInfo.preGrantedARQ, &pRegistrationConfirm->preGrantedARQ, sizeof(H225RegistrationConfirm_preGrantedARQ)); } @@ -1437,7 +1437,7 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) return OO_FAILED; } - pUnregReq = (H225UnregistrationRequest*)memAlloc(pctxt, + pUnregReq = (H225UnregistrationRequest*)memAlloc(pctxt, sizeof(H225UnregistrationRequest)); if(!pUnregReq) { @@ -1455,10 +1455,10 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) if(!pUnregReq->requestSeqNum) pUnregReq->requestSeqNum = pGkClient->requestSeqNum++; - + /* Populate CallSignal Address List*/ - pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, + pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, sizeof(H225TransportAddress)); pIpAddress = (H225TransportAddress_ipAddress*) memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); @@ -1476,9 +1476,9 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) inet_pton(AF_INET, pGkClient->localRASIP, pIpAddress->ip.data); pIpAddress->ip.numocts = 4; pIpAddress->port = gH323ep.listenPort; - + dListInit(&pUnregReq->callSignalAddress); - dListAppend(pctxt, &pUnregReq->callSignalAddress, + dListAppend(pctxt, &pUnregReq->callSignalAddress, (void*)pTransportAddress); /* Populate Endpoint Identifier */ @@ -1495,7 +1495,7 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy((void*)pUnregReq->endpointIdentifier.data, + memcpy((void*)pUnregReq->endpointIdentifier.data, (void*)pGkClient->endpointId.data, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); @@ -1513,9 +1513,9 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy((void*)pUnregReq->gatekeeperIdentifier.data, - (void*)pGkClient->gkId.data, - sizeof(ASN116BITCHAR)*pGkClient->gkId.nchars); + memcpy((void*)pUnregReq->gatekeeperIdentifier.data, + (void*)pGkClient->gkId.data, + sizeof(ASN116BITCHAR)*pGkClient->gkId.nchars); } /* Check whether specific aliases are to be unregistered*/ @@ -1525,7 +1525,7 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) ooPopulateAliasList(pctxt, aliases, &pUnregReq->endpointAlias, 0); } - + iRet = ooGkClientSendMsg(pGkClient, pRasMsg); if(iRet != OO_OK) { @@ -1540,7 +1540,7 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases) ast_mutex_unlock(&pGkClient->Lock); return OO_OK; -} +} @@ -1550,15 +1550,15 @@ int ooGkClientHandleUnregistrationRequest int iRet=0, x; OOTimer *pTimer = NULL; DListNode *pNode = NULL; - + /* Lets first send unregistration confirm message back to gatekeeper*/ - ooGkClientSendUnregistrationConfirm(pGkClient, + ooGkClientSendUnregistrationConfirm(pGkClient, punregistrationRequest->requestSeqNum); if(punregistrationRequest->m.endpointAliasPresent) { OOTRACEINFO1("Gatekeeper requested a list of aliases be unregistered\n"); - ooGkClientUpdateRegisteredAliases(pGkClient, + ooGkClientUpdateRegisteredAliases(pGkClient, &punregistrationRequest->endpointAlias, FALSE); } else{ @@ -1590,7 +1590,7 @@ int ooGkClientHandleUnregistrationRequest } } - iRet = ooGkClientSendRRQ(pGkClient, 0); + iRet = ooGkClientSendRRQ(pGkClient, 0); if(iRet != OO_OK) { OOTRACEERR1("Error: Failed to send RRQ message\n"); @@ -1608,14 +1608,14 @@ int ooGkClientHandleUnregistrationRequest int ooGkClientSendUnregistrationConfirm(ooGkClient *pGkClient, unsigned reqNo) { int iRet = OO_OK; - OOCTXT *pctxt = &pGkClient->msgCtxt; + OOCTXT *pctxt = &pGkClient->msgCtxt; H225RasMessage *pRasMsg=NULL; H225UnregistrationConfirm *pUCF=NULL; ast_mutex_lock(&pGkClient->Lock); pRasMsg = (H225RasMessage*)memAlloc(pctxt, sizeof(H225RasMessage)); - pUCF = (H225UnregistrationConfirm*)memAlloc(pctxt, + pUCF = (H225UnregistrationConfirm*)memAlloc(pctxt, sizeof(H225UnregistrationConfirm)); if(!pRasMsg || !pUCF) { @@ -1627,9 +1627,9 @@ int ooGkClientSendUnregistrationConfirm(ooGkClient *pGkClient, unsigned reqNo) pRasMsg->t = T_H225RasMessage_unregistrationConfirm; pRasMsg->u.unregistrationConfirm = pUCF; memset(pUCF, 0, sizeof(H225UnregistrationConfirm)); - + pUCF->requestSeqNum = reqNo; - + iRet = ooGkClientSendMsg(pGkClient, pRasMsg); if(iRet != OO_OK) { @@ -1666,8 +1666,8 @@ int ooGkClientSendAdmissionRequest ast_mutex_lock(&pGkClient->Lock); - OOTRACEDBGA3("Building Admission Request for call (%s, %s)\n", - call->callType, call->callToken); + OOTRACEDBGA3("Building Admission Request for call (%s, %s)\n", + call->callType, call->callToken); pRasMsg = (H225RasMessage*)memAlloc(pctxt, sizeof(H225RasMessage)); if(!pRasMsg) { @@ -1678,7 +1678,7 @@ int ooGkClientSendAdmissionRequest return OO_FAILED; } pRasMsg->t = T_H225RasMessage_admissionRequest; - pAdmReq = (H225AdmissionRequest*) memAlloc(pctxt, + pAdmReq = (H225AdmissionRequest*) memAlloc(pctxt, sizeof(H225AdmissionRequest)); if(!pAdmReq) { @@ -1691,12 +1691,12 @@ int ooGkClientSendAdmissionRequest } memset(pAdmReq, 0, sizeof(H225AdmissionRequest)); pRasMsg->u.admissionRequest = pAdmReq; - + /* Populate call signalling addresses */ - pIpAddressLocal = (H225TransportAddress_ipAddress*)memAlloc(pctxt, + pIpAddressLocal = (H225TransportAddress_ipAddress*)memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); if(!ooUtilsIsStrEmpty(call->remoteIP)) - pIpAddressRemote = (H225TransportAddress_ipAddress*)memAlloc(pctxt, + pIpAddressRemote = (H225TransportAddress_ipAddress*)memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); if(!pIpAddressLocal || (!ooUtilsIsStrEmpty(call->remoteIP) && (!pIpAddressRemote))) @@ -1751,7 +1751,7 @@ int ooGkClientSendAdmissionRequest /* Populate call type - For now only PointToPoint supported*/ pAdmReq->callType.t = T_H225CallType_pointToPoint; - + /* Add call model to message*/ pAdmReq->m.callModelPresent = 1; if(OO_TESTFLAG(call->flags, OO_M_GKROUTED)) @@ -1766,32 +1766,32 @@ int ooGkClientSendAdmissionRequest if(!pAdmReq->endpointIdentifier.data) { OOTRACEERR3("Error:Memory - ooGkClientSendAdmissionRequest - " - "endpointIdentifier.data(%s, %s)\n", call->callType, + "endpointIdentifier.data(%s, %s)\n", call->callType, call->callToken); memReset(pctxt); pGkClient->state = GkClientFailed; ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy((void*)pAdmReq->endpointIdentifier.data, + memcpy((void*)pAdmReq->endpointIdentifier.data, (void*)pGkClient->endpointId.data, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); /* Get Destination And source aliases for call - */ if(!strcmp(call->callType, "incoming")) { - if(call->ourAliases) + if(call->ourAliases) destAliases = call->ourAliases; else - destAliases = gH323ep.aliases; + destAliases = gH323ep.aliases; srcAliases = call->remoteAliases; } else { - if(call->ourAliases) + if(call->ourAliases) srcAliases = call->ourAliases; else - srcAliases = gH323ep.aliases; + srcAliases = gH323ep.aliases; destAliases = call->remoteAliases; } @@ -1826,12 +1826,12 @@ int ooGkClientSendAdmissionRequest return OO_FAILED; } } - + /* Populate bandwidth*/ pAdmReq->bandWidth = DEFAULT_BW_REQUEST; /* Populate call Reference */ pAdmReq->callReferenceValue = call->callReference; - + /* populate conferenceID */ memcpy((void*)&pAdmReq->conferenceID, (void*)&call->confIdentifier, sizeof(H225ConferenceIdentifier)); @@ -1864,8 +1864,8 @@ int ooGkClientSendAdmissionRequest ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy((void*)pAdmReq->gatekeeperIdentifier.data, - (void*)pGkClient->gkId.data, + memcpy((void*)pAdmReq->gatekeeperIdentifier.data, + (void*)pGkClient->gkId.data, sizeof(ASN116BITCHAR)*pGkClient->gkId.nchars); } @@ -1875,7 +1875,7 @@ int ooGkClientSendAdmissionRequest /* Create RasCallAdmissionInfo */ if(!retransmit) { - pCallAdmInfo = (RasCallAdmissionInfo*)memAlloc(&pGkClient->ctxt, + pCallAdmInfo = (RasCallAdmissionInfo*)memAlloc(&pGkClient->ctxt, sizeof(RasCallAdmissionInfo)); if(!pCallAdmInfo) { @@ -1885,7 +1885,7 @@ int ooGkClientSendAdmissionRequest pGkClient->state = GkClientFailed; ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; - } + } pCallAdmInfo->call = call; pCallAdmInfo->retries = 0; @@ -1904,7 +1904,7 @@ int ooGkClientSendAdmissionRequest } } } - + iRet = ooGkClientSendMsg(pGkClient, pRasMsg); if(iRet != OO_OK) { @@ -1914,10 +1914,10 @@ int ooGkClientSendAdmissionRequest ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - OOTRACEINFO3("Admission Request message sent for (%s, %s)\n", + OOTRACEINFO3("Admission Request message sent for (%s, %s)\n", call->callType, call->callToken); memReset(pctxt); - + /* Add ARQ timer */ cbData = (ooGkClientTimerCb*) memAlloc (&pGkClient->ctxt, sizeof(ooGkClientTimerCb)); @@ -1932,8 +1932,8 @@ int ooGkClientSendAdmissionRequest cbData->timerType = OO_ARQ_TIMER; cbData->pGkClient = pGkClient; cbData->pAdmInfo = pCallAdmInfo; - if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, - &ooGkClientARQTimerExpired, pGkClient->arqTimeout, + if(!ooTimerCreate(&pGkClient->ctxt, &pGkClient->timerList, + &ooGkClientARQTimerExpired, pGkClient->arqTimeout, cbData, FALSE)) { OOTRACEERR1("Error:Unable to create ARQ timer.\n "); @@ -1941,8 +1941,8 @@ int ooGkClientSendAdmissionRequest pGkClient->state = GkClientFailed; ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; - } - + } + ast_mutex_unlock(&pGkClient->Lock); return OO_OK; } @@ -1970,14 +1970,14 @@ int ooGkClientHandleAdmissionConfirm pCallAdmInfo = (RasCallAdmissionInfo*) pNode->data; if(pCallAdmInfo->requestSeqNum == pAdmissionConfirm->requestSeqNum) { - OOTRACEDBGC3("Found Pending call(%s, %s)\n", - pCallAdmInfo->call->callType, + OOTRACEDBGC3("Found Pending call(%s, %s)\n", + pCallAdmInfo->call->callType, pCallAdmInfo->call->callToken); ast_mutex_lock(&pCallAdmInfo->call->GkLock); /* Populate Remote IP */ - if(pAdmissionConfirm->destCallSignalAddress.t != + if(pAdmissionConfirm->destCallSignalAddress.t != T_H225TransportAddress_ipAddress) { OOTRACEERR1("Error:Destination Call Signal Address provided by" @@ -1990,7 +1990,7 @@ int ooGkClientHandleAdmissionConfirm return OO_FAILED; } ipAddress = pAdmissionConfirm->destCallSignalAddress.u.ipAddress; - + sprintf(ip, "%d.%d.%d.%d", ipAddress->ip.data[0], ipAddress->ip.data[1], ipAddress->ip.data[2], @@ -2012,13 +2012,13 @@ int ooGkClientHandleAdmissionConfirm OO_CLRFLAG(pCallAdmInfo->call->flags, OO_M_GKROUTED); } } - + if(pAdmissionConfirm->callModel.t == T_H225CallModel_gatekeeperRouted) { if(!OO_TESTFLAG(pCallAdmInfo->call->flags, OO_M_GKROUTED)) { OOTRACEINFO3("Gatekeeper changed call model from direct to " - "GkRouted. (%s, %s)\n", + "GkRouted. (%s, %s)\n", pCallAdmInfo->call->callType, pCallAdmInfo->call->callToken); OO_SETFLAG(pCallAdmInfo->call->flags, OO_M_GKROUTED); @@ -2032,25 +2032,25 @@ int ooGkClientHandleAdmissionConfirm pTimer = (OOTimer*)pNode1->data; if(((ooGkClientTimerCb*)pTimer->cbData)->timerType & OO_ARQ_TIMER) { - if(((ooGkClientTimerCb*)pTimer->cbData)->pAdmInfo == + if(((ooGkClientTimerCb*)pTimer->cbData)->pAdmInfo == pCallAdmInfo) { memFreePtr(&pGkClient->ctxt, pTimer->cbData); - ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, + ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, pTimer); OOTRACEDBGA1("Deleted ARQ Timer.\n"); break; } } - } - OOTRACEINFO3("Admission Confirm message received for (%s, %s)\n", - pCallAdmInfo->call->callType, + } + OOTRACEINFO3("Admission Confirm message received for (%s, %s)\n", + pCallAdmInfo->call->callType, pCallAdmInfo->call->callToken); pCallAdmInfo->call->callState = OO_CALL_CONNECTING; dListRemove(&pGkClient->callsPendingList, pNode); - dListAppend(&pGkClient->ctxt, &pGkClient->callsAdmittedList, + dListAppend(&pGkClient->ctxt, &pGkClient->callsAdmittedList, pNode->data); memFreePtr(&pGkClient->ctxt, pNode); ast_mutex_unlock(&pCallAdmInfo->call->GkLock); @@ -2095,7 +2095,7 @@ int ooGkClientHandleAdmissionReject if(!pCallAdmInfo) { OOTRACEWARN2("Received admission reject with request number %d can not" - " be matched with any pending call.\n", + " be matched with any pending call.\n", pAdmissionReject->requestSeqNum); ast_mutex_unlock(&pGkClient->Lock); return OO_OK; @@ -2115,21 +2115,21 @@ int ooGkClientHandleAdmissionReject pTimer = (OOTimer*)pNode1->data; if(((ooGkClientTimerCb*)pTimer->cbData)->timerType & OO_ARQ_TIMER) { - if(((ooGkClientTimerCb*)pTimer->cbData)->pAdmInfo == + if(((ooGkClientTimerCb*)pTimer->cbData)->pAdmInfo == pCallAdmInfo) { memFreePtr(&pGkClient->ctxt, pTimer->cbData); - ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, + ooTimerDelete(&pGkClient->ctxt, &pGkClient->timerList, pTimer); OOTRACEDBGA1("Deleted ARQ Timer.\n"); break; } } - } + } OOTRACEINFO4("Admission Reject message received with reason code %d for " "(%s, %s)\n", pAdmissionReject->rejectReason.t, call->callType, call->callToken); - + call->callState = OO_CALL_CLEARED; switch(pAdmissionReject->rejectReason.t) @@ -2174,7 +2174,7 @@ int ooGkClientHandleAdmissionReject ast_mutex_unlock(&pCallAdmInfo->call->GkLock); ast_mutex_unlock(&pGkClient->Lock); ast_cond_signal(&pCallAdmInfo->call->gkWait); - return OO_OK; + return OO_OK; } @@ -2194,8 +2194,8 @@ int ooGkClientSendIRR ast_mutex_lock(&pGkClient->Lock); - OOTRACEDBGA3("Building Info Request Resp for call (%s, %s)\n", - call->callType, call->callToken); + OOTRACEDBGA3("Building Info Request Resp for call (%s, %s)\n", + call->callType, call->callToken); pRasMsg = (H225RasMessage*)memAlloc(pctxt, sizeof(H225RasMessage)); if(!pRasMsg) { @@ -2206,7 +2206,7 @@ int ooGkClientSendIRR return OO_FAILED; } pRasMsg->t = T_H225RasMessage_infoRequestResponse; - pIRR = (H225InfoRequestResponse*) memAlloc(pctxt, + pIRR = (H225InfoRequestResponse*) memAlloc(pctxt, sizeof(H225InfoRequestResponse)); if(!pIRR) { @@ -2219,9 +2219,9 @@ int ooGkClientSendIRR } memset(pIRR, 0, sizeof(H225InfoRequestResponse)); pRasMsg->u.infoRequestResponse = pIRR; - + /* Populate call signalling addresses */ - pIpAddressLocal = (H225TransportAddress_ipAddress*)memAlloc(pctxt, + pIpAddressLocal = (H225TransportAddress_ipAddress*)memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); pTransportAddress = (H225TransportAddress*) memAlloc(pctxt, sizeof(H225TransportAddress)); @@ -2251,7 +2251,7 @@ int ooGkClientSendIRR if(!pIRR->requestSeqNum) pIRR->requestSeqNum = pGkClient->requestSeqNum++; - pIpRasAddress = (H225TransportAddress_ipAddress*)memAlloc(pctxt, + pIpRasAddress = (H225TransportAddress_ipAddress*)memAlloc(pctxt, sizeof(H225TransportAddress_ipAddress)); if(!pIpRasAddress) { @@ -2300,10 +2300,10 @@ int ooGkClientSendIRR /* Populate call aliases */ - if(call->ourAliases) + if(call->ourAliases) srcAliases = call->ourAliases; else - srcAliases = gH323ep.aliases; + srcAliases = gH323ep.aliases; /* Populate Source Info */ if(srcAliases) @@ -2326,12 +2326,12 @@ int ooGkClientSendIRR pIRR->m.needResponsePresent = TRUE; pIRR->unsolicited = TRUE; pIRR->m.unsolicitedPresent = TRUE; - + /* Populate perCallInfo */ pIRR->m.perCallInfoPresent = TRUE; - perCallInfo = + perCallInfo = (H225InfoRequestResponse_perCallInfo_element *)memAlloc(pctxt, sizeof(H225InfoRequestResponse_perCallInfo_element)); memset(perCallInfo, 0, sizeof(H225InfoRequestResponse_perCallInfo_element)); @@ -2372,9 +2372,9 @@ int ooGkClientSendIRR pRemoteAddr->port = call->remotePort; perCallInfo->callSignaling.m.sendAddressPresent = TRUE; - perCallInfo->callSignaling.sendAddress.t = T_H225TransportAddress_ipAddress; + perCallInfo->callSignaling.sendAddress.t = T_H225TransportAddress_ipAddress; perCallInfo->callSignaling.m.recvAddressPresent = TRUE; - perCallInfo->callSignaling.recvAddress.t = T_H225TransportAddress_ipAddress; + perCallInfo->callSignaling.recvAddress.t = T_H225TransportAddress_ipAddress; if (!strcmp(call->callType, "incoming")) { // terminator @@ -2414,7 +2414,7 @@ int ooGkClientSendIRR } perCallInfo->usageInformation.m.endTimePresent = FALSE; perCallInfo->m.usageInformationPresent = TRUE; - + dListInit(&pIRR->perCallInfo); dListAppend(pctxt, &pIRR->perCallInfo, (void*)perCallInfo); @@ -2428,25 +2428,25 @@ int ooGkClientSendIRR ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - OOTRACEINFO3("IRR message sent for (%s, %s)\n", + OOTRACEINFO3("IRR message sent for (%s, %s)\n", call->callType, call->callToken); memReset(pctxt); - + ast_mutex_unlock(&pGkClient->Lock); return OO_OK; } /** - * This function is invoked to request call disengage to gatekeeper. - * - * @param szCallToken Call token. + * This function is invoked to request call disengage to gatekeeper. + * + * @param szCallToken Call token. * * @return Completion status - 0 on success, -1 on failure */ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) { - int iRet = 0; + int iRet = 0; unsigned int x; H225RasMessage *pRasMsg=NULL; OOCTXT *pctxt = NULL; @@ -2470,7 +2470,7 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) } pRasMsg->t = T_H225RasMessage_disengageRequest; - pDRQ = (H225DisengageRequest*) memAlloc(pctxt, + pDRQ = (H225DisengageRequest*) memAlloc(pctxt, sizeof(H225DisengageRequest)); if(!pDRQ) { @@ -2483,12 +2483,12 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) memset(pDRQ, 0, sizeof(H225DisengageRequest)); pRasMsg->u.disengageRequest = pDRQ; - + pDRQ->requestSeqNum = pGkClient->requestSeqNum++; if(!pDRQ->requestSeqNum ) pDRQ->requestSeqNum = pGkClient->requestSeqNum++; - - + + pDRQ->endpointIdentifier.nchars = pGkClient->endpointId.nchars; pDRQ->endpointIdentifier.data = (ASN116BITCHAR*)memAlloc(pctxt, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); @@ -2501,15 +2501,15 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy((void*)pDRQ->endpointIdentifier.data, - (void*)pGkClient->endpointId.data, + memcpy((void*)pDRQ->endpointIdentifier.data, + (void*)pGkClient->endpointId.data, sizeof(ASN116BITCHAR)*pGkClient->endpointId.nchars); memcpy((void*)&pDRQ->conferenceID, (void*)&call->confIdentifier, sizeof(H225ConferenceIdentifier)); pDRQ->callReferenceValue = call->callReference; - + pDRQ->disengageReason.t = T_H225DisengageReason_normalDrop; pDRQ->m.answeredCallPresent = 1; @@ -2534,13 +2534,13 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - memcpy(pDRQ->gatekeeperIdentifier.data, pGkClient->gkId.data, + memcpy(pDRQ->gatekeeperIdentifier.data, pGkClient->gkId.data, pGkClient->gkId.nchars*sizeof(ASN116BITCHAR)); } pDRQ->m.terminationCausePresent = 1; pDRQ->terminationCause.t = T_H225CallTerminationCause_releaseCompleteCauseIE; - pDRQ->terminationCause.u.releaseCompleteCauseIE = + pDRQ->terminationCause.u.releaseCompleteCauseIE = (H225CallTerminationCause_releaseCompleteCauseIE*)memAlloc(pctxt, sizeof(H225CallTerminationCause_releaseCompleteCauseIE)); if(!pDRQ->terminationCause.u.releaseCompleteCauseIE) @@ -2551,7 +2551,7 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - pDRQ->terminationCause.u.releaseCompleteCauseIE->numocts = + pDRQ->terminationCause.u.releaseCompleteCauseIE->numocts = strlen("Call Ended"); strcpy((char *)pDRQ->terminationCause.u.releaseCompleteCauseIE->data, "Call Ended"); @@ -2579,7 +2579,7 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) OOTRACEERR1("Error: Failed to send DRQ message\n"); pGkClient->state = GkClientGkErr; } - + /* Search call in admitted calls list */ @@ -2597,7 +2597,7 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call) } ast_mutex_unlock(&pGkClient->Lock); return iRet; -} +} int ooGkClientHandleDisengageConfirm (ooGkClient *pGkClient, H225DisengageConfirm *pDCF) @@ -2612,14 +2612,14 @@ int ooGkClientRRQTimerExpired(void*pdata) ooGkClientTimerCb *cbData = (ooGkClientTimerCb*)pdata; ooGkClient *pGkClient = cbData->pGkClient; OOTRACEDBGA1("Gatekeeper client RRQ timer expired.\n"); - + if(pGkClient->rrqRetries < OO_MAX_RRQ_RETRIES) { - ret = ooGkClientSendRRQ(pGkClient, 0); + ret = ooGkClientSendRRQ(pGkClient, 0); if(ret != OO_OK) { OOTRACEERR1("Error:Failed to send RRQ message\n"); - + return OO_FAILED; } pGkClient->rrqRetries++; @@ -2676,11 +2676,11 @@ int ooGkClientGRQTimerExpired(void* pdata) OOTRACEDBGA1("Gatekeeper client GRQ timer expired.\n"); - memFreePtr(&pGkClient->ctxt, cbData); + memFreePtr(&pGkClient->ctxt, cbData); if(pGkClient->grqRetries < OO_MAX_GRQ_RETRIES) { - ret = ooGkClientSendGRQ(pGkClient); + ret = ooGkClientSendGRQ(pGkClient); if(ret != OO_OK) { OOTRACEERR1("Error:Failed to send GRQ message\n"); @@ -2717,7 +2717,7 @@ int ooGkClientGRQTimerExpired(void* pdata) ast_mutex_unlock(&pGkClient->Lock); return OO_FAILED; } - + /* clear grq counter */ pGkClient->grqRetries = 0; @@ -2725,15 +2725,15 @@ int ooGkClientGRQTimerExpired(void* pdata) return OO_FAILED; } - + int ooGkClientREGTimerExpired(void *pdata) { int ret=0; ooGkClientTimerCb *cbData = (ooGkClientTimerCb*)pdata; ooGkClient *pGkClient = cbData->pGkClient; OOTRACEDBGA1("Gatekeeper client additive registration timer expired\n"); - memFreePtr(&pGkClient->ctxt, cbData); - ret = ooGkClientSendRRQ(pGkClient, TRUE); + memFreePtr(&pGkClient->ctxt, cbData); + ret = ooGkClientSendRRQ(pGkClient, TRUE); if(ret != OO_OK) { OOTRACEERR1("Error:Failed to send Additive RRQ message\n"); @@ -2751,14 +2751,14 @@ int ooGkClientARQTimerExpired(void* pdata) RasCallAdmissionInfo *pAdmInfo = cbData->pAdmInfo; OOTRACEDBGA1("Gatekeeper client ARQ timer expired.\n"); - memFreePtr(&pGkClient->ctxt, cbData); + memFreePtr(&pGkClient->ctxt, cbData); if(!pAdmInfo) return OO_OK; if(pAdmInfo->retries < OO_MAX_ARQ_RETRIES) { - ret = ooGkClientSendAdmissionRequest(pGkClient, pAdmInfo->call, TRUE); + ret = ooGkClientSendAdmissionRequest(pGkClient, pAdmInfo->call, TRUE); if(ret != OO_OK) { OOTRACEERR1("Error:Failed to send ARQ message\n"); @@ -2870,13 +2870,13 @@ int ooGkClientHandleClientOrGkFailure(ooGkClient *pGkClient) * TODO: This fuction might not work properly in case of additive registrations * For example we registrered 10 aliases and gatekeeper accepted 8 of them. * Now we want to register another two new aliases(not out of those first 10). - * Gk responds with RCF with empty terminalAlias field thus indicating both + * Gk responds with RCF with empty terminalAlias field thus indicating both * the aliases were accepted. If this function is called, it will even mark * the earlier two unregistered aliases as registered. We will have to * maintain a separete list of aliases being sent in RRQ for this. */ int ooGkClientUpdateRegisteredAliases - (ooGkClient *pGkClient, H225_SeqOfH225AliasAddress *pAddresses, + (ooGkClient *pGkClient, H225_SeqOfH225AliasAddress *pAddresses, OOBOOL registered) { int i=0, j, k; @@ -2891,7 +2891,7 @@ int ooGkClientUpdateRegisteredAliases { /* All aliases registered/unregistsred */ pAlias = gH323ep.aliases; - + while(pAlias) { pAlias->registered = registered?TRUE:FALSE; @@ -2914,7 +2914,7 @@ int ooGkClientUpdateRegisteredAliases continue; } pAliasAddress = (H225AliasAddress*)pNode->data; - + if(!pAliasAddress){ OOTRACEERR1("Error:Invalid alias list passed to " "ooGkClientUpdateRegisteredAliases\n"); @@ -2924,8 +2924,8 @@ int ooGkClientUpdateRegisteredAliases switch(pAliasAddress->t) { case T_H225AliasAddress_dialedDigits: - pAlias = ooH323GetAliasFromList(gH323ep.aliases, - T_H225AliasAddress_dialedDigits, + pAlias = ooH323GetAliasFromList(gH323ep.aliases, + T_H225AliasAddress_dialedDigits, (char*)pAliasAddress->u.dialedDigits); if(pAlias) { @@ -2944,8 +2944,8 @@ int ooGkClientUpdateRegisteredAliases } } value[k] = '\0'; - pAlias = ooH323GetAliasFromList(gH323ep.aliases, - T_H225AliasAddress_h323_ID, + pAlias = ooH323GetAliasFromList(gH323ep.aliases, + T_H225AliasAddress_h323_ID, value); if(pAlias) { @@ -2956,8 +2956,8 @@ int ooGkClientUpdateRegisteredAliases } break; case T_H225AliasAddress_url_ID: - pAlias = ooH323GetAliasFromList(gH323ep.aliases, - T_H225AliasAddress_url_ID, + pAlias = ooH323GetAliasFromList(gH323ep.aliases, + T_H225AliasAddress_url_ID, (char*)pAliasAddress->u.url_ID); if(pAlias) { @@ -2974,16 +2974,16 @@ int ooGkClientUpdateRegisteredAliases OOTRACEERR1("Error:Alias transportID not IP address\n"); break; } - - sprintf(value, "%d.%d.%d.%d:%d", + + sprintf(value, "%d.%d.%d.%d:%d", pTransportAddrss->u.ipAddress->ip.data[0], pTransportAddrss->u.ipAddress->ip.data[1], pTransportAddrss->u.ipAddress->ip.data[2], pTransportAddrss->u.ipAddress->ip.data[3], pTransportAddrss->u.ipAddress->port); - pAlias = ooH323GetAliasFromList(gH323ep.aliases, - T_H225AliasAddress_transportID, + pAlias = ooH323GetAliasFromList(gH323ep.aliases, + T_H225AliasAddress_transportID, value); if(pAlias) { @@ -2994,8 +2994,8 @@ int ooGkClientUpdateRegisteredAliases } break; case T_H225AliasAddress_email_ID: - pAlias = ooH323GetAliasFromList(gH323ep.aliases, - T_H225AliasAddress_email_ID, + pAlias = ooH323GetAliasFromList(gH323ep.aliases, + T_H225AliasAddress_email_ID, (char*) pAliasAddress->u.email_ID); if(pAlias) { @@ -3011,7 +3011,7 @@ int ooGkClientUpdateRegisteredAliases } if(bAdd) { - pAlias = ooH323AddAliasToList(&gH323ep.aliases, + pAlias = ooH323AddAliasToList(&gH323ep.aliases, &gH323ep.ctxt, pAliasAddress); if(pAlias){ pAlias->registered = registered?TRUE:FALSE; diff --git a/addons/ooh323c/src/ooGkClient.h b/addons/ooh323c/src/ooGkClient.h index 59230e9539..017380b5f0 100644 --- a/addons/ooh323c/src/ooGkClient.h +++ b/addons/ooh323c/src/ooGkClient.h @@ -2,22 +2,22 @@ * Copyright (C) 2005 by Page Iberica, S.A. * Copyright (C) 2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooGkClient.h - * This file contains functions to support RAS protocol. + * @file ooGkClient.h + * This file contains functions to support RAS protocol. * * */ @@ -73,7 +73,7 @@ extern "C" { #define OO_ARQ_TIMER (1<<3) #define OO_DRQ_TIMER (1<<4) -/** +/** * @defgroup gkclient Gatekeeper client * @{ */ @@ -111,7 +111,7 @@ enum OOGkClientState { GkClientFailed, GkClientStopped }; - + typedef struct RasGatekeeperInfo { @@ -136,9 +136,9 @@ struct OOAliases; /** * NOTE- This functionality is not yet fully completed. - * This is a callback function which is triggered when registration confirm + * This is a callback function which is triggered when registration confirm * message is received from the gatekeeper. The first parameter is the message - * received. The second parameter provides updated list of aliases after the + * received. The second parameter provides updated list of aliases after the * message was processed by the stack. * @param rcf Handle to the received registration confirm message */ @@ -148,9 +148,9 @@ typedef int (*cb_OnReceivedRegistrationConfirm) /** * NOTE- This functionality is not yet fully completed. - * This is a callback function which is triggered when unregistration confirm + * This is a callback function which is triggered when unregistration confirm * message is received. The first parameter is the message received. The second - * parameter provides updated list of aliases after the message was processed + * parameter provides updated list of aliases after the message was processed * by the stack. */ typedef int (*cb_OnReceivedUnregistrationConfirm) @@ -158,7 +158,7 @@ typedef int (*cb_OnReceivedUnregistrationConfirm) /** * NOTE- This functionality is not yet fully completed. - * This is a callback function which is triggered when unregistration request + * This is a callback function which is triggered when unregistration request * message is received. The first parameter is the message received. The second * parameter provides the list of aliases requested to be unregistered. */ @@ -220,20 +220,20 @@ struct OOH323CallData; * @param iGkPort Gk port. * * @return OO_OK, on success. OO_FAILED, on failure. - * + * */ EXTERN int ooGkClientInit (enum RasGatekeeperMode eGkMode, char *szGkAddr, int iGkPort ); /** - * This function is used to print the gatekeeper client configuration + * This function is used to print the gatekeeper client configuration * information to log. * @param pGkClient Handle to gatekeeper client. */ EXTERN void ooGkClientPrintConfig(ooGkClient *pGkClient); /** - * This function is used to destroy Gatekeeper client. It releases all the + * This function is used to destroy Gatekeeper client. It releases all the * associated memory. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -243,17 +243,17 @@ EXTERN int ooGkClientDestroy(void); /** * This function is used to start the Gatekeeper client functionality. * @param pGkClient Pointer to the Gatekeeper Client. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooGkClientStart(ooGkClient *pGkClient); /** - * This function is invoked to set a gatekeeper mode. - * @param pGkClient Handle to gatekeeper client. - * @param eGkMode Gatekeeper mode selected. One of the following: - * - RasNoGatekeeper (DEFAULT), No Gatekeeper. - * - RasDiscoverGatekeeper, to discover a gatekeeper + * This function is invoked to set a gatekeeper mode. + * @param pGkClient Handle to gatekeeper client. + * @param eGkMode Gatekeeper mode selected. One of the following: + * - RasNoGatekeeper (DEFAULT), No Gatekeeper. + * - RasDiscoverGatekeeper, to discover a gatekeeper * automatically. * - RasUseSpecificGatekeeper, to use a specific gatekeeper. * @param szGkAddr Gatekeeper address (only when using specific gatekeeper). @@ -261,8 +261,8 @@ EXTERN int ooGkClientStart(ooGkClient *pGkClient); * * @return Completion status - OO_OK on success, OO_FAILED on failure */ -EXTERN int ooGkClientSetGkMode(ooGkClient *pGkClient, - enum RasGatekeeperMode eGkMode, char *szGkAddr, +EXTERN int ooGkClientSetGkMode(ooGkClient *pGkClient, + enum RasGatekeeperMode eGkMode, char *szGkAddr, int iGkPort ); /** @@ -288,7 +288,7 @@ EXTERN int ooGkClientCloseChannel(ooGkClient *pGkClient); * identifier. * @param pGkClient Pointer to gatekeeper client. * @param psVendor Pointer to vendor identifier to be filled. - * + * */ EXTERN void ooGkClientRasFillVendor (ooGkClient *pGkClient, H225VendorIdentifier *psVendor); @@ -299,14 +299,14 @@ EXTERN void ooGkClientRasFillVendor * @param pGkClient Handle to Gatekeeper client for which message has to be * received. * - * @return Completion status - OO_OK on success, OO_FAILED on + * @return Completion status - OO_OK on success, OO_FAILED on * failure */ EXTERN int ooGkClientReceive(ooGkClient *pGkClient); /** - * This function is used to handle a received RAS message by a gatekeeper + * This function is used to handle a received RAS message by a gatekeeper * client. * @param pGkClient Handle to gatekeeper client. * @param pRasMsg Handle to received Ras message. @@ -322,14 +322,14 @@ EXTERN int ooGkClientHandleRASMessage * @param pGkClient Handle to the gatekeeper client. * @param pRasMsg Handle to Ras message to be sent. * - * @return OO_OK, on success. OO_FAILED, otherwise. + * @return OO_OK, on success. OO_FAILED, otherwise. */ EXTERN int ooGkClientSendMsg(ooGkClient *pGkClient, H225RasMessage *pRasMsg); /** * This function is used to send Gatekeeper request message. - * @param pGkClient Handle to gatekeeper client for which GRQ message has to + * @param pGkClient Handle to gatekeeper client for which GRQ message has to * be sent. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -360,9 +360,9 @@ EXTERN int ooGkClientHandleGatekeeperConfirm /** * This function is used to send Registration request message. - * @param pGkClient Handle to gatekeeper client for which RRQ message has to + * @param pGkClient Handle to gatekeeper client for which RRQ message has to * be sent. - * @param keepAlive Indicates whether keepalive lightweight registration has + * @param keepAlive Indicates whether keepalive lightweight registration has * to be sent. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -392,9 +392,9 @@ EXTERN int ooGkClientHandleRegistrationReject /** * This function is used to send UnRegistration request message. - * @param pGkClient Handle to gatekeeper client for which URQ message has to + * @param pGkClient Handle to gatekeeper client for which URQ message has to * be sent. - * @param aliases List of aliases to be unregistered. NULL, if all the + * @param aliases List of aliases to be unregistered. NULL, if all the * aliases have to be unregistered. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -413,21 +413,21 @@ EXTERN int ooGkClientHandleUnregistrationRequest /** - * This function is used to send an unregistration confirm message to + * This function is used to send an unregistration confirm message to * gatekeeper. * @param pGkClient Handle to gatekeeper client. * @param reqNo Request Sequence number for the confirm message. * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooGkClientSendUnregistrationConfirm(ooGkClient *pGkClient, +EXTERN int ooGkClientSendUnregistrationConfirm(ooGkClient *pGkClient, unsigned reqNo); /** - * This function is invoked to request bandwith admission for a call. + * This function is invoked to request bandwith admission for a call. * @param pGkClient Gatekeeper client to be used * @param call Handle to the call. - * @param retransmit Indicates whether new call or retransmitting for + * @param retransmit Indicates whether new call or retransmitting for * existing call. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -447,8 +447,8 @@ EXTERN int ooGkClientHandleAdmissionConfirm /** - * This function is used to handle a received Admission Reject message. It - * finds the associated call and marks it for cleaning with appropriate + * This function is used to handle a received Admission Reject message. It + * finds the associated call and marks it for cleaning with appropriate * call end reason code. * @param pGkClient Handle to Gatekeeper client. * @param pAdmissionReject Handle to received admission reject message. @@ -459,7 +459,7 @@ EXTERN int ooGkClientHandleAdmissionReject (ooGkClient *pGkClient, H225AdmissionReject *pAdmissionReject); /** - * This function is invoked to request call disengage to gatekeeper. + * This function is invoked to request call disengage to gatekeeper. * @param pGkClient Gatekeeper client to be used. * @param call Call Handle * @@ -520,7 +520,7 @@ EXTERN int ooGkClientARQTimerExpired(void* pdata); EXTERN int ooGkClientCleanCall(ooGkClient *pGkClient, struct OOH323CallData *call); /** - * This function is used to handle gatekeeper client failure or gatekeeper + * This function is used to handle gatekeeper client failure or gatekeeper * failure which can be detected by unresponsiveness of gk. * @param pGkClient Handle to gatekeeper client. * @@ -538,7 +538,7 @@ EXTERN int ooGkClientHandleClientOrGkFailure(ooGkClient *pGkClient); * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooGkClientUpdateRegisteredAliases - (ooGkClient *pGkClient, H225_SeqOfH225AliasAddress *pAddresses, + (ooGkClient *pGkClient, H225_SeqOfH225AliasAddress *pAddresses, OOBOOL registered); /** @@ -551,8 +551,8 @@ EXTERN int ooGkClientUpdateRegisteredAliases */ int ooGkClientSetCallbacks (ooGkClient *pGkClient, OOGKCLIENTCALLBACKS callbacks); -/** - * @} +/** + * @} */ int ooGkClientReInit(ooGkClient *pGkClient); diff --git a/addons/ooh323c/src/ooLogChan.c b/addons/ooh323c/src/ooLogChan.c index 004861cc92..05b152a86f 100644 --- a/addons/ooh323c/src/ooLogChan.c +++ b/addons/ooh323c/src/ooLogChan.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -23,8 +23,8 @@ /** Global endpoint structure */ extern OOH323EndPoint gH323ep; -OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, - int sessionID, char *dir, +OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, + int sessionID, char *dir, ooH323EpCapability *epCap) { OOLogicalChannel *pNewChannel=NULL, *pChannel=NULL; @@ -32,7 +32,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, OOTRACEDBGC5("Adding new media channel for cap %d dir %s (%s, %s)\n", epCap->cap, dir, call->callType, call->callToken); /* Create a new logical channel entry */ - pNewChannel = (OOLogicalChannel*)memAlloc(call->pctxt, + pNewChannel = (OOLogicalChannel*)memAlloc(call->pctxt, sizeof(OOLogicalChannel)); if(!pNewChannel) { @@ -40,7 +40,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, "(%s, %s)\n", call->callType, call->callToken); return NULL; } - + memset(pNewChannel, 0, sizeof(OOLogicalChannel)); pNewChannel->channelNo = channelNo; pNewChannel->sessionID = sessionID; @@ -51,12 +51,12 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, pNewChannel->chanCap = epCap; OOTRACEDBGC4("Adding new channel with cap %d (%s, %s)\n", epCap->cap, - call->callType, call->callToken); - /* As per standards, media control port should be same for all + call->callType, call->callToken); + /* As per standards, media control port should be same for all proposed channels with same session ID. However, most applications use same media port for transmit and receive of audio streams. Infact, - testing of OpenH323 based asterisk assumed that same ports are used. - Hence we first search for existing media ports for same session and use + testing of OpenH323 based asterisk assumed that same ports are used. + Hence we first search for existing media ports for same session and use them. This should take care of all cases. */ if(call->mediaInfo) @@ -72,7 +72,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, pMediaInfo = pMediaInfo->next; } } - + if(pMediaInfo) { OOTRACEDBGC3("Using configured media info (%s, %s)\n", call->callType, @@ -80,7 +80,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, pNewChannel->localRtpPort = pMediaInfo->lMediaRedirPort ? pMediaInfo->lMediaRedirPort : pMediaInfo->lMediaPort; /* check MediaRedirPort here because RedirCPort is ReditPort + 1 and can't be 0 ;) */ pNewChannel->localRtcpPort = pMediaInfo->lMediaRedirPort ? pMediaInfo->lMediaRedirCPort : pMediaInfo->lMediaCntrlPort; - /* If user application has not specified a specific ip and is using + /* If user application has not specified a specific ip and is using multihomed mode, substitute appropriate ip. */ if(!strcmp(pMediaInfo->lMediaIP, "0.0.0.0") || !strcmp(pMediaInfo->lMediaIP, "::")) @@ -102,7 +102,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, pNewChannel->localRtcpPort = ooGetNextPort (OORTP); strcpy(pNewChannel->localIP, call->localIP); } - + /* Add new channel to the list */ pNewChannel->next = NULL; if(!call->logicalChans) { @@ -113,7 +113,7 @@ OOLogicalChannel* ooAddNewLogicalChannel(OOH323CallData *call, int channelNo, while(pChannel->next) pChannel = pChannel->next; pChannel->next = pNewChannel; } - + /* increment logical channels */ call->noOfLogicalChannels++; OOTRACEINFO3("Created new logical channel entry (%s, %s)\n", call->callType, @@ -144,22 +144,22 @@ OOLogicalChannel* ooFindLogicalChannelByLogicalChannelNo(OOH323CallData *call, return pLogicalChannel; } -OOLogicalChannel * ooFindLogicalChannelByOLC(OOH323CallData *call, +OOLogicalChannel * ooFindLogicalChannelByOLC(OOH323CallData *call, H245OpenLogicalChannel *olc) { H245DataType * psDataType=NULL; H245H2250LogicalChannelParameters * pslcp=NULL; - OOTRACEDBGC4("ooFindLogicalChannel by olc %d (%s, %s)\n", + OOTRACEDBGC4("ooFindLogicalChannel by olc %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); if(olc->m.reverseLogicalChannelParametersPresent) { - OOTRACEDBGC3("Finding receive channel (%s,%s)\n", call->callType, + OOTRACEDBGC3("Finding receive channel (%s,%s)\n", call->callType, call->callToken); psDataType = &olc->reverseLogicalChannelParameters.dataType; /* Only H2250LogicalChannelParameters are supported */ if(olc->reverseLogicalChannelParameters.multiplexParameters.t != T_H245OpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters){ - OOTRACEERR4("Error:Invalid olc %d received (%s, %s)\n", + OOTRACEERR4("Error:Invalid olc %d received (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); return NULL; } @@ -168,14 +168,14 @@ OOLogicalChannel * ooFindLogicalChannelByOLC(OOH323CallData *call, return ooFindLogicalChannel(call, pslcp->sessionID, "receive", psDataType); } else{ - OOTRACEDBGC3("Finding transmit channel (%s, %s)\n", call->callType, + OOTRACEDBGC3("Finding transmit channel (%s, %s)\n", call->callType, call->callToken); psDataType = &olc->forwardLogicalChannelParameters.dataType; /* Only H2250LogicalChannelParameters are supported */ - if(olc->forwardLogicalChannelParameters.multiplexParameters.t != + if(olc->forwardLogicalChannelParameters.multiplexParameters.t != T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { - OOTRACEERR4("Error:Invalid olc %d received (%s, %s)\n", + OOTRACEERR4("Error:Invalid olc %d received (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); return NULL; } @@ -184,7 +184,7 @@ OOLogicalChannel * ooFindLogicalChannelByOLC(OOH323CallData *call, } } -OOLogicalChannel * ooFindLogicalChannel(OOH323CallData *call, int sessionID, +OOLogicalChannel * ooFindLogicalChannel(OOH323CallData *call, int sessionID, char *dir, H245DataType * dataType) { OOLogicalChannel * pChannel = NULL; @@ -246,7 +246,7 @@ OOLogicalChannel* ooGetTransmitLogicalChannel while(pChannel) { OOTRACEINFO6("Listing logical channel %d cap %d state %d for (%s, %s)\n", - pChannel->channelNo, pChannel->chanCap->cap, pChannel->state, + pChannel->channelNo, pChannel->chanCap->cap, pChannel->state, call->callType, call->callToken); if(!strcmp(pChannel->dir, "transmit") && pChannel->state != OO_LOGICALCHAN_IDLE && pChannel->state != OO_LOGICALCHAN_PROPOSEDFS) @@ -283,13 +283,13 @@ int ooClearAllLogicalChannels(OOH323CallData *call) OOTRACEINFO3("Clearing all logical channels (%s, %s)\n", call->callType, call->callToken); - + temp = call->logicalChans; while(temp) { prev = temp; temp = temp->next; - ooClearLogicalChannel(call, prev->channelNo);/* TODO: efficiency - This causes re-search + ooClearLogicalChannel(call, prev->channelNo);/* TODO: efficiency - This causes re-search of logical channel in the list. Can be easily improved.*/ } @@ -321,7 +321,7 @@ int ooClearLogicalChannel(OOH323CallData *call, int channelNo) if(epCap->stopReceiveChannel) { epCap->stopReceiveChannel(call, pLogicalChannel); - OOTRACEINFO4("Stopped Receive channel %d (%s, %s)\n", + OOTRACEINFO4("Stopped Receive channel %d (%s, %s)\n", channelNo, call->callType, call->callToken); } else{ @@ -336,12 +336,12 @@ int ooClearLogicalChannel(OOH323CallData *call, int channelNo) if(epCap->stopTransmitChannel) { epCap->stopTransmitChannel(call, pLogicalChannel); - OOTRACEINFO4("Stopped Transmit channel %d (%s, %s)\n", + OOTRACEINFO4("Stopped Transmit channel %d (%s, %s)\n", channelNo, call->callType, call->callToken); } else{ OOTRACEERR4("ERROR:No callback registered for stopTransmitChannel" - " %d (%s, %s)\n", channelNo, call->callType, + " %d (%s, %s)\n", channelNo, call->callType, call->callToken); } } @@ -355,11 +355,11 @@ int ooClearLogicalChannel(OOH323CallData *call, int channelNo) int ooRemoveLogicalChannel(OOH323CallData *call, int ChannelNo) { - OOLogicalChannel * temp = NULL, *prev=NULL; + OOLogicalChannel * temp = NULL, *prev=NULL; if(!call->logicalChans) { OOTRACEERR4("ERROR:Remove Logical Channel - Channel %d not found " - "Empty channel List(%s, %s)\n", ChannelNo, call->callType, + "Empty channel List(%s, %s)\n", ChannelNo, call->callType, call->callToken); return OO_FAILED; } @@ -381,23 +381,23 @@ int ooRemoveLogicalChannel(OOH323CallData *call, int ChannelNo) prev = temp; temp = temp->next; } - + OOTRACEERR4("ERROR:Remove Logical Channel - Channel %d not found " "(%s, %s)\n", ChannelNo, call->callType, call->callToken); return OO_FAILED; } -/* -Change the state of the channel as established and close all other -channels with same session IDs. This is useful for handling fastStart, +/* +Change the state of the channel as established and close all other +channels with same session IDs. This is useful for handling fastStart, as the endpoint can open multiple logical channels for same sessionID. -Once the remote endpoint confirms it's selection, all other channels for +Once the remote endpoint confirms it's selection, all other channels for the same sessionID must be closed. */ int ooOnLogicalChannelEstablished (OOH323CallData *call, OOLogicalChannel * pChannel) { - OOLogicalChannel * temp = NULL, *prev=NULL; + OOLogicalChannel * temp = NULL, *prev=NULL; OOTRACEDBGC3("In ooOnLogicalChannelEstablished (%s, %s)\n", call->callType, call->callToken); pChannel->state = OO_LOGICALCHAN_ESTABLISHED; @@ -417,4 +417,3 @@ int ooOnLogicalChannelEstablished } return OO_OK; } - diff --git a/addons/ooh323c/src/ooLogChan.h b/addons/ooh323c/src/ooLogChan.h index c52e9a73d1..cf9a053686 100644 --- a/addons/ooh323c/src/ooLogChan.h +++ b/addons/ooh323c/src/ooLogChan.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooLogChan.h + * @file ooLogChan.h * This file contains structures and functions for maintaining information * on logical channels within the stack. */ @@ -34,13 +34,13 @@ extern "C" { struct ooH323EpCapability; struct OOH323CallData; -/** +/** * Logical channel states. */ typedef enum { - OO_LOGICAL_CHAN_UNKNOWN, - OO_LOGICALCHAN_IDLE, - OO_LOGICALCHAN_PROPOSED, + OO_LOGICAL_CHAN_UNKNOWN, + OO_LOGICALCHAN_IDLE, + OO_LOGICALCHAN_PROPOSED, OO_LOGICALCHAN_ESTABLISHED, OO_LOGICALCHAN_PROPOSEDFS, OO_LOGICALCHAN_CLOSEPENDING @@ -60,7 +60,7 @@ typedef struct OOLogicalChannel { int localRtpPort; int localRtcpPort; char localIP[2+8*4+7]; - OOLogicalChannelState state; + OOLogicalChannelState state; struct ooH323EpCapability *chanCap; struct OOLogicalChannel *next; } OOLogicalChannel; @@ -70,7 +70,7 @@ typedef struct OOLogicalChannel { /** * This function is used to add a new logical channel entry into the list * of currently active logical channels. - * @param call Pointer to the call for which new logical channel + * @param call Pointer to the call for which new logical channel * entry has to be created. * @param channelNo Channel number for the new channel entry. * @param sessionID Session identifier for the new channel. @@ -80,26 +80,26 @@ typedef struct OOLogicalChannel { * @return Pointer to logical channel, on success. NULL, on failure */ EXTERN ooLogicalChannel* ooAddNewLogicalChannel - (struct OOH323CallData *call, int channelNo, int sessionID, + (struct OOH323CallData *call, int channelNo, int sessionID, char *dir, ooH323EpCapability *epCap); /** - * This function is used to find a logical channel using the logical + * This function is used to find a logical channel using the logical * channel number as a key. - * @param call Pointer to the call for which logical channel is + * @param call Pointer to the call for which logical channel is * required. * @param channelNo Forward Logical Channel number for the logical channel * - * @return Pointer to the logical channel if found, NULL - * otherwise. + * @return Pointer to the logical channel if found, NULL + * otherwise. */ EXTERN ooLogicalChannel* ooFindLogicalChannelByLogicalChannelNo (struct OOH323CallData *call, int channelNo); /** - * This function is called when a new logical channel is established. It is - * particularly useful in case of faststart. When the remote endpoint selects - * one of the proposed alternatives, other channels for the same session type + * This function is called when a new logical channel is established. It is + * particularly useful in case of faststart. When the remote endpoint selects + * one of the proposed alternatives, other channels for the same session type * need to be closed. This function is used for that. * * @param call Handle to the call which owns the logical channel. @@ -110,24 +110,24 @@ EXTERN int ooOnLogicalChannelEstablished (struct OOH323CallData *call, OOLogicalChannel * pChannel); /** - * This function is used to retrieve a logical channel with a particular - * sessionID. Note that there can be two entries of logical channel, one in - * each direction. This function will return the first channel which has the + * This function is used to retrieve a logical channel with a particular + * sessionID. Note that there can be two entries of logical channel, one in + * each direction. This function will return the first channel which has the * same session ID. * @param call Handle to the call which owns the channels to be searched. * @param sessionID Session id of the session which is to be searched for. * @param dir Direction of the channel.(transmit/receive) * - * @return Returns a pointer to the logical channel if found, NULL + * @return Returns a pointer to the logical channel if found, NULL * otherwise. */ EXTERN ooLogicalChannel* ooGetLogicalChannel (struct OOH323CallData *call, int sessionID, char *dir); /** - * This function is used to remove a logical channel from the list of + * This function is used to remove a logical channel from the list of * channels within the call structure. - * @param call Pointer to the call from which logical channel has + * @param call Pointer to the call from which logical channel has * to be removed. * @param ChannelNo Forward logical channel number of the channel to be * removed. @@ -137,7 +137,7 @@ EXTERN int ooRemoveLogicalChannel (struct OOH323CallData *call, int ChannelNo); /** * This function is used to cleanup a logical channel. It first stops media if - * it is still active and then removes the channel from the list, freeing up + * it is still active and then removes the channel from the list, freeing up * all the associated memory. * @param call Handle to the call which owns the logical channel. * @param channelNo Channel number identifying the channel. @@ -147,7 +147,7 @@ EXTERN int ooRemoveLogicalChannel (struct OOH323CallData *call, int ChannelNo); EXTERN int ooClearLogicalChannel (struct OOH323CallData *call, int channelNo); /** - * This function is used to cleanup all the logical channels associated with + * This function is used to cleanup all the logical channels associated with * the call. * @param call Handle to the call which owns the channels. * @@ -184,8 +184,8 @@ EXTERN OOLogicalChannel * ooFindLogicalChannel EXTERN OOLogicalChannel* ooGetTransmitLogicalChannel(struct OOH323CallData *call); EXTERN OOLogicalChannel* ooGetReceiveLogicalChannel(struct OOH323CallData *call); -/** - * @} +/** + * @} */ #ifdef __cplusplus diff --git a/addons/ooh323c/src/ooSocket.c b/addons/ooh323c/src/ooSocket.c index 6032dd0aff..1a6a7dbe1a 100644 --- a/addons/ooh323c/src/ooSocket.c +++ b/addons/ooh323c/src/ooSocket.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -79,10 +79,10 @@ int ooSocketsInit () WSADATA wsaData; int err; - if (inited) return ASN_OK; + if (inited) return ASN_OK; wVersionRequested = MAKEWORD( 1, 1 ); - + err = WSAStartup (wVersionRequested, &wsaData); if ( err != 0 ) { /* Tell the user that we could not find a usable */ @@ -100,58 +100,58 @@ int ooSocketsInit () // ws32 = LoadLibrary ("WSOCK32.DLL"); ws32 = LoadLibrary ("WS2_32.DLL"); if (ws32 == NULL) return ASN_E_NOTINIT; - + wsaStartup = (LPFN_WSASTARTUP) GetProcAddress (ws32, "WSAStartup"); if (wsaStartup == NULL) return ASN_E_NOTINIT; - + send = (LPFN_SEND) GetProcAddress (ws32, "send"); if (send == NULL) return ASN_E_NOTINIT; - + socket = (LPFN_SOCKET) GetProcAddress (ws32, "socket"); if (socket == NULL) return ASN_E_NOTINIT; - + setsockopt = (LPFN_SETSOCKOPT) GetProcAddress (ws32, "setsockopt"); if (setsockopt == NULL) return ASN_E_NOTINIT; - + bind = (LPFN_BIND) GetProcAddress (ws32, "bind"); if (bind == NULL) return ASN_E_NOTINIT; - + htonl = (LPFN_HTONL) GetProcAddress (ws32, "htonl"); if (htonl == NULL) return ASN_E_NOTINIT; - + htons = (LPFN_HTONS) GetProcAddress (ws32, "htons"); if (htons == NULL) return ASN_E_NOTINIT; - + connect = (LPFN_CONNECT) GetProcAddress (ws32, "connect"); if (connect == NULL) return ASN_E_NOTINIT; - + listen = (LPFN_LISTEN) GetProcAddress (ws32, "listen"); if (listen == NULL) return ASN_E_NOTINIT; - + accept = (LPFN_ACCEPT) GetProcAddress (ws32, "accept"); if (accept == NULL) return ASN_E_NOTINIT; - + inet_addr = (LPFN_INET_ADDR) GetProcAddress (ws32, "inet_addr"); if (inet_addr == NULL) return ASN_E_NOTINIT; - + ntohl = (LPFN_NTOHL) GetProcAddress (ws32, "ntohl"); if (ntohl == NULL) return ASN_E_NOTINIT; - + ntohs = (LPFN_NTOHS) GetProcAddress (ws32, "ntohs"); if (ntohs == NULL) return ASN_E_NOTINIT; - + recv = (LPFN_RECV) GetProcAddress (ws32, "recv"); if (recv == NULL) return ASN_E_NOTINIT; - + shutdown = (LPFN_SHUTDOWN) GetProcAddress (ws32, "shutdown"); if (shutdown == NULL) return ASN_E_NOTINIT; - + closesocket = (LPFN_CLOSESOCKET) GetProcAddress (ws32, "closesocket"); if (closesocket == NULL) return ASN_E_NOTINIT; getsockname = (LPFN_GETSOCKNAME) GetProcAddress (ws32, "getsockname"); if (getsockname == NULL) return ASN_E_NOTINIT; - + ioctlsocket = (LPFN_IOCTLSOCKET) GetProcAddress(ws32, "ioctlsocket"); if(ioctlsocket == NULL) return ASN_E_NOTINIT; @@ -172,15 +172,15 @@ int ooSocketsInit () gethostbyname = (LPFN_GETHOSTBYNAME) GetProcAddress (ws32, "gethostbyname"); if (gethostbyname == NULL) return ASN_E_NOTINIT; - - WSAGetLastError = (LPFN_WSAGETLASTERROR) GetProcAddress (ws32, + + WSAGetLastError = (LPFN_WSAGETLASTERROR) GetProcAddress (ws32, "WSAGetLastError"); if (WSAGetLastError == NULL) return ASN_E_NOTINIT; WSACleanup = (LPFN_WSACLEANUP) GetProcAddress (ws32, "WSACleanup"); if (WSACleanup == NULL) return ASN_E_NOTINIT; - - + + if (wsaStartup (MAKEWORD(1, 1), &wsaData) == -1) return ASN_E_NOTINIT; #endif return ASN_OK; @@ -193,7 +193,7 @@ typedef int OOSOCKLEN; typedef socklen_t OOSOCKLEN; #endif -int ooSocketCreate (OOSOCKET* psocket, int family) +int ooSocketCreate (OOSOCKET* psocket, int family) { int on; OOSOCKET sock; @@ -212,14 +212,14 @@ int ooSocketCreate (OOSOCKET* psocket, int family) SOCK_STREAM, 0); } - + if (sock == OOSOCKET_INVALID){ OOTRACEERR1("Error:Failed to create TCP socket\n"); return ASN_E_INVSOCKET; } on = 1; - if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, + if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const char* ) &on, sizeof (on)) == -1) { OOTRACEERR1("Error:Failed to set socket option SO_REUSEADDR\n"); @@ -227,7 +227,7 @@ int ooSocketCreate (OOSOCKET* psocket, int family) } linger.l_onoff = 1; linger.l_linger = 0; - if (setsockopt (sock, SOL_SOCKET, SO_LINGER, + if (setsockopt (sock, SOL_SOCKET, SO_LINGER, (const char* ) &linger, sizeof (linger)) == -1) { OOTRACEERR1("Error:Failed to set socket option linger\n"); @@ -244,7 +244,7 @@ int ooSocketCreate (OOSOCKET* psocket, int family) return ASN_OK; } -int ooSocketCreateUDP (OOSOCKET* psocket, int family) +int ooSocketCreateUDP (OOSOCKET* psocket, int family) { int on; OOSOCKET sock; @@ -264,7 +264,7 @@ int ooSocketCreateUDP (OOSOCKET* psocket, int family) } on = 1; - if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, + if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const char* ) &on, sizeof (on)) == -1) { OOTRACEERR1("Error:Failed to set socket option SO_REUSEADDR\n"); @@ -274,7 +274,7 @@ int ooSocketCreateUDP (OOSOCKET* psocket, int family) /* linger.l_onoff = 1; linger.l_linger = 0; - if (setsockopt (sock, SOL_SOCKET, SO_LINGER, + if (setsockopt (sock, SOL_SOCKET, SO_LINGER, (const char* ) &linger, sizeof (linger)) == -1) return ASN_E_INVSOCKET; */ @@ -290,7 +290,7 @@ int ooSocketClose (OOSOCKET socket) return ASN_OK; } -int ooSocketBind (OOSOCKET socket, OOIPADDR addr, int port) +int ooSocketBind (OOSOCKET socket, OOIPADDR addr, int port) { struct ast_sockaddr m_addr; @@ -298,7 +298,7 @@ int ooSocketBind (OOSOCKET socket, OOIPADDR addr, int port) if (socket == OOSOCKET_INVALID) - { + { OOTRACEERR1("Error:Invalid socket passed to bind\n"); return ASN_E_INVSOCKET; } @@ -343,7 +343,7 @@ int ooSocketGetIpAndPort(OOSOCKET socket, char *ip, int len, int *port, int *fam host = ast_sockaddr_stringify_addr(&addr); if(host && strlen(host) < (unsigned)len) - strcpy(ip, host); + strcpy(ip, host); else{ OOTRACEERR1("Error:Insufficient buffer for ip address - " "ooSocketGetIpAndPort\n"); @@ -361,7 +361,7 @@ int ooSocketGetIpAndPort(OOSOCKET socket, char *ip, int len, int *port, int *fam return ASN_OK; } -int ooSocketListen (OOSOCKET socket, int maxConnection) +int ooSocketListen (OOSOCKET socket, int maxConnection) { if (socket == OOSOCKET_INVALID) return ASN_E_INVSOCKET; @@ -371,8 +371,8 @@ int ooSocketListen (OOSOCKET socket, int maxConnection) return ASN_OK; } -int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket, - char* destAddr, int* destPort) +int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket, + char* destAddr, int* destPort) { struct ast_sockaddr addr; char* host = NULL; @@ -393,15 +393,15 @@ int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket, return ASN_OK; } -int ooSocketConnect (OOSOCKET socket, const char* host, int port) +int ooSocketConnect (OOSOCKET socket, const char* host, int port) { struct ast_sockaddr m_addr; if (socket == OOSOCKET_INVALID) - { + { return ASN_E_INVSOCKET; } - + memset (&m_addr, 0, sizeof (m_addr)); ast_parse_arg(host, PARSE_ADDR, &m_addr); ast_sockaddr_set_port(&m_addr, port); @@ -414,13 +414,13 @@ int ooSocketConnect (OOSOCKET socket, const char* host, int port) } /* // **Need to add check whether complete data was sent by checking the return -// **value of send and if complete data is not sent then add mechanism to +// **value of send and if complete data is not sent then add mechanism to // **send remaining bytes. This will make ooSocketSend call atomic. */ int ooSocketSend (OOSOCKET socket, const ASN1OCTET* pdata, ASN1UINT size) { if (socket == OOSOCKET_INVALID) return ASN_E_INVSOCKET; - + if (send (socket, (const char*) pdata, size, SEND_FLAGS) == -1) return ASN_E_INVSOCKET; return ASN_OK; @@ -431,14 +431,14 @@ int ooSocketSendTo(OOSOCKET socket, const ASN1OCTET* pdata, ASN1UINT size, { struct sockaddr_in m_addr; if (socket == OOSOCKET_INVALID) return ASN_E_INVSOCKET; - + memset (&m_addr, 0, sizeof (m_addr)); m_addr.sin_family = AF_INET; m_addr.sin_port = htons ((unsigned short)port); m_addr.sin_addr.s_addr = inet_addr (host); - if (sendto (socket, (const char*) pdata, size, SEND_FLAGS, - (const struct sockaddr*)&m_addr, + if (sendto (socket, (const char*) pdata, size, SEND_FLAGS, + (const struct sockaddr*)&m_addr, sizeof(m_addr)) == -1) return ASN_E_INVSOCKET; return ASN_OK; @@ -476,8 +476,8 @@ int ooSocketRecvFrom (OOSOCKET socket, ASN1OCTET* pbuf, ASN1UINT bufsize, addrlen = sizeof(m_addr); memset (&m_addr, 0, sizeof (m_addr)); - - if ((len = recvfrom (socket, (char*) pbuf, bufsize, 0, + + if ((len = recvfrom (socket, (char*) pbuf, bufsize, 0, (struct sockaddr*)&m_addr, (socklen_t *) &addrlen)) == -1) return ASN_E_INVSOCKET; @@ -494,12 +494,12 @@ int ooSocketRecvFrom (OOSOCKET socket, ASN1OCTET* pbuf, ASN1UINT bufsize, return len; } -int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds, +int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval * timeout) { - int ret; + int ret; #if defined (_WIN32) - ret = select(nfds, readfds, writefds, exceptfds, + ret = select(nfds, readfds, writefds, exceptfds, (const struct timeval *) timeout); #else ret = select(nfds, readfds, writefds, exceptfds, timeout); @@ -515,7 +515,7 @@ int ooSocketPoll(struct pollfd *pfds, int nfds, int timeout) int ooPDRead(struct pollfd *pfds, int nfds, int fd) { int i; - for (i=0;ih_addrtype == AF_INET6) { struct in6_addr i; memcpy(&i, hp->h_addr, sizeof(i)); - strcpy(pIPAddrs, (inet_ntop(AF_INET6, &i, - hostname, sizeof(hostname))) == NULL ? "::1" : + strcpy(pIPAddrs, (inet_ntop(AF_INET6, &i, + hostname, sizeof(hostname))) == NULL ? "::1" : inet_ntop(AF_INET6, &i, hostname, sizeof(hostname))); } else { struct in_addr i; @@ -564,7 +564,7 @@ int ooGetLocalIPAddress(char * pIPAddrs) return ASN_OK; } -/* int ooSocketStrToAddr (const char* pIPAddrStr, OOIPADDR* pIPAddr) +/* int ooSocketStrToAddr (const char* pIPAddrStr, OOIPADDR* pIPAddr) { int b1, b2, b3, b4; int rv = sscanf (pIPAddrStr, "%d.%d.%d.%d", &b1, &b2, &b3, &b4); @@ -572,7 +572,7 @@ int ooGetLocalIPAddress(char * pIPAddrs) (b1 < 0 || b1 > 256) || (b2 < 0 || b2 > 256) || (b3 < 0 || b3 > 256) || (b4 < 0 || b4 > 256)) return ASN_E_INVPARAM; - *pIPAddr = ((b1 & 0xFF) << 24) | ((b2 & 0xFF) << 16) | + *pIPAddr = ((b1 & 0xFF) << 24) | ((b2 & 0xFF) << 16) | ((b3 & 0xFF) << 8) | (b4 & 0xFF); return ASN_OK; } @@ -594,9 +594,9 @@ int ooSocketConvertIpToNwAddr(char *inetIp, unsigned char *netIp) OOTRACEERR1("Error:Failed to convert address\n"); return -1; } - + #endif - + memcpy(netIp, (char*)&sin.sin_addr.s_addr, sizeof(unsigned long)); return ASN_OK; } @@ -606,7 +606,7 @@ int ooSocketAddrToStr (OOIPADDR ipAddr, char* pbuf, int bufsize) char buf1[5], buf2[5], buf3[5], buf4[5]; int cnt = 0; - if (bufsize < 8) + if (bufsize < 8) return ASN_E_BUFOVFLW; cnt += sprintf (buf1, "%lu", (ipAddr >> 24) & 0xFF); @@ -654,7 +654,7 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) if(ooSocketCreateUDP(&sock, 4)!= ASN_OK) { OOTRACEERR1("Error:Failed to create udp socket - " - "ooSocketGetInterfaceList\n"); + "ooSocketGetInterfaceList\n"); return -1; } #ifdef SIOCGIFNUM @@ -666,7 +666,7 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) #else ifNum = 50; #endif - + ifc.ifc_len = ifNum * sizeof(struct ifreq); ifc.ifc_req = (struct ifreq *)memAlloc(pctxt, ifNum *sizeof(struct ifreq)); if(!ifc.ifc_req) @@ -686,7 +686,7 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) #ifdef ifr_netmask char mask[50]; #endif - + pIf = (struct OOInterface*)memAlloc(pctxt, sizeof(struct OOInterface)); pName = (char*)memAlloc(pctxt, strlen(ifName->ifr_name)+1); if(!pIf) @@ -696,15 +696,15 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) return -1; } OOTRACEDBGA2("\tInterface name: %s\n", ifName->ifr_name); - - + + strcpy(ifReq.ifr_name, ifName->ifr_name); strcpy(pName, ifName->ifr_name); pIf->name = pName; /* Check whether the interface is up*/ if (ioctl(sock, SIOCGIFFLAGS, &ifReq) < 0) { - OOTRACEERR2("Error:Unable to determine status of interface %s\n", + OOTRACEERR2("Error:Unable to determine status of interface %s\n", pName); memFreePtr(pctxt, pIf->name); memFreePtr(pctxt, pIf); @@ -719,9 +719,9 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) } /* Retrieve interface address */ - if (ioctl(sock, SIOCGIFADDR, &ifReq) < 0) + if (ioctl(sock, SIOCGIFADDR, &ifReq) < 0) { - OOTRACEWARN2("Warn:Unable to determine address of interface %s\n", + OOTRACEWARN2("Warn:Unable to determine address of interface %s\n", pName); memFreePtr(pctxt, pIf->name); memFreePtr(pctxt, pIf); @@ -740,11 +740,11 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) return -1; } strcpy(pIf->addr, addr); - + #ifdef ifr_netmask - if (ioctl(sock, SIOCGIFNETMASK, &ifReq) < 0) + if (ioctl(sock, SIOCGIFNETMASK, &ifReq) < 0) { - OOTRACEWARN2("Warn:Unable to determine mask for interface %s\n", + OOTRACEWARN2("Warn:Unable to determine mask for interface %s\n", pName); memFreePtr(pctxt, pIf->name); memFreePtr(pctxt, pIf->addr); @@ -793,7 +793,7 @@ int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList) */ } - } + } return ASN_OK; } #endif diff --git a/addons/ooh323c/src/ooSocket.h b/addons/ooh323c/src/ooSocket.h index dca390ffa3..b4cbf881b5 100644 --- a/addons/ooh323c/src/ooSocket.h +++ b/addons/ooh323c/src/ooSocket.h @@ -1,21 +1,21 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file ooSocket.h +/** + * @file ooSocket.h * Common runtime constants, data structure definitions, and run-time functions * to support the sockets' operations. */ @@ -60,7 +60,7 @@ extern "C" { #endif /* MAKE_DLL */ #endif /* EXTERN */ -/** +/** * @defgroup sockets Socket Layer * @{ */ @@ -75,7 +75,7 @@ typedef int OOSOCKET; /**< Socket's handle */ #define OOSOCKET_INVALID ((OOSOCKET)-1) -/** +/** * The IP address represented as unsigned long value. The most significant 8 * bits in this unsigned long value represent the first number of the IP * address. The least significant 8 bits represent the last number of the IP @@ -115,7 +115,7 @@ typedef struct OOInterface{ * @return Completion status of operation: 0 (ASN_OK) = success, * negative return value is error. */ -EXTERN int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket, +EXTERN int ooSocketAccept (OOSOCKET socket, OOSOCKET *pNewSocket, char* destAddr, int* destPort); /** @@ -185,7 +185,7 @@ EXTERN int ooSocketConnect (OOSOCKET socket, const char* host, int port); EXTERN int ooSocketCreate (OOSOCKET* psocket, int family); /** - * This function creates a UDP datagram socket. + * This function creates a UDP datagram socket. * * @param psocket The pointer to the socket's handle variable to receive * the handle of new socket. @@ -204,7 +204,7 @@ EXTERN int ooSocketCreateUDP (OOSOCKET* psocket, int family); EXTERN int ooSocketsInit (void); /** - * This function terminates use of sockets by an application. This function + * This function terminates use of sockets by an application. This function * must be called after done with sockets. * * @return Completion status of operation: 0 (ASN_OK) = success, @@ -256,17 +256,17 @@ EXTERN int ooSocketRecvPeek * @return If no error occurs, returns the number of bytes * received. Otherwise, the negative value is error code. */ -EXTERN int ooSocketRecv (OOSOCKET socket, ASN1OCTET* pbuf, +EXTERN int ooSocketRecv (OOSOCKET socket, ASN1OCTET* pbuf, ASN1UINT bufsize); /** * This function receives data from a connected/unconnected socket. It is used - * to read incoming data on sockets. It populates the remotehost and - * remoteport parameters with information of remote host. See description of + * to read incoming data on sockets. It populates the remotehost and + * remoteport parameters with information of remote host. See description of * 'recvfrom' socket function for further details. * * @param socket The socket's handle created by call to ooSocketCreate - * + * * @param pbuf Pointer to the buffer for the incoming data. * @param bufsize Length of the buffer. * @param remotehost Pointer to a buffer in which remote ip address @@ -279,7 +279,7 @@ EXTERN int ooSocketRecv (OOSOCKET socket, ASN1OCTET* pbuf, * received. Otherwise, negative value. */ EXTERN int ooSocketRecvFrom (OOSOCKET socket, ASN1OCTET* pbuf, - ASN1UINT bufsize, char * remotehost, + ASN1UINT bufsize, char * remotehost, ASN1UINT hostBufLen, int * remoteport); /** * This function sends data on a connected socket. It is used to write outgoing @@ -293,47 +293,47 @@ EXTERN int ooSocketRecvFrom (OOSOCKET socket, ASN1OCTET* pbuf, * @return Completion status of operation: 0 (ASN_OK) = success, * negative return value is error. */ -EXTERN int ooSocketSend (OOSOCKET socket, const ASN1OCTET* pdata, +EXTERN int ooSocketSend (OOSOCKET socket, const ASN1OCTET* pdata, ASN1UINT size); /** - * This function sends data on a connected or unconnected socket. See + * This function sends data on a connected or unconnected socket. See * description of 'sendto' socket function for further details. * * @param socket The socket's handle created by call to ::rtSocketCreate * or ::rtSocketAccept function. * @param pdata Buffer containing the data to be transmitted. * @param size Length of the data in pdata. - * @param remotehost Remote host ip address to which data has to + * @param remotehost Remote host ip address to which data has to * be sent. - * @param remoteport Remote port ip address to which data has to + * @param remoteport Remote port ip address to which data has to * be sent. * * @return Completion status of operation: 0 (ASN_OK) = success, * negative return value is error. */ -EXTERN int ooSocketSendTo(OOSOCKET socket, const ASN1OCTET* pdata, +EXTERN int ooSocketSendTo(OOSOCKET socket, const ASN1OCTET* pdata, ASN1UINT size, const char* remotehost, int remoteport); /** * This function is used for synchronous monitoring of multiple sockets. - * For more information refer to documnetation of "select" system call. + * For more information refer to documnetation of "select" system call. * - * @param nfds The highest numbered descriptor to be monitored + * @param nfds The highest numbered descriptor to be monitored * plus one. - * @param readfds The descriptors listed in readfds will be watched for + * @param readfds The descriptors listed in readfds will be watched for * whether read would block on them. * @param writefds The descriptors listed in writefds will be watched for * whether write would block on them. * @param exceptfds The descriptors listed in exceptfds will be watched for * exceptions. - * @param timeout Upper bound on amout of time elapsed before select - * returns. + * @param timeout Upper bound on amout of time elapsed before select + * returns. * @return Completion status of operation: 0 (ASN_OK) = success, * negative return value is error. */ -EXTERN int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds, +EXTERN int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval * timeout) attribute_deprecated; EXTERN int ooSocketPoll(struct pollfd *pfds, int nfds, int timeout); @@ -379,7 +379,7 @@ EXTERN int ooPDWrite(struct pollfd *pfds, int nfds, int fd); EXTERN int ooGetLocalIPAddress(char * pIPAddrs); -EXTERN int ooSocketGetSockName(OOSOCKET socket, struct sockaddr_in *name, +EXTERN int ooSocketGetSockName(OOSOCKET socket, struct sockaddr_in *name, socklen_t *size); @@ -389,7 +389,7 @@ EXTERN short ooSocketHTONS(short val); /** * This function is used to retrieve the ip and port number used by the socket - * passed as parameter. It internally uses getsockname system call for this + * passed as parameter. It internally uses getsockname system call for this * purpose. * @param socket Socket for which ip and port has to be determined. * @param ip Buffer in which ip address will be returned. @@ -403,12 +403,11 @@ EXTERN int ooSocketGetIpAndPort(OOSOCKET socket, char *ip, int len, int *port, i EXTERN int ooSocketGetInterfaceList(OOCTXT *pctxt, OOInterface **ifList); -/** - * @} +/** + * @} */ #ifdef __cplusplus } #endif #endif /* _OOSOCKET_H_ */ - diff --git a/addons/ooh323c/src/ooStackCmds.c b/addons/ooh323c/src/ooStackCmds.c index 771b3c6af8..a0c65750b7 100644 --- a/addons/ooh323c/src/ooStackCmds.c +++ b/addons/ooh323c/src/ooStackCmds.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -57,14 +57,14 @@ int isRunning(char *callToken) { return 0; } -OOStkCmdStat ooMakeCall +OOStkCmdStat ooMakeCall (const char* dest, char* callToken, size_t bufsiz, ooCallOptions *opts) { OOStackCommand cmd; if(!callToken) return OO_STKCMD_INVALIDPARAM; - + /* Generate call token*/ if (ooGenerateOutgoingCallToken (callToken, bufsiz) != OO_OK){ @@ -86,14 +86,14 @@ OOStkCmdStat ooMakeCall } strcpy((char*)cmd.param1, dest); - + cmd.param2 = ast_malloc(strlen(callToken)+1); if(!cmd.param2) { ast_free(cmd.param1); return OO_STKCMD_MEMERR; } - + strcpy((char*)cmd.param2, callToken); if(!opts) @@ -122,7 +122,7 @@ OOStkCmdStat ooMakeCall return OO_STKCMD_SUCCESS; } -OOStkCmdStat ooRunCall +OOStkCmdStat ooRunCall (const char* dest, char* callToken, size_t bufsiz, ooCallOptions *opts) { OOStackCommand cmd; @@ -145,7 +145,7 @@ OOStkCmdStat ooRunCall if(!callToken) return OO_STKCMD_INVALIDPARAM; - + memset(&cmd, 0, sizeof(OOStackCommand)); cmd.type = OO_CMD_MAKECALL; @@ -157,14 +157,14 @@ OOStkCmdStat ooRunCall strcpy((char*)cmd.param1, dest); cmd.plen1 = strlen(dest); - + cmd.param2 = ast_malloc(strlen(callToken)+1); if(!cmd.param2) { ast_free(cmd.param1); return OO_STKCMD_MEMERR; } - + strcpy((char*)cmd.param2, callToken); cmd.plen2 = strlen(callToken); @@ -230,7 +230,7 @@ OOStkCmdStat ooManualRingback(const char *callToken) } strcpy((char*)cmd.param1, callToken); cmd.plen1 = strlen(callToken); - + if(ooWriteCallStackCommand(call,&cmd) != OO_OK) { ast_free(cmd.param1); @@ -274,7 +274,7 @@ OOStkCmdStat ooManualProgress(const char *callToken) } strcpy((char*)cmd.param1, callToken); cmd.plen1 = strlen(callToken); - + if(ooWriteCallStackCommand(call, &cmd) != OO_OK) { ast_free(cmd.param1); @@ -315,7 +315,7 @@ OOStkCmdStat ooAnswerCall(const char *callToken) return OO_STKCMD_MEMERR; } strcpy((char*)cmd.param1, callToken); - cmd.plen1 = strlen(callToken); + cmd.plen1 = strlen(callToken); if(ooWriteCallStackCommand(call, &cmd) != OO_OK) { @@ -426,7 +426,7 @@ OOStkCmdStat ooHangCall(const char* callToken, OOCallClearReason reason, int q93 ast_free(cmd.param1); ast_free(cmd.param2); ast_free(cmd.param3); - + return OO_STKCMD_SUCCESS; } @@ -443,7 +443,7 @@ OOStkCmdStat ooStopMonitor() memset(&cmd, 0, sizeof(OOStackCommand)); cmd.type = OO_CMD_STOPMONITOR; - + if(ooWriteStackCommand(&cmd) != OO_OK) return OO_STKCMD_WRITEERR; @@ -485,7 +485,7 @@ OOStkCmdStat ooSendDTMFDigit(const char *callToken, const char* dtmf) cmd.plen1 = strlen(callToken); strcpy((char*)cmd.param2, dtmf); cmd.plen2 = strlen(dtmf); - + if(ooWriteCallStackCommand(call,&cmd) != OO_OK) { ast_free(cmd.param1); @@ -533,7 +533,7 @@ OOStkCmdStat ooSetANI(const char *callToken, const char* ani) cmd.plen1 = strlen(callToken); strcpy((char*)cmd.param2, ani); cmd.plen2 = strlen(ani); - + if(ooWriteCallStackCommand(call,&cmd) != OO_OK) { ast_free(cmd.param1); @@ -643,7 +643,7 @@ OOStkCmdStat ooRequestChangeMode(const char *callToken, int isT38Mode) cmd.plen1 = strlen(callToken); *((int *) cmd.param2) = isT38Mode; cmd.plen2 = sizeof(int); - + if(ooWriteCallStackCommand(call,&cmd) != OO_OK) { ast_free(cmd.param1); @@ -672,11 +672,10 @@ const char* ooGetStkCmdStatusCodeTxt(OOStkCmdStat stat) case OO_STKCMD_WRITEERR: return "Stack command - write error"; - case OO_STKCMD_CONNECTIONERR: + case OO_STKCMD_CONNECTIONERR: return "Stack command - Failed to create command channel"; default: return "Invalid status code"; } } - diff --git a/addons/ooh323c/src/ooStackCmds.h b/addons/ooh323c/src/ooStackCmds.h index df7767ce90..6b9cb88be5 100644 --- a/addons/ooh323c/src/ooStackCmds.h +++ b/addons/ooh323c/src/ooStackCmds.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooStackCmds.h + * @file ooStackCmds.h * This file contains stack commands which an user application can use to make - * call, hang call etc. + * call, hang call etc. */ #ifndef OO_STACKCMDS_H @@ -38,7 +38,7 @@ extern "C" { -/** +/** * @defgroup stackcmds Stack Control Commands * @{ */ @@ -70,11 +70,11 @@ typedef enum OOStackCmdID { OO_CMD_REQMODE, /*!< Request new mode */ OO_CMD_SETANI, /*! reRegister) ooTimerReset (pctxt, pList, pTimer); @@ -150,8 +150,8 @@ struct timeval* ooTimerNextTimeout (DList *pList, struct timeval* ptimeout) ooGetTimeOfDay (&tvstr, 0); - ptimeout->tv_sec = - OOMAX ((int) 0, (int) (ptimer->expireTime.tv_sec - tvstr.tv_sec)); + ptimeout->tv_sec = + OOMAX ((int) 0, (int) (ptimer->expireTime.tv_sec - tvstr.tv_sec)); ptimeout->tv_usec = ptimer->expireTime.tv_usec - tvstr.tv_usec; @@ -166,7 +166,7 @@ struct timeval* ooTimerNextTimeout (DList *pList, struct timeval* ptimeout) return (ptimeout); } -/* +/* * Reregister a timer entry. This function is responsible for moving * the current pointer in the timer list to the next element to be * processed.. diff --git a/addons/ooh323c/src/ooTimer.h b/addons/ooh323c/src/ooTimer.h index 2283ba4d9a..66d9f6fafd 100644 --- a/addons/ooh323c/src/ooTimer.h +++ b/addons/ooh323c/src/ooTimer.h @@ -1,20 +1,20 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the LICENSE.txt file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the LICENSE.txt file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file ooTimer.h +/** + * @file ooTimer.h * Timer structures and functions. */ #ifndef _OOTIMER_H_ @@ -41,7 +41,7 @@ extern "C" { #endif /** - * This function computes the relative expiration time from the current + * This function computes the relative expiration time from the current * time for the given timer object. * * @param pTimer Pointer to timer object. @@ -59,7 +59,7 @@ EXTERN void ooTimerComputeExpireTime (OOTimer* pTimer); * @param reRegister Should timer be re-registered after it expires? * @return Pointer to created timer object. */ -EXTERN OOTimer* ooTimerCreate +EXTERN OOTimer* ooTimerCreate (OOCTXT* pctxt, DList *pList, OOTimerCbFunc cb, OOUINT32 deltaSecs, void *data, OOBOOL reRegister); @@ -80,13 +80,13 @@ EXTERN void ooTimerDelete (OOCTXT* pctxt, DList* pList, OOTimer* pTimer); EXTERN OOBOOL ooTimerExpired (OOTimer* pTimer); /** - * This function loops through the global timer list and fires all + * This function loops through the global timer list and fires all * expired timers by calling the registered callback functions. */ EXTERN void ooTimerFireExpired (OOCTXT* pctxt, DList* pList); /** - * This function inserts the given timer object into the correct + * This function inserts the given timer object into the correct * chronological position in the global timer list. * @param pctxt Pointer to OOCTXT structure used for memory allocation. * @param pList List in which timer has to be inserted. @@ -96,7 +96,7 @@ EXTERN void ooTimerFireExpired (OOCTXT* pctxt, DList* pList); EXTERN int ooTimerInsertEntry (OOCTXT* pctxt, DList* pList, OOTimer* pTimer); /** - * This function calculates the relative time from the current time + * This function calculates the relative time from the current time * that the first timer in global timer list will expire. * @param pList Handle to timer list * @param ptimeout timeval structure to receive timeout value. @@ -105,7 +105,7 @@ EXTERN int ooTimerInsertEntry (OOCTXT* pctxt, DList* pList, OOTimer* pTimer); EXTERN struct timeval* ooTimerNextTimeout (DList* pList, struct timeval* ptimeout); /** - * This function resets the given timer object if its reregister flag + * This function resets the given timer object if its reregister flag * is set. Otherwise, it is deleted. * @param pctxt Pointer to OOCTXT structre used for memory allocation. * @param pList Pointer to timer list. diff --git a/addons/ooh323c/src/ooUtils.c b/addons/ooh323c/src/ooUtils.c index 7b5321b6d6..c71933cb73 100644 --- a/addons/ooh323c/src/ooUtils.c +++ b/addons/ooh323c/src/ooUtils.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -30,7 +30,7 @@ OOBOOL ooUtilsIsStrEmpty (const char* str) } -OOBOOL ooIsDailedDigit(const char* str) +OOBOOL ooIsDailedDigit(const char* str) { if(str == NULL || *str =='\0') { return FALSE; } while(*str != '\0') diff --git a/addons/ooh323c/src/ooUtils.h b/addons/ooh323c/src/ooUtils.h index 1a84dd42e6..78aee325c0 100644 --- a/addons/ooh323c/src/ooUtils.h +++ b/addons/ooh323c/src/ooUtils.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooUtils.h - * This file contains general utility functions. + * @file ooUtils.h + * This file contains general utility functions. */ #ifndef _OOUTILS_H_ #define _OOUTILS_H_ @@ -29,11 +29,11 @@ * @param tabsiz Number of items in the table * @return Text for item or '?' if idx outside bounds of table */ -EXTERN const char* ooUtilsGetText +EXTERN const char* ooUtilsGetText (OOUINT32 idx, const char** table, size_t tabsiz); /** - * Test if given string value is empty. String is considered to empty + * Test if given string value is empty. String is considered to empty * if value is NULL or there are no characters in string (strlen == 0). * * @param str String to test @@ -43,7 +43,7 @@ EXTERN OOBOOL ooUtilsIsStrEmpty (const char * str); /** - * Test if given string value is digit string. + * Test if given string value is digit string. * * @param str String to test * @return TRUE if string contains all digits; FALSE otherwise diff --git a/addons/ooh323c/src/ooasn1.h b/addons/ooh323c/src/ooasn1.h index e75ff6d63f..8355c54d05 100644 --- a/addons/ooh323c/src/ooasn1.h +++ b/addons/ooh323c/src/ooasn1.h @@ -1,22 +1,22 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file ooasn1.h +/** + * @file ooasn1.h * Common ASN.1 runtime constants, data structure definitions, and run-time - * functions to support ASN.1 PER encoding/decoding as defined in the + * functions to support ASN.1 PER encoding/decoding as defined in the * ITU-T standards. */ #ifndef _OOASN1_H_ @@ -31,8 +31,8 @@ #include #include "dlist.h" #include "ootrace.h" -/** - * @defgroup cruntime C Runtime Common Functions +/** + * @defgroup cruntime C Runtime Common Functions * @{ */ @@ -237,7 +237,7 @@ defined(_WIN32) #elif defined(__IBMC__) || defined(__GNUC__) || defined(__SUNPRO_C) || \ defined(__SUNPRO_CC) || defined(__CC_ARM) || \ -defined(__HPUX_CC__) || defined(__HP_aCC) +defined(__HPUX_CC__) || defined(__HP_aCC) #define ASN1INT64 long long #else /* !MSC_VER && !__IBMC__ etc */ @@ -423,7 +423,7 @@ typedef struct OOCTXT { /* context block */ #endif /** - * @defgroup mem Memory Allocation Macros and Functions + * @defgroup mem Memory Allocation Macros and Functions * @ingroup cruntime * * Memory allocation functions and macros handle memory management for the @@ -570,7 +570,7 @@ decodeConstrainedStringEx (pctxt, pvalue, permCharSet, 8, 7, 7) /* Context management functions */ /** - * @defgroup cmfun Context Management Functions + * @defgroup cmfun Context Management Functions * @{ * * Context initialization functions handle the allocation, initialization, and @@ -601,7 +601,7 @@ decodeConstrainedStringEx (pctxt, pvalue, permCharSet, 8, 7, 7) * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int initContextBuffer +EXTERN int initContextBuffer (OOCTXT* pctxt, const ASN1OCTET* bufaddr, ASN1UINT bufsiz); /** @@ -643,17 +643,17 @@ EXTERN int initSubContext (OOCTXT* pctxt, OOCTXT* psrc); EXTERN void setCtxtFlag (OOCTXT* pctxt, ASN1USINT mask); EXTERN void clearCtxtFlag (OOCTXT* pctxt, ASN1USINT mask); -EXTERN int setPERBuffer +EXTERN int setPERBuffer (OOCTXT* pctxt, ASN1OCTET* bufaddr, ASN1UINT bufsiz, ASN1BOOL aligned); EXTERN int setPERBufferUsingCtxt (OOCTXT* pTarget, OOCTXT* pSource); #define ZEROCONTEXT(pctxt) memset(pctxt,0,sizeof(OOCTXT)) -/** +/** * @} cmfun */ /** - * @defgroup errfp Error Formatting and Print Functions + * @defgroup errfp Error Formatting and Print Functions * @{ * * Error formatting and print functions allow information about the @@ -691,7 +691,7 @@ EXTERN int errAddIntParm (ASN1ErrInfo* pErrInfo, int errParm); * @param errprm_p The typed error parameter. * @return The status of the operation. */ -EXTERN int errAddStrParm (ASN1ErrInfo* pErrInfo, +EXTERN int errAddStrParm (ASN1ErrInfo* pErrInfo, const char* errprm_p); /** @@ -711,7 +711,7 @@ EXTERN int errAddStrParm (ASN1ErrInfo* pErrInfo, EXTERN int errAddUIntParm (ASN1ErrInfo* pErrInfo, unsigned int errParm); -EXTERN int errCopyData (ASN1ErrInfo* pSrcErrInfo, +EXTERN int errCopyData (ASN1ErrInfo* pSrcErrInfo, ASN1ErrInfo* pDestErrInfo); /** @@ -764,7 +764,7 @@ EXTERN void errPrint (ASN1ErrInfo* pErrInfo); */ EXTERN int errReset (ASN1ErrInfo* pErrInfo); -/** +/** * This function sets error information in an error information structure. The * information set includes status code, module name, and line number. Location * information (i.e. module name and line number) is pushed onto a stack within @@ -787,7 +787,7 @@ EXTERN int errReset (ASN1ErrInfo* pErrInfo); * information and return the status value in one line of * code. */ -EXTERN int errSetData (ASN1ErrInfo* pErrInfo, int status, +EXTERN int errSetData (ASN1ErrInfo* pErrInfo, int status, const char* module, int lno); #ifndef _COMPACT @@ -802,8 +802,8 @@ errSetData(&(ctxt)->errInfo,stat,__FILE__,__LINE__) #define LOG_ASN1ERR_AND_FREE(pctxt,stat,lctxt) \ freeContext ((lctxt)), LOG_ASN1ERR(pctxt, stat) -/** - * @} +/** + * @} */ #define RT_MH_DONTKEEPFREE 0x1 @@ -819,12 +819,12 @@ freeContext ((lctxt)), LOG_ASN1ERR(pctxt, stat) * @{ */ /** - * Allocate memory. This macro allocates the given number of bytes. It is + * Allocate memory. This macro allocates the given number of bytes. It is * similar to the C \c malloc run-time function. - * + * * @param pctxt - Pointer to a context block * @param nbytes - Number of bytes of memory to allocate - * @return - Void pointer to allocated memory or NULL if insufficient memory + * @return - Void pointer to allocated memory or NULL if insufficient memory * was available to fulfill the request. */ #define memAlloc(pctxt,nbytes) \ @@ -833,41 +833,41 @@ memHeapAlloc(&(pctxt)->pTypeMemHeap,nbytes) /** * Allocate and zero memory. This macro allocates the given number of bytes * and then initializes the memory block to zero. - * + * * @param pctxt - Pointer to a context block * @param nbytes - Number of bytes of memory to allocate - * @return - Void pointer to allocated memory or NULL if insufficient memory + * @return - Void pointer to allocated memory or NULL if insufficient memory * was available to fulfill the request. */ #define memAllocZ(pctxt,nbytes) \ memHeapAllocZ(&(pctxt)->pTypeMemHeap,nbytes) /** - * Reallocate memory. This macro reallocates a memory block (either - * expands or contracts) to the given number of bytes. It is + * Reallocate memory. This macro reallocates a memory block (either + * expands or contracts) to the given number of bytes. It is * similar to the C \c realloc run-time function. - * + * * @param pctxt - Pointer to a context block - * @param mem_p - Pointer to memory block to reallocate. This must have been + * @param mem_p - Pointer to memory block to reallocate. This must have been * allocated using the memHeapAlloc macro or the memHeapAlloc function. - * @param nbytes - Number of bytes of memory to which the block is to be + * @param nbytes - Number of bytes of memory to which the block is to be * resized. - * @return - Void pointer to allocated memory or NULL if insufficient memory - * was available to fulfill the request. This may be the same as the pmem + * @return - Void pointer to allocated memory or NULL if insufficient memory + * was available to fulfill the request. This may be the same as the pmem * pointer that was passed in if the block did not need to be relocated. */ #define memRealloc(pctxt,mem_p,nbytes) \ memHeapRealloc(&(pctxt)->pTypeMemHeap, (void*)mem_p, nbytes) /** - * Free memory pointer. This macro frees memory at the given pointer. - * The memory must have been allocated using the memHeapAlloc (or similar) - * macros or the mem memory allocation macros. This macro is + * Free memory pointer. This macro frees memory at the given pointer. + * The memory must have been allocated using the memHeapAlloc (or similar) + * macros or the mem memory allocation macros. This macro is * similar to the C \c free function. - * + * * @param pctxt - Pointer to a context block - * @param mem_p - Pointer to memory block to free. This must have - * been allocated using the memHeapAlloc or memAlloc macro or the + * @param mem_p - Pointer to memory block to free. This must have + * been allocated using the memHeapAlloc or memAlloc macro or the * memHeapAlloc function. */ #define memFreePtr(pctxt,mem_p) \ @@ -875,34 +875,34 @@ if (memHeapCheckPtr (&(pctxt)->pTypeMemHeap, (void*)mem_p)) \ memHeapFreePtr(&(pctxt)->pTypeMemHeap, (void*)mem_p) /** - * Free memory associated with a context. This macro frees all memory - * held within a context. This is all memory allocated using the - * memHeapAlloc (and similar macros) and the mem memory allocation + * Free memory associated with a context. This macro frees all memory + * held within a context. This is all memory allocated using the + * memHeapAlloc (and similar macros) and the mem memory allocation * functions using the given context variable. - * + * * @param pctxt - Pointer to a context block */ #define memFree(pctxt) \ memHeapFreeAll(&(pctxt)->pTypeMemHeap) /** - * Reset memory associated with a context. This macro resets all memory - * held within a context. This is all memory allocated using the memHeapAlloc - * (and similar macros) and the mem memory allocation functions using the + * Reset memory associated with a context. This macro resets all memory + * held within a context. This is all memory allocated using the memHeapAlloc + * (and similar macros) and the mem memory allocation functions using the * given context variable. * - *

The difference between this and the ASN1MEMFREE macro is that the - * memory blocks held within the context are not actually freed. Internal - * pointers are reset so the existing blocks can be reused. This can - * provide a performace improvement for repetitive tasks such as decoding + *

The difference between this and the ASN1MEMFREE macro is that the + * memory blocks held within the context are not actually freed. Internal + * pointers are reset so the existing blocks can be reused. This can + * provide a performace improvement for repetitive tasks such as decoding * messages in a loop. - * + * * @param pctxt - Pointer to a context block */ #define memReset(pctxt) \ memHeapReset(&(pctxt)->pTypeMemHeap) -/* Alias for __cdecl modifier; if __cdecl keyword is not supported, +/* Alias for __cdecl modifier; if __cdecl keyword is not supported, * redefine it as empty macro. */ #if !defined(OSCDECL) @@ -931,10 +931,10 @@ EXTERN void* memHeapRealloc (void** ppvMemHeap, void* mem_p, int nbytes_); EXTERN void memHeapRelease (void** ppvMemHeap); EXTERN void memHeapReset (void** ppvMemHeap); -EXTERN void* memHeapMarkSaved +EXTERN void* memHeapMarkSaved (void** ppvMemHeap, const void* mem_p, ASN1BOOL saved); -EXTERN void memHeapSetProperty +EXTERN void memHeapSetProperty (void** ppvMemHeap, ASN1UINT propId, void* pProp); @@ -1049,7 +1049,7 @@ csetvar.charSetAlignedBits = abits; * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeBits +EXTERN int decodeBits (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT nbits); /** @@ -1072,7 +1072,7 @@ EXTERN int decodeBits * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeBitString +EXTERN int decodeBitString (OOCTXT* pctxt, ASN1UINT* numbits_p, ASN1OCTET* buffer, ASN1UINT bufsiz); @@ -1100,7 +1100,7 @@ EXTERN int decodeBitString * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeBMPString +EXTERN int decodeBMPString (OOCTXT* pctxt, ASN1BMPString* pvalue, Asn116BitCharSet* permCharSet); /** @@ -1128,7 +1128,7 @@ EXTERN int decodeByteAlign (OOCTXT* pctxt); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConsInteger +EXTERN int decodeConsInteger (OOCTXT* pctxt, ASN1INT* pvalue, ASN1INT lower, ASN1INT upper); /** @@ -1144,7 +1144,7 @@ EXTERN int decodeConsInteger * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConsUnsigned +EXTERN int decodeConsUnsigned (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT lower, ASN1UINT upper); /** @@ -1160,7 +1160,7 @@ EXTERN int decodeConsUnsigned * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConsUInt8 (OOCTXT* pctxt, +EXTERN int decodeConsUInt8 (OOCTXT* pctxt, ASN1UINT8* pvalue, ASN1UINT lower, ASN1UINT upper); /** @@ -1176,7 +1176,7 @@ EXTERN int decodeConsUInt8 (OOCTXT* pctxt, * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConsUInt16 +EXTERN int decodeConsUInt16 (OOCTXT* pctxt, ASN1USINT* pvalue, ASN1UINT lower, ASN1UINT upper); /** @@ -1196,7 +1196,7 @@ EXTERN int decodeConsUInt16 * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConsWholeNumber +EXTERN int decodeConsWholeNumber (OOCTXT* pctxt, ASN1UINT* padjusted_value, ASN1UINT range_value); /** @@ -1218,7 +1218,7 @@ EXTERN int decodeConsWholeNumber * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeConstrainedStringEx +EXTERN int decodeConstrainedStringEx (OOCTXT* pctxt, const char** string, const char* charSet, ASN1UINT abits, ASN1UINT ubits, ASN1UINT canSetBits); @@ -1262,7 +1262,7 @@ EXTERN int decodeDynBitString (OOCTXT* pctxt, ASN1DynBitStr* pBitStr); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeDynOctetString +EXTERN int decodeDynOctetString (OOCTXT* pctxt, ASN1DynOctStr* pOctStr); /** @@ -1321,14 +1321,14 @@ EXTERN int decodeObjectIdentifier (OOCTXT* pctxt, ASN1OBJID* pvalue); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeOctetString +EXTERN int decodeOctetString (OOCTXT* pctxt, ASN1UINT* numocts_p, ASN1OCTET* buffer, ASN1UINT bufsiz); /** * This function will decode an ASN.1 open type. This used to be the ASN.1 ANY - * type, but now is used in a variety of applications requiring an encoding - * that can be interpreted by a decoder without prior knowledge of the type + * type, but now is used in a variety of applications requiring an encoding + * that can be interpreted by a decoder without prior knowledge of the type * of the variable. * * @param pctxt Pointer to a context structure. This provides a storage @@ -1342,7 +1342,7 @@ EXTERN int decodeOctetString * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeOpenType +EXTERN int decodeOpenType (OOCTXT* pctxt, const ASN1OCTET** object_p2, ASN1UINT* numocts_p); /** @@ -1360,7 +1360,7 @@ EXTERN int decodeOpenType * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeSmallNonNegWholeNumber +EXTERN int decodeSmallNonNegWholeNumber (OOCTXT* pctxt, ASN1UINT* pvalue); /** @@ -1374,7 +1374,7 @@ EXTERN int decodeSmallNonNegWholeNumber * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeSemiConsInteger +EXTERN int decodeSemiConsInteger (OOCTXT* pctxt, ASN1INT* pvalue, ASN1INT lower); /** @@ -1389,7 +1389,7 @@ EXTERN int decodeSemiConsInteger * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int decodeSemiConsUnsigned +EXTERN int decodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT* pvalue, ASN1UINT lower); /** @@ -1420,7 +1420,7 @@ decodeSemiConsUnsigned(pctxt, pvalue, 0U) EXTERN int decodeVarWidthCharString (OOCTXT* pctxt, const char** pvalue); /** - * This function will encode a variable of the ASN.1 BOOLEAN type in + * This function will encode a variable of the ASN.1 BOOLEAN type in * a single bit. * * @param pctxt Pointer to a context structure. This provides a storage @@ -1440,7 +1440,7 @@ EXTERN int encodeBit (OOCTXT* pctxt, ASN1BOOL value); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeBits +EXTERN int encodeBits (OOCTXT* pctxt, ASN1UINT value, ASN1UINT nbits); /** @@ -1456,7 +1456,7 @@ EXTERN int encodeBits * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeBitString +EXTERN int encodeBitString (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data); /** @@ -1482,7 +1482,7 @@ EXTERN int encodeBitString * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeBMPString +EXTERN int encodeBMPString (OOCTXT* pctxt, ASN1BMPString value, Asn116BitCharSet* permCharSet); /** @@ -1532,7 +1532,7 @@ EXTERN int encodeCheckBuffer (OOCTXT* pctxt, ASN1UINT nbytes); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeConstrainedStringEx +EXTERN int encodeConstrainedStringEx (OOCTXT* pctxt, const char* string, const char* charSet, ASN1UINT abits, ASN1UINT ubits, ASN1UINT canSetBits); @@ -1548,7 +1548,7 @@ EXTERN int encodeConstrainedStringEx * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeConsInteger +EXTERN int encodeConsInteger (OOCTXT* pctxt, ASN1INT value, ASN1INT lower, ASN1INT upper); /** @@ -1566,7 +1566,7 @@ EXTERN int encodeConsInteger * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeConsUnsigned +EXTERN int encodeConsUnsigned (OOCTXT* pctxt, ASN1UINT value, ASN1UINT lower, ASN1UINT upper); /** @@ -1584,7 +1584,7 @@ EXTERN int encodeConsUnsigned * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeConsWholeNumber +EXTERN int encodeConsWholeNumber (OOCTXT* pctxt, ASN1UINT adjusted_value, ASN1UINT range_value); /** @@ -1608,7 +1608,7 @@ EXTERN int encodeExpandBuffer (OOCTXT* pctxt, ASN1UINT nbytes); * to get the pointer and length of the message. It is normally used when * dynamic encoding is specified because the message pointer is not known until * encoding is complete. If static encoding is used, the message starts at the - * beginning of the specified buffer adn the encodeGetMsgLen function can be + * beginning of the specified buffer adn the encodeGetMsgLen function can be * used to obtain the lenght of the message. * * @param pctxt Pointer to a context structure. This provides a storage @@ -1675,7 +1675,7 @@ EXTERN int encodebitsFromOctet (OOCTXT* pctxt, ASN1OCTET value, ASN1UINT nbits); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeOctets +EXTERN int encodeOctets (OOCTXT* pctxt, const ASN1OCTET* pvalue, ASN1UINT nbits); /** @@ -1690,7 +1690,7 @@ EXTERN int encodeOctets * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeOctetString +EXTERN int encodeOctetString (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data); /** @@ -1708,7 +1708,7 @@ EXTERN int encodeOctetString * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeOpenType +EXTERN int encodeOpenType (OOCTXT* pctxt, ASN1UINT numocts, const ASN1OCTET* data); /** @@ -1729,10 +1729,10 @@ EXTERN int encodeOpenType * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeOpenTypeExt +EXTERN int encodeOpenTypeExt (OOCTXT* pctxt, DList* pElemList); -EXTERN int encodeOpenTypeExtBits +EXTERN int encodeOpenTypeExtBits (OOCTXT* pctxt, DList* pElemList); /** @@ -1762,7 +1762,7 @@ EXTERN int encodeSmallNonNegWholeNumber (OOCTXT* pctxt, ASN1UINT value); * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeSemiConsInteger +EXTERN int encodeSemiConsInteger (OOCTXT* pctxt, ASN1INT value, ASN1INT lower); /** @@ -1776,7 +1776,7 @@ EXTERN int encodeSemiConsInteger * - 0 (ASN_OK) = success, * - negative return value is error. */ -EXTERN int encodeSemiConsUnsigned +EXTERN int encodeSemiConsUnsigned (OOCTXT* pctxt, ASN1UINT value, ASN1UINT lower); /** @@ -1791,15 +1791,15 @@ EXTERN int encodeSemiConsUnsigned #define encodeUnconsInteger(pctxt,value) \ encodeSemiConsInteger(pctxt,value,ASN1INT_MIN) -EXTERN int encodeVarWidthCharString (OOCTXT* pctxt, const char* value); +EXTERN int encodeVarWidthCharString (OOCTXT* pctxt, const char* value); EXTERN int addSizeConstraint (OOCTXT* pctxt, Asn1SizeCnst* pSize); -EXTERN ASN1BOOL alignCharStr +EXTERN ASN1BOOL alignCharStr (OOCTXT* pctxt, ASN1UINT len, ASN1UINT nbits, Asn1SizeCnst* pSize); -EXTERN int bitAndOctetStringAlignmentTest -(Asn1SizeCnst* pSizeList, ASN1UINT itemCount, +EXTERN int bitAndOctetStringAlignmentTest +(Asn1SizeCnst* pSizeList, ASN1UINT itemCount, ASN1BOOL bitStrFlag, ASN1BOOL* pAlignFlag); EXTERN int getPERMsgLen (OOCTXT* pctxt); @@ -1811,20 +1811,20 @@ EXTERN Asn1SizeCnst* getSizeConstraint (OOCTXT* pctxt, ASN1BOOL extbit); EXTERN int checkSizeConstraint(OOCTXT* pctxt, int size); EXTERN ASN1UINT getUIntBitCount (ASN1UINT value); -EXTERN Asn1SizeCnst* checkSize +EXTERN Asn1SizeCnst* checkSize (Asn1SizeCnst* pSizeList, ASN1UINT value, ASN1BOOL* pExtendable); -EXTERN void init16BitCharSet +EXTERN void init16BitCharSet (Asn116BitCharSet* pCharSet, ASN116BITCHAR first, ASN116BITCHAR last, ASN1UINT abits, ASN1UINT ubits); EXTERN ASN1BOOL isExtendableSize (Asn1SizeCnst* pSizeList); -EXTERN void set16BitCharSet +EXTERN void set16BitCharSet (OOCTXT* pctxt, Asn116BitCharSet* pCharSet, Asn116BitCharSet* pAlphabet); #ifdef __cplusplus } #endif -#endif +#endif diff --git a/addons/ooh323c/src/oochannels.c b/addons/ooh323c/src/oochannels.c index 0501882a9b..ca7b09c99d 100644 --- a/addons/ooh323c/src/oochannels.c +++ b/addons/ooh323c/src/oochannels.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -19,7 +19,7 @@ #include "asterisk/config.h" #include "asterisk/netsock2.h" -#include "ooports.h" +#include "ooports.h" #include "oochannels.h" #include "ootrace.h" #include "ooq931.h" @@ -69,7 +69,7 @@ int ooCreateH245Listener(OOH323CallData *call) "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - ret = ooBindPort (OOTCP, channelSocket, call->localIP); + ret = ooBindPort (OOTCP, channelSocket, call->localIP); if(ret == OO_FAILED) { OOTRACEERR3("Error:Unable to bind to a TCP port - H245 listener creation" @@ -83,12 +83,12 @@ int ooCreateH245Listener(OOH323CallData *call) ret = ooSocketListen(*(call->h245listener), 4096); if(ret != ASN_OK) { - OOTRACEERR3("Error:Unable to listen on H.245 socket (%s, %s)\n", + OOTRACEERR3("Error:Unable to listen on H.245 socket (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - - OOTRACEINFO4("H245 listener creation - successful(port %d) (%s, %s)\n", + + OOTRACEINFO4("H245 listener creation - successful(port %d) (%s, %s)\n", *(call->h245listenport),call->callType, call->callToken); return OO_OK; } @@ -109,7 +109,7 @@ int ooCreateH245Connection(OOH323CallData *call) else { if (0 == call->pH245Channel) { - call->pH245Channel = + call->pH245Channel = (OOH323Channel*) memAllocZ (call->pctxt, sizeof(OOH323Channel)); } @@ -117,7 +117,7 @@ int ooCreateH245Connection(OOH323CallData *call) bind socket to a port before connecting. Thus avoiding implicit bind done by a connect call. */ - ret = ooBindPort(OOTCP, channelSocket, call->localIP); + ret = ooBindPort(OOTCP, channelSocket, call->localIP); if(ret == OO_FAILED) { OOTRACEERR3("Error:Unable to bind to a TCP port - h245 connection " @@ -125,13 +125,13 @@ int ooCreateH245Connection(OOH323CallData *call) return OO_FAILED; } call->pH245Channel->port = ret; - OOTRACEDBGC4("Local H.245 port is %d (%s, %s)\n", + OOTRACEDBGC4("Local H.245 port is %d (%s, %s)\n", call->pH245Channel->port, call->callType, call->callToken); OOTRACEINFO5("Trying to connect to remote endpoint to setup H245 " - "connection %s:%d(%s, %s)\n", call->remoteIP, + "connection %s:%d(%s, %s)\n", call->remoteIP, call->remoteH245Port, call->callType, call->callToken); - + if((ret=ooSocketConnect(channelSocket, call->remoteIP, call->remoteH245Port))==ASN_OK) { @@ -155,7 +155,7 @@ int ooCreateH245Connection(OOH323CallData *call) if(call->h245ConnectionAttempts >= 3) { OOTRACEERR3("Error:Failed to setup an H245 connection with remote " - "destination. (%s, %s)\n", call->callType, + "destination. (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { @@ -170,20 +170,20 @@ int ooCreateH245Connection(OOH323CallData *call) "(%s, %s)\n", DEFAULT_H245CONNECTION_RETRYTIMEOUT, call->callType, call->callToken); - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { OOTRACEERR3("Error:Unable to allocate memory for timer " - "callback.(%s, %s)\n", call->callType, + "callback.(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } cbData->call = call; cbData->timerType = OO_H245CONNECT_TIMER; - if(!ooTimerCreate(call->pctxt, &call->timerList, - &ooCallH245ConnectionRetryTimerExpired, - DEFAULT_H245CONNECTION_RETRYTIMEOUT, cbData, + if(!ooTimerCreate(call->pctxt, &call->timerList, + &ooCallH245ConnectionRetryTimerExpired, + DEFAULT_H245CONNECTION_RETRYTIMEOUT, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create H245 connection retry timer" @@ -215,14 +215,14 @@ int ooSendH225Msg(OOH323CallData *call, Q931Message *msg) iRet = ooEncodeH225Message(call, msg, (char *)encodebuf, MAXMSGLEN); if(iRet != OO_OK) { - OOTRACEERR3("Error:Failed to encode H225 message. (%s, %s)\n", + OOTRACEERR3("Error:Failed to encode H225 message. (%s, %s)\n", call->callType, call->callToken); memFreePtr (call->pctxt, encodebuf); return OO_FAILED; } /* If high priority messages, send immediately.*/ - if(encodebuf[0] == OOReleaseComplete || + if(encodebuf[0] == OOReleaseComplete || (encodebuf[0]==OOFacility && encodebuf[1]==OOEndSessionCommand)) { dListFreeAll(call->pctxt, &call->pH225Channel->outQueue); @@ -231,10 +231,10 @@ int ooSendH225Msg(OOH323CallData *call, Q931Message *msg) } else{ dListAppend (call->pctxt, &call->pH225Channel->outQueue, encodebuf); - - OOTRACEDBGC4("Queued H225 messages %d. (%s, %s)\n", - call->pH225Channel->outQueue.count, - call->callType, call->callToken); + + OOTRACEDBGC4("Queued H225 messages %d. (%s, %s)\n", + call->pH225Channel->outQueue.count, + call->callType, call->callToken); } return OO_OK; } @@ -259,20 +259,20 @@ int ooCreateH225Connection(OOH323CallData *call) { /* bind socket to a port before connecting. Thus avoiding - implicit bind done by a connect call. Avoided on windows as + implicit bind done by a connect call. Avoided on windows as windows sockets have problem in reusing the addresses even after setting SO_REUSEADDR, hence in windows we just allow os to bind to any random port. */ #ifndef _WIN32 - ret = ooBindPort(OOTCP,channelSocket, call->localIP); + ret = ooBindPort(OOTCP,channelSocket, call->localIP); #else ret = ooBindOSAllocatedPort(channelSocket, call->localIP); #endif - + if(ret == OO_FAILED) { - OOTRACEERR3("Error:Unable to bind to a TCP port (%s, %s)\n", + OOTRACEERR3("Error:Unable to bind to a TCP port (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { @@ -283,13 +283,13 @@ int ooCreateH225Connection(OOH323CallData *call) } if (0 == call->pH225Channel) { - call->pH225Channel = + call->pH225Channel = (OOH323Channel*) memAllocZ (call->pctxt, sizeof(OOH323Channel)); } call->pH225Channel->port = ret; OOTRACEINFO6("Trying to connect to remote endpoint(%s:%d) (IPv%d) to setup " - "H2250 channel (%s, %s)\n", call->remoteIP, + "H2250 channel (%s, %s)\n", call->remoteIP, call->remotePort, call->versionIP, call->callType, call->callToken); if((ret=ooSocketConnect(channelSocket, call->remoteIP, @@ -304,14 +304,14 @@ int ooCreateH225Connection(OOH323CallData *call) if(!strcmp(call->localIP, "0.0.0.0") || !strcmp(call->localIP, "::")) { OOTRACEDBGA3("Determining IP address for outgoing call in " - "multihomed mode. (%s, %s)\n", call->callType, + "multihomed mode. (%s, %s)\n", call->callType, call->callToken); - ret = ooSocketGetIpAndPort(channelSocket, call->localIP, 2+8*4+7, + ret = ooSocketGetIpAndPort(channelSocket, call->localIP, 2+8*4+7, &call->pH225Channel->port, NULL); if(ret != ASN_OK) { OOTRACEERR3("ERROR:Failed to retrieve local ip and port from " - "socket for multihomed mode.(%s, %s)\n", + "socket for multihomed mode.(%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { /* transport failure */ @@ -321,7 +321,7 @@ int ooCreateH225Connection(OOH323CallData *call) return OO_FAILED; } OOTRACEDBGA4("Using local ip %s for outgoing call(multihomedMode)." - " (%s, %s)\n", call->localIP, call->callType, + " (%s, %s)\n", call->localIP, call->callType, call->callToken); } return OO_OK; @@ -377,12 +377,12 @@ int ooCreateH323Listener() OOTRACEERR1("Failed to create socket for H323 Listener\n"); return OO_FAILED; } - if((ret=ooSocketBind (channelSocket, ipaddrs, - gH323ep.listenPort))==ASN_OK) + if((ret=ooSocketBind (channelSocket, ipaddrs, + gH323ep.listenPort))==ASN_OK) { gH323ep.listener = (OOSOCKET*)memAlloc(&gH323ep.ctxt,sizeof(OOSOCKET)); *(gH323ep.listener) = channelSocket; - + ooSocketListen(channelSocket,2048); /*listen on socket*/ OOTRACEINFO1("H323 listener creation - successful\n"); return OO_OK; @@ -396,7 +396,7 @@ int ooCreateH323Listener() -int ooAcceptH225Connection() +int ooAcceptH225Connection() { OOH323CallData * call; int ret; @@ -405,7 +405,7 @@ int ooAcceptH225Connection() OOSOCKET h225Channel=0; memset(remoteIP, 0, sizeof(remoteIP)); - ret = ooSocketAccept (*(gH323ep.listener), &h225Channel, + ret = ooSocketAccept (*(gH323ep.listener), &h225Channel, remoteIP, NULL); if(ret != ASN_OK) { @@ -422,7 +422,7 @@ int ooAcceptH225Connection() } ast_mutex_lock(&call->Lock); - call->pH225Channel = (OOH323Channel*) + call->pH225Channel = (OOH323Channel*) memAllocZ (call->pctxt, sizeof(OOH323Channel)); call->pH225Channel->sock = h225Channel; @@ -434,12 +434,12 @@ int ooAcceptH225Connection() "mode (%s, %s)\n", call->callType, call->callToken); } - ret = ooSocketGetIpAndPort(h225Channel, call->localIP, 2+8*4+7, + ret = ooSocketGetIpAndPort(h225Channel, call->localIP, 2+8*4+7, &call->pH225Channel->port, &call->versionIP); if(ret != ASN_OK) { OOTRACEERR3("Error:Failed to retrieve local ip and port from " - "socket for multihomed mode.(%s, %s)\n", + "socket for multihomed mode.(%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { /* transport failure */ @@ -450,13 +450,13 @@ int ooAcceptH225Connection() return OO_FAILED; } OOTRACEDBGA5("Using Local IP address %s (IPv%d) for incoming call " - "(%s, %s)\n", call->localIP, call->versionIP, call->callType, + "(%s, %s)\n", call->localIP, call->versionIP, call->callType, call->callToken); if (remoteIP[0]) { strncpy(call->remoteIP, remoteIP, strlen(remoteIP)); } - + ast_mutex_unlock(&call->Lock); return OO_OK; } @@ -465,7 +465,7 @@ int ooAcceptH245Connection(OOH323CallData *call) { int ret; OOSOCKET h245Channel=0; - ret = ooSocketAccept (*(call->h245listener), &h245Channel, + ret = ooSocketAccept (*(call->h245listener), &h245Channel, NULL, NULL); if(ret != ASN_OK) { @@ -474,14 +474,14 @@ int ooAcceptH245Connection(OOH323CallData *call) } if (0 == call->pH245Channel) { - call->pH245Channel = + call->pH245Channel = (OOH323Channel*) memAllocZ (call->pctxt, sizeof(OOH323Channel)); } - call->pH245Channel->sock = h245Channel; + call->pH245Channel->sock = h245Channel; call->h245SessionState = OO_H245SESSION_ACTIVE; - OOTRACEINFO3("H.245 connection established (%s, %s)\n", + OOTRACEINFO3("H.245 connection established (%s, %s)\n", call->callType, call->callToken); return OO_OK; @@ -553,14 +553,14 @@ int ooSetCallFDSETs(OOH323CallData* call, struct pollfd* pfds, int *nfds) pfds[*nfds].events = POLLIN; if (call->pH225Channel->outQueue.count > 0 || - (OO_TESTFLAG (call->flags, OO_M_TUNNELING) && - 0 != call->pH245Channel && + (OO_TESTFLAG (call->flags, OO_M_TUNNELING) && + 0 != call->pH245Channel && call->pH245Channel->outQueue.count>0)) pfds[*nfds].events |= POLLOUT; (*nfds)++; } - + if (0 != call->pH245Channel && call->pH245Channel->sock != 0) { pfds[*nfds].fd = call->pH245Channel->sock; pfds[*nfds].events = POLLIN; @@ -581,7 +581,7 @@ int ooSetCallFDSETs(OOH323CallData* call, struct pollfd* pfds, int *nfds) return OO_OK; } - + int ooProcessFDSETsAndTimers (struct pollfd* pfds, int nfds, struct timeval *pToMin) { @@ -589,8 +589,8 @@ int ooProcessFDSETsAndTimers /* Process gatekeeper client timers */ if(gH323ep.gkClient) - { - ooTimerFireExpired(&gH323ep.gkClient->ctxt, + { + ooTimerFireExpired(&gH323ep.gkClient->ctxt, &gH323ep.gkClient->timerList); if(ooTimerNextTimeout(&gH323ep.gkClient->timerList, &toNext)) { @@ -627,10 +627,10 @@ int ooProcessFDSETsAndTimers { OOTRACEDBGA1("New connection at H225 receiver\n"); ooAcceptH225Connection(); - } + } } - - + + return OO_OK; } @@ -692,7 +692,7 @@ int ooProcessCallFDSETsAndTimers OOTRACEDBGC3("Incoming H.245 connection (%s, %s)\n", call->callType, call->callToken); ooAcceptH245Connection(call); - } + } } if (0 != call->pH225Channel && 0 != call->pH225Channel->sock) @@ -701,21 +701,21 @@ int ooProcessCallFDSETsAndTimers { if (call->pH225Channel->outQueue.count>0) { - OOTRACEDBGC3("Sending H225 message (%s, %s)\n", + OOTRACEDBGC3("Sending H225 message (%s, %s)\n", call->callType, call->callToken); if (ooSendMsg(call, OOQ931MSG) != OO_OK) OOTRACEERR1("Error in sending h225 message\n"); } - if(call->pH245Channel && - call->pH245Channel->outQueue.count>0 && + if(call->pH245Channel && + call->pH245Channel->outQueue.count>0 && OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OOTRACEDBGC3("H245 message needs to be tunneled. " - "(%s, %s)\n", call->callType, + "(%s, %s)\n", call->callType, call->callToken); if (ooSendMsg(call, OOH245MSG) != OO_OK) OOTRACEERR1("Error in sending h245 message\n"); } - } + } } if(ooTimerNextTimeout(&call->timerList, &toNext)) @@ -743,7 +743,7 @@ int ooProcessCallFDSETsAndTimers return OO_OK; } - + int ooMonitorCmdChannels() { int ret=0, nfds=0; @@ -754,7 +754,7 @@ int ooMonitorCmdChannels() toMin.tv_sec = 3; toMin.tv_usec = 0; - + while(1) { nfds = 0; @@ -765,7 +765,7 @@ int ooMonitorCmdChannels() break; } - + if(nfds == 0) #ifdef _WIN32 Sleep(10); @@ -778,12 +778,12 @@ int ooMonitorCmdChannels() #endif else ret = ooSocketPoll(pfds, nfds, toMin.tv_sec * 1000 + toMin.tv_usec / 1000); - + if(ret == -1) { - + OOTRACEERR1("Error in poll ...exiting\n"); - exit(-1); + exit(-1); continue; } @@ -814,7 +814,7 @@ int ooMonitorChannels() toMin.tv_sec = 3; toMin.tv_usec = 0; ooH323EpPrintConfig(); - + if(gH323ep.gkClient) { ooGkClientPrintConfig(gH323ep.gkClient); if(OO_OK != ooGkClientStart(gH323ep.gkClient)) @@ -824,7 +824,7 @@ int ooMonitorChannels() // ooGkClientDestroy(); } } - + while(1) { nfds = 0; @@ -835,7 +835,7 @@ int ooMonitorChannels() break; } - + if(nfds == 0) #ifdef _WIN32 Sleep(10); @@ -848,10 +848,10 @@ int ooMonitorChannels() #endif else ret = ooSocketPoll(pfds, nfds, toMin.tv_sec * 1000 + toMin.tv_usec / 1000); - + if(ret == -1) { - + OOTRACEERR1("Error in poll ...exiting\n"); exit(-1); } @@ -859,7 +859,7 @@ int ooMonitorChannels() toMin.tv_sec = 2; /* 2 sec */ toMin.tv_usec = 100000; /* 100ms*/ /*This is for test application. Not part of actual stack */ - + ast_mutex_lock(&monitorLock); ooTimerFireExpired(&gH323ep.ctxt, &g_TimerList); if(ooTimerNextTimeout(&g_TimerList, &toNext)) @@ -895,7 +895,7 @@ int ooMonitorCallChannels(OOH323CallData *call) toMin.tv_sec = 3; toMin.tv_usec = 0; - + while(1) { if(!call->Monitor) { @@ -906,7 +906,7 @@ int ooMonitorCallChannels(OOH323CallData *call) nfds = 0; ooSetCallFDSETs(call, pfds, &nfds); - + if(nfds == 0) #ifdef _WIN32 Sleep(10); @@ -924,10 +924,10 @@ int ooMonitorCallChannels(OOH323CallData *call) #endif else ret = ooSocketPoll(pfds, nfds, toMin.tv_sec * 1000 + toMin.tv_usec / 1000); - + if(ret == -1) { - + OOTRACEERR2("Error in poll %d ...exiting\n", errno); call->callEndReason = OO_REASON_INVALIDMESSAGE; call->callState = OO_CALL_CLEARED; @@ -940,7 +940,7 @@ int ooMonitorCallChannels(OOH323CallData *call) toMin.tv_sec = 2; /* 2 sec */ toMin.tv_usec = 100000; /* 100ms*/ /*This is for test application. Not part of actual stack */ - + if(ooProcessCallFDSETsAndTimers(call, pfds, nfds, &toMin) != OO_OK) { ooStopMonitorCallChannels(call); @@ -971,10 +971,10 @@ int ooH2250Receive(OOH323CallData *call) int len; Q931Message *pmsg; OOCTXT *pctxt = call->msgctxt; - + struct timeval timeout; - + pmsg = (Q931Message*)memAlloc(pctxt, sizeof(Q931Message)); if(!pmsg) { @@ -1002,13 +1002,13 @@ int ooH2250Receive(OOH323CallData *call) if(call->callState < OO_CALL_CLEAR) call->callEndReason = OO_REASON_TRANSPORTFAILURE; call->callState = OO_CALL_CLEARED; - + } ooFreeQ931Message(pctxt, pmsg); return OO_OK; } OOTRACEDBGC3("Receiving H.2250 message (%s, %s)\n", - call->callType, call->callToken); + call->callType, call->callToken); /* Since we are working with TCP, need to determine the message boundary. Has to be done at channel level, as channels know the message formats and can determine boundaries @@ -1016,7 +1016,7 @@ int ooH2250Receive(OOH323CallData *call) if(recvLen != 4) { OOTRACEERR4("Error: Reading TPKT header for H225 message " - "recvLen= %d (%s, %s)\n", recvLen, call->callType, + "recvLen= %d (%s, %s)\n", recvLen, call->callType, call->callToken); ooFreeQ931Message(pctxt, pmsg); if(call->callState < OO_CALL_CLEAR) @@ -1027,7 +1027,7 @@ int ooH2250Receive(OOH323CallData *call) return OO_FAILED; } - + len = message[2]; len = len<<8; len = len | message[3]; @@ -1037,7 +1037,7 @@ int ooH2250Receive(OOH323CallData *call) if(len > MAXMSGLEN - 4) { OOTRACEERR4("Error: Invalid TPKT header for H225 message " - "Len = %d (%s, %s)\n", len, call->callType, + "Len = %d (%s, %s)\n", len, call->callType, call->callToken); ooCloseH225Connection(call); ooFreeQ931Message(pctxt, pmsg); @@ -1050,7 +1050,7 @@ int ooH2250Receive(OOH323CallData *call) } /* Now read actual Q931 message body. We should make sure that we - receive complete message as indicated by len. If we don't then there + receive complete message as indicated by len. If we don't then there is something wrong. The loop below receives message, then checks whether complete message is received. If not received, then uses select to peek for remaining bytes of the message. If message is not received in 3 @@ -1059,7 +1059,7 @@ int ooH2250Receive(OOH323CallData *call) while(total < len) { struct pollfd pfds; - + pfds.fd = call->pH225Channel->sock; pfds.events = POLLIN; timeout.tv_sec = 3; @@ -1068,7 +1068,7 @@ int ooH2250Receive(OOH323CallData *call) if(ret == -1) { OOTRACEERR3("Error in select while receiving H.2250 message - " - "clearing call (%s, %s)\n", call->callType, + "clearing call (%s, %s)\n", call->callType, call->callToken); ooFreeQ931Message(pctxt, pmsg); if(call->callState < OO_CALL_CLEAR) @@ -1088,7 +1088,7 @@ int ooH2250Receive(OOH323CallData *call) ooFreeQ931Message(pctxt, pmsg); if(call->callState < OO_CALL_CLEAR) { - call->callEndReason = OO_REASON_INVALIDMESSAGE; + call->callEndReason = OO_REASON_INVALIDMESSAGE; call->callState = OO_CALL_CLEAR; } return OO_FAILED; @@ -1097,7 +1097,7 @@ int ooH2250Receive(OOH323CallData *call) recvLen = ooSocketRecv (call->pH225Channel->sock, message1, len-total); if (recvLen == 0) { OOTRACEERR3("Error in read while receiving H.2250 message - " - "clearing call (%s, %s)\n", call->callType, + "clearing call (%s, %s)\n", call->callType, call->callToken); ooFreeQ931Message(pctxt, pmsg); if(call->callState < OO_CALL_CLEAR) @@ -1112,7 +1112,7 @@ int ooH2250Receive(OOH323CallData *call) } - OOTRACEDBGC3("Received Q.931 message: (%s, %s)\n", + OOTRACEDBGC3("Received Q.931 message: (%s, %s)\n", call->callType, call->callToken); initializePrintHandler(&printHandler, "Received H.2250 Message"); @@ -1123,7 +1123,7 @@ int ooH2250Receive(OOH323CallData *call) OOTRACEERR3("Error:Failed to decode received H.2250 message. (%s, %s)\n", call->callType, call->callToken); } - OOTRACEDBGC3("Decoded Q931 message (%s, %s)\n", call->callType, + OOTRACEDBGC3("Decoded Q931 message (%s, %s)\n", call->callType, call->callToken); finishPrint(); removeEventHandler(pctxt); @@ -1144,7 +1144,7 @@ int ooH245Receive(OOH323CallData *call) /* OOCTXT *pctxt = &gH323ep.msgctxt; */ OOCTXT *pctxt = call->pctxt; struct timeval timeout; - + pmsg = (H245Message*)memAlloc(pctxt, sizeof(H245Message)); /* First read just TPKT header which is four bytes */ @@ -1171,7 +1171,7 @@ int ooH245Receive(OOH323CallData *call) } return OO_FAILED; } - if(call->h245SessionState == OO_H245SESSION_PAUSED) + if(call->h245SessionState == OO_H245SESSION_PAUSED) { ooLogicalChannel *temp; @@ -1218,7 +1218,7 @@ int ooH245Receive(OOH323CallData *call) /* Remaining message length is length - tpkt length */ len = len - 4; /* Now read actual H245 message body. We should make sure that we - receive complete message as indicated by len. If we don't then there + receive complete message as indicated by len. If we don't then there is something wrong. The loop below receives message, then checks whether complete message is received. If not received, then uses select to peek for remaining bytes of the message. If message is not received in 3 @@ -1263,7 +1263,7 @@ int ooH245Receive(OOH323CallData *call) } return OO_FAILED; } - /* If remaining part of the message is not received in 3 seconds + /* If remaining part of the message is not received in 3 seconds exit */ if(!ooPDRead(&pfds, 1, call->pH245Channel->sock)) { @@ -1279,7 +1279,7 @@ int ooH245Receive(OOH323CallData *call) } } - OOTRACEDBGC3("Complete H245 message received (%s, %s)\n", + OOTRACEDBGC3("Complete H245 message received (%s, %s)\n", call->callType, call->callToken); setPERBuffer(pctxt, message, recvLen, aligned); initializePrintHandler(&printHandler, "Received H.245 Message"); @@ -1290,45 +1290,45 @@ int ooH245Receive(OOH323CallData *call) ret = asn1PD_H245MultimediaSystemControlMessage(pctxt, &(pmsg->h245Msg)); if(ret != ASN_OK) { - OOTRACEERR3("Error decoding H245 message (%s, %s)\n", + OOTRACEERR3("Error decoding H245 message (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, pmsg); return OO_FAILED; } finishPrint(); - removeEventHandler(pctxt); + removeEventHandler(pctxt); ooHandleH245Message(call, pmsg); return OO_OK; } /* Generic Send Message functionality. Based on type of message to be sent, - it calls the corresponding function to retrieve the message buffer and + it calls the corresponding function to retrieve the message buffer and then transmits on the associated channel Interpreting msgptr: Q931 messages except facility 1st octet - msgType, next 4 octets - tpkt header, followed by encoded msg Q931 message facility - 1st octect - OOFacility, 2nd octet - tunneled msg - type(in case no tunneled msg - OOFacility), - 3rd and 4th octet - associated logical channel - of the tunneled msg(0 when no channel is - associated. ex. in case of MSD, TCS), next - 4 octets - tpkt header, followed by encoded + 1st octect - OOFacility, 2nd octet - tunneled msg + type(in case no tunneled msg - OOFacility), + 3rd and 4th octet - associated logical channel + of the tunneled msg(0 when no channel is + associated. ex. in case of MSD, TCS), next + 4 octets - tpkt header, followed by encoded message. H.245 messages no tunneling - 1st octet - msg type, next two octets - logical + 1st octet - msg type, next two octets - logical channel number(0, when no channel is associated), next two octets - total length of the message (including tpkt header) H.245 messages - tunneling. - 1st octet - msg type, next two octets - logical + 1st octet - msg type, next two octets - logical channel number(0, when no channel is associated), - next two octets - total length of the message. + next two octets - total length of the message. Note, no tpkt header is present in this case. - + */ int ooSendMsg(OOH323CallData *call, int type) { @@ -1336,7 +1336,7 @@ int ooSendMsg(OOH323CallData *call, int type) int len=0, ret=0, msgType=0, tunneledMsgType=0, logicalChannelNo = 0; DListNode * p_msgNode=NULL; ASN1OCTET *msgptr, *msgToSend=NULL; - + if(call->callState == OO_CALL_CLEARED) @@ -1350,12 +1350,12 @@ int ooSendMsg(OOH323CallData *call, int type) { if(call->pH225Channel->outQueue.count == 0) { - OOTRACEWARN3("WARN:No H.2250 message to send. (%s, %s)\n", + OOTRACEWARN3("WARN:No H.2250 message to send. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - OOTRACEDBGA3("Sending Q931 message (%s, %s)\n", call->callType, + OOTRACEDBGA3("Sending Q931 message (%s, %s)\n", call->callType, call->callToken); p_msgNode = call->pH225Channel->outQueue.head; msgptr = (ASN1OCTET*) p_msgNode->data; @@ -1383,10 +1383,10 @@ int ooSendMsg(OOH323CallData *call, int type) dListRemove(&(call->pH225Channel->outQueue), p_msgNode); if(p_msgNode) memFreePtr(call->pctxt, p_msgNode); - + /*TODO: This is not required ideally. We will see for some time and if we don't face any problems we will delete this code */ -#if 0 +#if 0 /* Check whether connection with remote is alright */ if(!ooChannelsIsConnectionOK(call, call->pH225Channel->sock)) { @@ -1398,19 +1398,19 @@ int ooSendMsg(OOH323CallData *call, int type) call->callState = OO_CALL_CLEARED; return OO_OK; } -#endif - /* Send message out via TCP */ +#endif + /* Send message out via TCP */ ret = ooSocketSend(call->pH225Channel->sock, msgToSend, len); if(ret == ASN_OK) { memFreePtr (call->pctxt, msgptr); - OOTRACEDBGC3("H2250/Q931 Message sent successfully (%s, %s)\n", + OOTRACEDBGC3("H2250/Q931 Message sent successfully (%s, %s)\n", call->callType, call->callToken); ooOnSendMsg(call, msgType, tunneledMsgType, logicalChannelNo); return OO_OK; } else{ - OOTRACEERR3("H2250Q931 Message send failed (%s, %s)\n", + OOTRACEERR3("H2250Q931 Message send failed (%s, %s)\n", call->callType, call->callToken); memFreePtr (call->pctxt, msgptr); if(call->callState < OO_CALL_CLEAR) @@ -1426,11 +1426,11 @@ int ooSendMsg(OOH323CallData *call, int type) { if(call->pH245Channel->outQueue.count == 0) { - OOTRACEWARN3("WARN:No H.245 message to send. (%s, %s)\n", + OOTRACEWARN3("WARN:No H.245 message to send. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - OOTRACEDBGA3("Sending H245 message (%s, %s)\n", call->callType, + OOTRACEDBGA3("Sending H245 message (%s, %s)\n", call->callType, call->callToken); p_msgNode = call->pH245Channel->outQueue.head; msgptr = (ASN1OCTET*) p_msgNode->data; @@ -1462,25 +1462,25 @@ int ooSendMsg(OOH323CallData *call, int type) } return OO_OK; } - + if (0 != call->pH245Channel && 0 != call->pH245Channel->sock) { OOTRACEDBGC4("Sending %s H245 message over H.245 channel. " - "(%s, %s)\n", ooGetMsgTypeText(msgType), + "(%s, %s)\n", ooGetMsgTypeText(msgType), call->callType, call->callToken); ret = ooSocketSend(call->pH245Channel->sock, msgptr+5, len); if(ret == ASN_OK) { memFreePtr (call->pctxt, msgptr); - OOTRACEDBGA3("H245 Message sent successfully (%s, %s)\n", + OOTRACEDBGA3("H245 Message sent successfully (%s, %s)\n", call->callType, call->callToken); ooOnSendMsg(call, msgType, tunneledMsgType, logicalChannelNo); return OO_OK; } else{ memFreePtr (call->pctxt, msgptr); - OOTRACEERR3("ERROR:H245 Message send failed (%s, %s)\n", + OOTRACEERR3("ERROR:H245 Message send failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { @@ -1492,7 +1492,7 @@ int ooSendMsg(OOH323CallData *call, int type) } else if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OOTRACEDBGC4("Sending %s H245 message as a tunneled message." - "(%s, %s)\n", ooGetMsgTypeText(msgType), + "(%s, %s)\n", ooGetMsgTypeText(msgType), call->callType, call->callToken); ret = ooSendAsTunneledMessage @@ -1518,11 +1518,11 @@ int ooSendMsg(OOH323CallData *call, int type) OOTRACEWARN3("ERROR:Unknown message type - message not Sent (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; -} +} int ooCloseH245Connection(OOH323CallData *call) { - OOTRACEINFO3("Closing H.245 connection (%s, %s)\n", call->callType, + OOTRACEINFO3("Closing H.245 connection (%s, %s)\n", call->callType, call->callToken); if (0 != call->pH245Channel) @@ -1533,7 +1533,7 @@ int ooCloseH245Connection(OOH323CallData *call) dListFreeAll(call->pctxt, &(call->pH245Channel->outQueue)); memFreePtr (call->pctxt, call->pH245Channel); call->pH245Channel = NULL; - OOTRACEDBGC3("Closed H245 connection. (%s, %s)\n", call->callType, + OOTRACEDBGC3("Closed H245 connection. (%s, %s)\n", call->callType, call->callToken); } call->h245SessionState = OO_H245SESSION_CLOSED; @@ -1543,7 +1543,7 @@ int ooCloseH245Connection(OOH323CallData *call) int ooCloseH245Listener(OOH323CallData *call) { - OOTRACEINFO3("Closing H.245 Listener (%s, %s)\n", call->callType, + OOTRACEINFO3("Closing H.245 Listener (%s, %s)\n", call->callType, call->callToken); if(call->h245listener) { @@ -1561,10 +1561,10 @@ int ooOnSendMsg switch(msgType) { case OOSetup: - OOTRACEINFO3("Sent Message - Setup (%s, %s)\n", call->callType, + OOTRACEINFO3("Sent Message - Setup (%s, %s)\n", call->callType, call->callToken); /* Start call establishment timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1614,7 +1614,7 @@ int ooOnSendMsg call->callState = OO_CALL_CLEARED; else{ call->callState = OO_CALL_CLEAR_RELEASESENT; - if(gH323ep.gkClient && !OO_TESTFLAG(call->flags, OO_M_DISABLEGK) && + if(gH323ep.gkClient && !OO_TESTFLAG(call->flags, OO_M_DISABLEGK) && gH323ep.gkClient->state == GkClientRegistered){ OOTRACEDBGA3("Sending DRQ after sending ReleaseComplete." "(%s, %s)\n", call->callType, call->callToken); @@ -1624,10 +1624,10 @@ int ooOnSendMsg } } - if(call->callState == OO_CALL_CLEAR_RELEASESENT && + if(call->callState == OO_CALL_CLEAR_RELEASESENT && call->h245SessionState == OO_H245SESSION_IDLE) { - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1638,11 +1638,11 @@ int ooOnSendMsg cbData->call = call; cbData->timerType = OO_SESSION_TIMER; cbData->channelNumber = 0; - if(!ooTimerCreate(call->pctxt, &call->timerList, + if(!ooTimerCreate(call->pctxt, &call->timerList, &ooSessionTimerExpired, gH323ep.sessionTimeout, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create EndSession timer- " - "ReleaseComplete.(%s, %s)\n", call->callType, + "ReleaseComplete.(%s, %s)\n", call->callType, call->callToken); memFreePtr(call->pctxt, cbData); return OO_FAILED; @@ -1658,12 +1658,12 @@ int ooOnSendMsg case OOFacility: if(tunneledMsgType == OOFacility) { - OOTRACEINFO3("Sent Message - Facility. (%s, %s)\n", + OOTRACEINFO3("Sent Message - Facility. (%s, %s)\n", call->callType, call->callToken); } else{ - OOTRACEINFO4("Sent Message - Facility(%s) (%s, %s)\n", - ooGetMsgTypeText(tunneledMsgType), + OOTRACEINFO4("Sent Message - Facility(%s) (%s, %s)\n", + ooGetMsgTypeText(tunneledMsgType), call->callType, call->callToken); ooOnSendMsg(call, tunneledMsgType, 0, associatedChan); @@ -1672,13 +1672,13 @@ int ooOnSendMsg case OOMasterSlaveDetermination: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - MasterSlaveDetermination (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - MasterSlaveDetermination (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - MasterSlaveDetermination (%s, %s)\n", + OOTRACEINFO3("Sent Message - MasterSlaveDetermination (%s, %s)\n", call->callType, call->callToken); /* Start MSD timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1703,7 +1703,7 @@ int ooOnSendMsg OOTRACEINFO3("Tunneled Message - MasterSlaveDeterminationAck (%s, %s)" "\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - MasterSlaveDeterminationAck (%s, %s)\n", + OOTRACEINFO3("Sent Message - MasterSlaveDeterminationAck (%s, %s)\n", call->callType, call->callToken); break; case OOMasterSlaveReject: @@ -1724,21 +1724,21 @@ int ooOnSendMsg break; case OOTerminalCapabilitySet: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { - /* If session isn't marked active yet, do it. possible in case of + /* If session isn't marked active yet, do it. possible in case of tunneling */ if(call->h245SessionState == OO_H245SESSION_IDLE || call->h245SessionState == OO_H245SESSION_PAUSED) { call->h245SessionState = OO_H245SESSION_ACTIVE; } - OOTRACEINFO3("Tunneled Message - TerminalCapabilitySet (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - TerminalCapabilitySet (%s, %s)\n", call->callType, call->callToken); } else { - OOTRACEINFO3("Sent Message - TerminalCapabilitySet (%s, %s)\n", + OOTRACEINFO3("Sent Message - TerminalCapabilitySet (%s, %s)\n", call->callType, call->callToken); } /* Start TCS timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1764,7 +1764,7 @@ int ooOnSendMsg OOTRACEINFO3("Tunneled Message - TerminalCapabilitySetAck (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - TerminalCapabilitySetAck (%s, %s)\n", + OOTRACEINFO3("Sent Message - TerminalCapabilitySetAck (%s, %s)\n", call->callType, call->callToken); break; case OOTerminalCapabilitySetReject: @@ -1772,18 +1772,18 @@ int ooOnSendMsg OOTRACEINFO3("Tunneled Message - TerminalCapabilitySetReject " "(%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - TerminalCapabilitySetReject (%s, %s)\n", + OOTRACEINFO3("Sent Message - TerminalCapabilitySetReject (%s, %s)\n", call->callType, call->callToken); break; case OOOpenLogicalChannel: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO4("Tunneled Message - OpenLogicalChannel(%d). (%s, %s)\n", + OOTRACEINFO4("Tunneled Message - OpenLogicalChannel(%d). (%s, %s)\n", associatedChan, call->callType, call->callToken); else - OOTRACEINFO4("Sent Message - OpenLogicalChannel(%d). (%s, %s)\n", + OOTRACEINFO4("Sent Message - OpenLogicalChannel(%d). (%s, %s)\n", associatedChan, call->callType, call->callToken); /* Start LogicalChannel timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1794,8 +1794,8 @@ int ooOnSendMsg cbData->call = call; cbData->timerType = OO_OLC_TIMER; cbData->channelNumber = associatedChan; - if(!ooTimerCreate(call->pctxt, &call->timerList, - &ooOpenLogicalChannelTimerExpired, gH323ep.logicalChannelTimeout, + if(!ooTimerCreate(call->pctxt, &call->timerList, + &ooOpenLogicalChannelTimerExpired, gH323ep.logicalChannelTimeout, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create OpenLogicalChannel timer. " @@ -1803,20 +1803,20 @@ int ooOnSendMsg memFreePtr(call->pctxt, cbData); return OO_FAILED; } - + break; case OOOpenLogicalChannelAck: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) OOTRACEINFO4("Tunneled Message - OpenLogicalChannelAck(%d) (%s,%s)\n", associatedChan, call->callType, call->callToken); else - OOTRACEINFO4("Sent Message - OpenLogicalChannelAck(%d) (%s, %s)\n", + OOTRACEINFO4("Sent Message - OpenLogicalChannelAck(%d) (%s, %s)\n", associatedChan, call->callType, call->callToken); break; case OOOpenLogicalChannelReject: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) OOTRACEINFO4("Tunneled Message - OpenLogicalChannelReject(%d)" - "(%s, %s)\n", associatedChan, call->callType, + "(%s, %s)\n", associatedChan, call->callType, call->callToken); else OOTRACEINFO4("Sent Message - OpenLogicalChannelReject(%d) (%s, %s)\n", @@ -1824,16 +1824,16 @@ int ooOnSendMsg break; case OOEndSessionCommand: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - EndSessionCommand(%s, %s)\n", + OOTRACEINFO3("Tunneled Message - EndSessionCommand(%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - EndSessionCommand (%s, %s)\n", + OOTRACEINFO3("Sent Message - EndSessionCommand (%s, %s)\n", call->callType, call->callToken); if((call->h245SessionState == OO_H245SESSION_ACTIVE)) - { + { /* Start EndSession timer */ call->h245SessionState = OO_H245SESSION_ENDSENT; - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1844,7 +1844,7 @@ int ooOnSendMsg cbData->call = call; cbData->timerType = OO_SESSION_TIMER; cbData->channelNumber = 0; - if(!ooTimerCreate(call->pctxt, &call->timerList, + if(!ooTimerCreate(call->pctxt, &call->timerList, &ooSessionTimerExpired, gH323ep.sessionTimeout, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create EndSession timer. " @@ -1861,13 +1861,13 @@ int ooOnSendMsg break; case OOCloseLogicalChannel: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - CloseLogicalChannel (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - CloseLogicalChannel (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - CloseLogicalChannel (%s, %s)\n", + OOTRACEINFO3("Sent Message - CloseLogicalChannel (%s, %s)\n", call->callType, call->callToken); /* Start LogicalChannel timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1878,8 +1878,8 @@ int ooOnSendMsg cbData->call = call; cbData->timerType = OO_CLC_TIMER; cbData->channelNumber = associatedChan; - if(!ooTimerCreate(call->pctxt, &call->timerList, - &ooCloseLogicalChannelTimerExpired, gH323ep.logicalChannelTimeout, + if(!ooTimerCreate(call->pctxt, &call->timerList, + &ooCloseLogicalChannelTimerExpired, gH323ep.logicalChannelTimeout, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create CloseLogicalChannel timer. " @@ -1887,25 +1887,25 @@ int ooOnSendMsg memFreePtr(call->pctxt, cbData); return OO_FAILED; } - + break; case OOCloseLogicalChannelAck: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - CloseLogicalChannelAck (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - CloseLogicalChannelAck (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - CloseLogicalChannelAck (%s, %s)\n", + OOTRACEINFO3("Sent Message - CloseLogicalChannelAck (%s, %s)\n", call->callType, call->callToken); break; case OORequestChannelClose: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - RequestChannelClose (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - RequestChannelClose (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - RequestChannelClose (%s, %s)\n", + OOTRACEINFO3("Sent Message - RequestChannelClose (%s, %s)\n", call->callType, call->callToken); /* Start RequestChannelClose timer */ - cbData = (ooTimerCallback*) memAlloc(call->pctxt, + cbData = (ooTimerCallback*) memAlloc(call->pctxt, sizeof(ooTimerCallback)); if(!cbData) { @@ -1916,8 +1916,8 @@ int ooOnSendMsg cbData->call = call; cbData->timerType = OO_RCC_TIMER; cbData->channelNumber = associatedChan; - if(!ooTimerCreate(call->pctxt, &call->timerList, - &ooRequestChannelCloseTimerExpired, gH323ep.logicalChannelTimeout, + if(!ooTimerCreate(call->pctxt, &call->timerList, + &ooRequestChannelCloseTimerExpired, gH323ep.logicalChannelTimeout, cbData, FALSE)) { OOTRACEERR3("Error:Unable to create RequestChannelClose timer. " @@ -1928,13 +1928,13 @@ int ooOnSendMsg break; case OORequestChannelCloseAck: if(OO_TESTFLAG (call->flags, OO_M_TUNNELING)) - OOTRACEINFO3("Tunneled Message - RequestChannelCloseAck (%s, %s)\n", + OOTRACEINFO3("Tunneled Message - RequestChannelCloseAck (%s, %s)\n", call->callType, call->callToken); else - OOTRACEINFO3("Sent Message - RequestChannelCloseAck (%s, %s)\n", + OOTRACEINFO3("Sent Message - RequestChannelCloseAck (%s, %s)\n", call->callType, call->callToken); break; - + default: ; } @@ -1965,7 +1965,7 @@ int ooStopMonitorCalls() call = gH323ep.callList; while(call) { - OOTRACEWARN3("Clearing call (%s, %s)\n", call->callType, + OOTRACEWARN3("Clearing call (%s, %s)\n", call->callType, call->callToken); call->callEndReason = OO_REASON_LOCAL_CLEARED; ooCleanCall(call); @@ -1974,7 +1974,7 @@ int ooStopMonitorCalls() } gH323ep.callList = NULL; } - OOTRACEINFO1("Stopping listener for incoming calls\n"); + OOTRACEINFO1("Stopping listener for incoming calls\n"); if(gH323ep.listener) { ooSocketClose(*(gH323ep.listener)); @@ -2007,7 +2007,7 @@ OOBOOL ooChannelsIsConnectionOK(OOH323CallData *call, OOSOCKET sock) char buf[2]; if(ooSocketRecvPeek(sock, (ASN1OCTET*) buf, 2) == 0) { - OOTRACEWARN3("Broken pipe detected. (%s, %s)", call->callType, + OOTRACEWARN3("Broken pipe detected. (%s, %s)", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) call->callEndReason = OO_REASON_TRANSPORTFAILURE; @@ -2016,4 +2016,4 @@ OOBOOL ooChannelsIsConnectionOK(OOH323CallData *call, OOSOCKET sock) } } return TRUE; -} +} diff --git a/addons/ooh323c/src/oochannels.h b/addons/ooh323c/src/oochannels.h index 76ce8ef30c..9d3ecd58b9 100644 --- a/addons/ooh323c/src/oochannels.h +++ b/addons/ooh323c/src/oochannels.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file oochannels.h - * This file contains functions to create and use channels. + * @file oochannels.h + * This file contains functions to create and use channels. */ #ifndef _OOCHANNELS_H_ #define _OOCHANNELS_H_ @@ -46,7 +46,7 @@ extern "C" { struct OOH323CallData; struct Q931Message; -/** +/** * @defgroup channels Channel Management * @{ */ @@ -60,7 +60,7 @@ EXTERN int ooCreateH323Listener(void); /** * This function is used to create a listener for incoming H.245 connections. * @param call Pointer to call for which H.245 listener has to be created - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooCreateH245Listener(struct OOH323CallData *call); @@ -75,7 +75,7 @@ EXTERN int ooCloseH245Listener(struct OOH323CallData *call); /** * This function is used to accept incoming H.225 connections. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooAcceptH225Connection(void); @@ -84,16 +84,16 @@ EXTERN int ooAcceptH225Connection(void); * This function is used to accept an incoming H.245 connection. * @param call Pointer to a call for which H.245 connection request has * arrived. - * + * * @return OO_OK, on succes. OO_FAILED, on failure. */ EXTERN int ooAcceptH245Connection(struct OOH323CallData *call); /** * This function is used to create an H.225 connection to the remote end point. - * @param call Pointer to the call for which H.225 connection has to be + * @param call Pointer to the call for which H.225 connection has to be * setup. - * @return OO_OK, on succes. OO_FAILED, on failure. + * @return OO_OK, on succes. OO_FAILED, on failure. */ EXTERN int ooCreateH225Connection(struct OOH323CallData *call); @@ -108,17 +108,17 @@ EXTERN int ooCreateH245Connection(struct OOH323CallData *call); /** * This function is used to close an H.225 connection - * @param call Pointer to the call for which H.225 connection has to be + * @param call Pointer to the call for which H.225 connection has to be * closed. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooCloseH225Connection(struct OOH323CallData *call); /** - * This function is used to close an H.245 connection for a call. + * This function is used to close an H.245 connection for a call. * - * @param call Pointer to call for which H.245 connection has + * @param call Pointer to call for which H.245 connection has * to be closed. * @return OO_OK, on success. OO_FAILED, on failure. */ @@ -127,7 +127,7 @@ EXTERN int ooCloseH245Connection(struct OOH323CallData *call); /** * This function is used to start monitoring channels for the calls. It has * an infinite loop which uses select to monitor various channels. - * + * */ EXTERN int ooMonitorChannels(void); EXTERN int ooMonitorCmdChannels(void); @@ -144,22 +144,22 @@ EXTERN void ooStopMonitorCallChannels(OOH323CallData *); /** * This function is used to receive an H.2250 message received on a calls - * H.225 channel. It receives the message, decodes it and calls + * H.225 channel. It receives the message, decodes it and calls * 'ooHandleH2250Message' to process the message. - * @param call Pointer to the call for which the message has to be + * @param call Pointer to the call for which the message has to be * received. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooH2250Receive(struct OOH323CallData *call); /** * This function is used to receive an H.245 message received on a calls - * H.245 channel. It receives the message, decodes it and calls + * H.245 channel. It receives the message, decodes it and calls * 'ooHandleH245Message' to process it. - * @param call Pointer to the call for which the message has to be + * @param call Pointer to the call for which the message has to be * received. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooH245Receive(struct OOH323CallData *call); @@ -175,7 +175,7 @@ EXTERN int ooH245Receive(struct OOH323CallData *call); EXTERN int ooSendH225Msg(struct OOH323CallData *call, struct Q931Message *msg); /** - * This function is used to Send a message on the channel, when channel is + * This function is used to Send a message on the channel, when channel is * available for write. * @param call Pointer to call for which message has to be sent. * @param type Type of the message. @@ -197,11 +197,11 @@ EXTERN int ooSendMsg(struct OOH323CallData *call, int type); * @return OO_OK, on success. OO_FAILED, on failure */ EXTERN int ooOnSendMsg - (struct OOH323CallData *call, int msgType, int tunneledMsgType, + (struct OOH323CallData *call, int msgType, int tunneledMsgType, int associatedChan); /** - * This function is used to check the status of tcp connection. + * This function is used to check the status of tcp connection. * @param call Handle to the call to which connection belongs. * @param sock Connected socket. * @@ -209,11 +209,10 @@ EXTERN int ooOnSendMsg */ EXTERN OOBOOL ooChannelsIsConnectionOK(OOH323CallData *call, OOSOCKET sock); -/** - * @} +/** + * @} */ #ifdef __cplusplus } #endif #endif - diff --git a/addons/ooh323c/src/ooh245.c b/addons/ooh323c/src/ooh245.c index 39b3994527..adff917900 100644 --- a/addons/ooh323c/src/ooh245.c +++ b/addons/ooh323c/src/ooh245.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -55,7 +55,7 @@ int ooCreateH245Message(OOH323CallData* call, H245Message **pph245msg, int type) switch(type) { case T_H245MultimediaSystemControlMessage_request: - (*pph245msg)->h245Msg.u.request = (H245RequestMessage*) + (*pph245msg)->h245Msg.u.request = (H245RequestMessage*) memAllocZ (pctxt, sizeof(H245RequestMessage)); /*Check for successful mem allocation, and if successful initialize @@ -135,7 +135,7 @@ int ooFreeH245Message(OOH323CallData *call, H245Message *pmsg) } #ifndef _COMPACT -static void ooPrintH245Message +static void ooPrintH245Message (OOH323CallData* call, ASN1OCTET* msgbuf, ASN1UINT msglen) { OOCTXT ctxt; @@ -154,12 +154,12 @@ static void ooPrintH245Message ret = asn1PD_H245MultimediaSystemControlMessage(&ctxt, &mmMsg); if(ret != ASN_OK) { - OOTRACEERR3("Error decoding H245 message (%s, %s)\n", + OOTRACEERR3("Error decoding H245 message (%s, %s)\n", call->callType, call->callToken); OOTRACEERR1 (errGetText (&ctxt)); } finishPrint(); - freeContext(&ctxt); + freeContext(&ctxt); } #endif @@ -177,7 +177,7 @@ int ooEncodeH245Message if(!msgbuf || size<200) { OOTRACEERR3("Error: Invalid message buffer/size for " - "ooEncodeH245Message. (%s, %s)\n", + "ooEncodeH245Message. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -188,7 +188,7 @@ int ooEncodeH245Message /* This will contain the total length of the encoded message */ msgbuf[i++] = 0; msgbuf[i++] = 0; - + if(!OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { /* Populate message buffer to be returned */ @@ -196,25 +196,25 @@ int ooEncodeH245Message msgbuf[i++] = 3; /* TPKT version */ msgbuf[i++] = 0; /* TPKT resevred */ /* 1st octet of length, will be populated once len is determined */ - msgbuf[i++] = 0; + msgbuf[i++] = 0; /* 2nd octet of length, will be populated once len is determined */ msgbuf[i++] = 0; } - + setPERBuffer (pctxt, (unsigned char*) msgbuf+i, (size-i), TRUE); /* stat = asn1PE_H245MultimediaSystemControlMessage (&gH323ep.msgctxt, */ - stat = asn1PE_H245MultimediaSystemControlMessage (call->msgctxt, + stat = asn1PE_H245MultimediaSystemControlMessage (call->msgctxt, multimediaMsg); if (stat != ASN_OK) { - OOTRACEERR3 ("ERROR: H245 Message encoding failed (%s, %s)\n", + OOTRACEERR3 ("ERROR: H245 Message encoding failed (%s, %s)\n", call->callType, call->callToken); /* OOTRACEERR1 (errGetText (&gH323ep.msgctxt)); */ OOTRACEERR1 (errGetText (call->msgctxt)); return OO_FAILED; } - + encodePtr = encodeGetMsgPtr(pctxt, &encodeLen); len +=encodeLen; msgbuf[3] = (len>>8); @@ -250,14 +250,14 @@ int ooSendH245Msg(OOH323CallData *call, H245Message *msg) if(iRet != OO_OK) { - OOTRACEERR3("Error:Failed to encode H245 message. (%s, %s)\n", + OOTRACEERR3("Error:Failed to encode H245 message. (%s, %s)\n", call->callType, call->callToken); memFreePtr (call->pctxt, encodebuf); return OO_FAILED; } if(!call->pH245Channel) { - call->pH245Channel = + call->pH245Channel = (OOH323Channel*) memAllocZ (call->pctxt, sizeof(OOH323Channel)); if(!call->pH245Channel) { @@ -268,7 +268,7 @@ int ooSendH245Msg(OOH323CallData *call, H245Message *msg) } } - /* We need to send EndSessionCommand immediately.*/ + /* We need to send EndSessionCommand immediately.*/ if(!OO_TESTFLAG(call->flags, OO_M_TUNNELING)){ if(encodebuf[0]== OOEndSessionCommand) /* High priority message */ { @@ -278,9 +278,9 @@ int ooSendH245Msg(OOH323CallData *call, H245Message *msg) } else{ dListAppend (call->pctxt, &call->pH245Channel->outQueue, encodebuf); - OOTRACEDBGC4("Queued H245 messages %d. (%s, %s)\n", - call->pH245Channel->outQueue.count, - call->callType, call->callToken); + OOTRACEDBGC4("Queued H245 messages %d. (%s, %s)\n", + call->pH245Channel->outQueue.count, + call->callType, call->callToken); } } else{ @@ -340,10 +340,10 @@ int ooSendTermCapMsg(OOH323CallData *call) "progress. (%s, %s)\n", call->callType, call->callToken); return OO_OK; } - - ret = ooCreateH245Message(call, &ph245msg, + + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); - + if(ret == OO_FAILED) { OOTRACEERR3("Error:Failed to create H245 message for Terminal " @@ -363,16 +363,16 @@ int ooSendTermCapMsg(OOH323CallData *call) call->callType, call->callToken); return OO_FAILED; } - + request->t = T_H245RequestMessage_terminalCapabilitySet; request->u.terminalCapabilitySet = (H245TerminalCapabilitySet*) - memAlloc(pctxt, sizeof(H245TerminalCapabilitySet)); + memAlloc(pctxt, sizeof(H245TerminalCapabilitySet)); termCap = request->u.terminalCapabilitySet; memset(termCap, 0, sizeof(H245TerminalCapabilitySet)); termCap->m.multiplexCapabilityPresent = 0; termCap->m.capabilityTablePresent = 1; termCap->m.capabilityDescriptorsPresent = 1; - termCap->sequenceNumber = ++(call->localTermCapSeqNo); + termCap->sequenceNumber = ++(call->localTermCapSeqNo); termCap->protocolIdentifier = gh245ProtocolID; /* protocol id */ /* Initialize alternate sets */ @@ -394,7 +394,7 @@ int ooSendTermCapMsg(OOH323CallData *call) /* Add audio Capabilities */ - + dListInit(&(termCap->capabilityTable)); for(k=0; k<(int)call->capPrefs.index; k++) { @@ -402,8 +402,8 @@ int ooSendTermCapMsg(OOH323CallData *call) epCap = call->ourCaps; else epCap = gH323ep.myCaps; - while(epCap) { - if(epCap->cap == call->capPrefs.order[k]) + while(epCap) { + if(epCap->cap == call->capPrefs.order[k]) break; epCap = epCap->next; } @@ -417,8 +417,8 @@ int ooSendTermCapMsg(OOH323CallData *call) if(epCap->capType == OO_CAP_TYPE_AUDIO) { - /* Create audio capability. If capability supports receive, we only - add it as receive capability in TCS. However, if it supports only + /* Create audio capability. If capability supports receive, we only + add it as receive capability in TCS. However, if it supports only transmit, we add it as transmit capability in TCS. */ if((epCap->dir & OORX)) @@ -431,7 +431,7 @@ int ooSendTermCapMsg(OOH323CallData *call) if(!audioCap) { OOTRACEWARN4("WARN:Failed to create audio capability %s " - "(%s, %s)\n", ooGetCapTypeText(epCap->cap), + "(%s, %s)\n", ooGetCapTypeText(epCap->cap), call->callType, call->callToken); continue; } @@ -447,11 +447,11 @@ int ooSendTermCapMsg(OOH323CallData *call) "(%s, %s)\n", ooGetCapTypeText(epCap->cap), call->callType, call->callToken); continue; - } + } } else{ OOTRACEWARN3("Warn:Capability is not RX/TX/RXANDTX. Symmetric " - "capabilities are not supported.(%s, %s)\n", + "capabilities are not supported.(%s, %s)\n", call->callType, call->callToken); continue; } @@ -484,8 +484,8 @@ int ooSendTermCapMsg(OOH323CallData *call) else if(epCap->capType == OO_CAP_TYPE_DATA) { - /* Create t.38 capability. If capability supports receive, we only - add it as receive capability in TCS. However, if it supports only + /* Create t.38 capability. If capability supports receive, we only + add it as receive capability in TCS. However, if it supports only transmit, we add it as transmit capability in TCS. */ if((epCap->dir & OORX) && !(epCap->dir & OOTX)) @@ -514,7 +514,7 @@ int ooSendTermCapMsg(OOH323CallData *call) "(%s, %s)\n", call->callType, call->callToken); continue; - } + } } else{ OOTRACEDBGC3("Sending transmit&recevie capability t38 in TCS.(%s, %s)\n", @@ -526,7 +526,7 @@ int ooSendTermCapMsg(OOH323CallData *call) "(%s, %s)\n", call->callType, call->callToken); continue; - } + } } /* Add Capabilities to Capability Table */ entry = (H245CapabilityTableEntry*) memAlloc(pctxt, @@ -581,11 +581,11 @@ int ooSendTermCapMsg(OOH323CallData *call) "(%s, %s)\n", ooGetCapTypeText(epCap->cap), call->callType, call->callToken); continue; - } + } } else{ OOTRACEWARN3("Warn:Capability is not RX/TX/RXANDTX. Symmetric " - "capabilities are not supported.(%s, %s)\n", + "capabilities are not supported.(%s, %s)\n", call->callType, call->callToken); continue; } @@ -632,18 +632,18 @@ int ooSendTermCapMsg(OOH323CallData *call) if(!entry) { OOTRACEERR3("Error:Failed to allocate memory for new capability " - "table entry. (%s, %s)\n", call->callType, + "table entry. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; entry->capability.t = T_H245Capability_receiveRTPAudioTelephonyEventCapability; entry->capability.u.receiveRTPAudioTelephonyEventCapability = ateCap; - + entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); altSetDtmf->elem[altSetDtmf->n] = i+1; @@ -668,18 +668,18 @@ int ooSendTermCapMsg(OOH323CallData *call) if(!entry) { OOTRACEERR3("Error:Failed to allocate memory for new capability " - "table entry. (%s, %s)\n", call->callType, + "table entry. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; entry->capability.t = T_H245Capability_receiveDataApplicationCapability; entry->capability.u.receiveDataApplicationCapability = rtdCap; - + entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); altSetDtmf->elem[altSetDtmf->n] = i+1; @@ -704,18 +704,18 @@ int ooSendTermCapMsg(OOH323CallData *call) if(!entry) { OOTRACEERR3("Error:Failed to allocate memory for new capability " - "table entry. (%s, %s)\n", call->callType, + "table entry. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability; entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap; - + entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); altSetDtmf->elem[altSetDtmf->n] = i+1; @@ -740,18 +740,18 @@ int ooSendTermCapMsg(OOH323CallData *call) if(!entry) { OOTRACEERR3("Error:Failed to allocate memory for new capability " - "table entry. (%s, %s)\n", call->callType, + "table entry. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + memset(entry, 0, sizeof(H245CapabilityTableEntry)); entry->m.capabilityPresent = 1; entry->capability.t = T_H245Capability_receiveAndTransmitUserInputCapability; entry->capability.u.receiveAndTransmitUserInputCapability = userInputCap; - + entry->capabilityTableEntryNumber = i+1; dListAppend(pctxt , &(termCap->capabilityTable), entry); altSetDtmf->elem[altSetDtmf->n] = i+1; @@ -761,7 +761,7 @@ int ooSendTermCapMsg(OOH323CallData *call) } } - + /*TODO:Add Video and Data capabilities, if required*/ if(i==0) { @@ -770,7 +770,7 @@ int ooSendTermCapMsg(OOH323CallData *call) ooFreeH245Message(call,ph245msg); return OO_FAILED; } - + /* Define capability descriptior */ capDesc = (H245CapabilityDescriptor*) memAlloc(pctxt, sizeof(H245CapabilityDescriptor)); @@ -790,7 +790,7 @@ int ooSendTermCapMsg(OOH323CallData *call) memset(altSet, 0, sizeof(H245AlternativeCapabilitySet)); altSet->n = 1; altSet->elem[0] = j+1; - + dListAppend(pctxt, &(capDesc->simultaneousCapabilities), altSet); } */ @@ -801,7 +801,7 @@ int ooSendTermCapMsg(OOH323CallData *call) dListInit(&(termCap->capabilityDescriptors)); dListAppend(pctxt, &(termCap->capabilityDescriptors), capDesc); - OOTRACEDBGA3("Built terminal capability set message (%s, %s)\n", + OOTRACEDBGA3("Built terminal capability set message (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -882,11 +882,11 @@ ASN1UINT ooGenerateStatusDeterminationNumber() statusDeterminationNumber = rand()%16777215; return statusDeterminationNumber; } -/* TODO: Should Send MasterSlave Release when no response from +/* TODO: Should Send MasterSlave Release when no response from Remote endpoint after MasterSlaveDetermination sent within timeout. */ -int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, +int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, int msgType) { H245MasterSlaveDetermination *masterSlave; @@ -898,10 +898,10 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, case OOMasterSlaveDetermination: OOTRACEINFO3("Master Slave Determination received (%s, %s)\n", call->callType, call->callToken); - + masterSlave = (H245MasterSlaveDetermination*)pmsg; - if(call->masterSlaveState != OO_MasterSlave_DetermineSent && + if(call->masterSlaveState != OO_MasterSlave_DetermineSent && OO_TESTFLAG(gH323ep.flags, OO_M_TRYBEMASTER)) { ooSendMasterSlaveDeterminationAck(call, "slave"); @@ -929,21 +929,21 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, /* Since term types are same, master slave determination will be done based on statusdetermination number */ - + OOTRACEDBGA3("Determining master-slave based on StatusDetermination" "Number (%s, %s)\n", call->callType, call->callToken); if(call->masterSlaveState == OO_MasterSlave_DetermineSent) statusDeterminationNumber = call->statusDeterminationNumber; else - if (OO_TESTFLAG(gH323ep.flags, OO_M_TRYBEMASTER)) + if (OO_TESTFLAG(gH323ep.flags, OO_M_TRYBEMASTER)) statusDeterminationNumber = masterSlave->statusDeterminationNumber - 1; else statusDeterminationNumber = ooGenerateStatusDeterminationNumber(); moduloDiff = (masterSlave->statusDeterminationNumber - statusDeterminationNumber) &0xffffff; - - /* if(masterSlave->statusDeterminationNumber > + + /* if(masterSlave->statusDeterminationNumber > statusDeterminationNumber) */ if (moduloDiff < 0x800000 && moduloDiff != 0) { @@ -953,7 +953,7 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, call->callType, call->callToken); return OO_OK; } - /* if(masterSlave->statusDeterminationNumber < + /* if(masterSlave->statusDeterminationNumber < statusDeterminationNumber) */ if (moduloDiff > 0x800000) { @@ -963,7 +963,7 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, call->callType, call->callToken); return OO_OK; } - /* if(masterSlave->statusDeterminationNumber == + /* if(masterSlave->statusDeterminationNumber == statusDeterminationNumber) */ if (moduloDiff == 0 || moduloDiff == 0x800000) { @@ -978,7 +978,7 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, masterSlaveAck = (H245MasterSlaveDeterminationAck*)pmsg; if(call->masterSlaveState == OO_MasterSlave_DetermineSent) { - if(masterSlaveAck->decision.t == + if(masterSlaveAck->decision.t == T_H245MasterSlaveDeterminationAck_decision_master) { ooSendMasterSlaveDeterminationAck(call, "slave"); @@ -996,7 +996,7 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, } call->msAckStatus = OO_msAck_remoteReceived; - + if(call->localTermCapState == OO_LocalTermCapSetAckRecvd && call->remoteTermCapState == OO_RemoteTermCapSetAckSent) { @@ -1025,7 +1025,7 @@ int ooHandleMasterSlave(OOH323CallData *call, void * pmsg, OOTRACEWARN3("Warn:Unhandled Master Slave message received - %s - " "%s\n", call->callType, call->callToken); } - return OO_OK; + return OO_OK; } int ooSendMasterSlaveDetermination(OOH323CallData *call) @@ -1059,27 +1059,27 @@ int ooSendMasterSlaveDetermination(OOH323CallData *call) request->u.masterSlaveDetermination = (H245MasterSlaveDetermination*) ASN1MALLOC(pctxt, sizeof(H245MasterSlaveDetermination)); - + pMasterSlave = request->u.masterSlaveDetermination; - memset(pMasterSlave, 0, sizeof(H245MasterSlaveDetermination)); - pMasterSlave->terminalType = gH323ep.termType; - pMasterSlave->statusDeterminationNumber = + memset(pMasterSlave, 0, sizeof(H245MasterSlaveDetermination)); + pMasterSlave->terminalType = gH323ep.termType; + pMasterSlave->statusDeterminationNumber = ooGenerateStatusDeterminationNumber(); call->statusDeterminationNumber = pMasterSlave->statusDeterminationNumber; OOTRACEDBGA3("Built MasterSlave Determination (%s, %s)\n", call->callType, - call->callToken); + call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue MasterSlaveDetermination message to" - " outbound queue. (%s, %s)\n", call->callType, + " outbound queue. (%s, %s)\n", call->callType, call->callToken); } else call->masterSlaveState = OO_MasterSlave_DetermineSent; - + ooFreeH245Message(call, ph245msg); return ret; @@ -1094,12 +1094,12 @@ int ooSendMasterSlaveDeterminationAck(OOH323CallData* call, /* OOCTXT *pctxt=&gH323ep.msgctxt; */ OOCTXT *pctxt=call->msgctxt; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - MasterSlave " - "Determination Ack (%s, %s)\n",call->callType, + "Determination Ack (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1109,25 +1109,25 @@ int ooSendMasterSlaveDeterminationAck(OOH323CallData* call, response->t = T_H245ResponseMessage_masterSlaveDeterminationAck; response->u.masterSlaveDeterminationAck = (H245MasterSlaveDeterminationAck*) ASN1MALLOC(pctxt, sizeof(H245MasterSlaveDeterminationAck)); - memset(response->u.masterSlaveDeterminationAck, 0, + memset(response->u.masterSlaveDeterminationAck, 0, sizeof(H245MasterSlaveDeterminationAck)); if(!strcmp("master", status)) - response->u.masterSlaveDeterminationAck->decision.t = + response->u.masterSlaveDeterminationAck->decision.t = T_H245MasterSlaveDeterminationAck_decision_master; else - response->u.masterSlaveDeterminationAck->decision.t = + response->u.masterSlaveDeterminationAck->decision.t = T_H245MasterSlaveDeterminationAck_decision_slave; - - OOTRACEDBGA3("Built MasterSlave determination Ack (%s, %s)\n", + + OOTRACEDBGA3("Built MasterSlave determination Ack (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue MasterSlaveDeterminationAck message" - " to outbound queue. (%s, %s)\n", call->callType, + " to outbound queue. (%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message(call, ph245msg); call->msAckStatus = OO_msAck_localSent; return ret; @@ -1146,7 +1146,7 @@ int ooSendMasterSlaveDeterminationReject (OOH323CallData* call) if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - MasterSlave " - "Determination Reject (%s, %s)\n",call->callType, + "Determination Reject (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1155,25 +1155,25 @@ int ooSendMasterSlaveDeterminationReject (OOH323CallData* call) response->t = T_H245ResponseMessage_masterSlaveDeterminationReject; - response->u.masterSlaveDeterminationReject = + response->u.masterSlaveDeterminationReject = (H245MasterSlaveDeterminationReject*) memAlloc (pctxt, sizeof(H245MasterSlaveDeterminationReject)); response->u.masterSlaveDeterminationReject->cause.t = T_H245MasterSlaveDeterminationReject_cause_identicalNumbers; - OOTRACEDBGA3 ("Built MasterSlave determination reject (%s, %s)\n", + OOTRACEDBGA3 ("Built MasterSlave determination reject (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue MasterSlaveDeterminationReject " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; @@ -1192,7 +1192,7 @@ int ooSendMasterSlaveDeterminationRelease(OOH323CallData * call) if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - MasterSlave " - "Determination Release (%s, %s)\n",call->callType, + "Determination Release (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1201,7 +1201,7 @@ int ooSendMasterSlaveDeterminationRelease(OOH323CallData * call) indication->t = T_H245IndicationMessage_masterSlaveDeterminationRelease; - indication->u.masterSlaveDeterminationRelease = + indication->u.masterSlaveDeterminationRelease = (H245MasterSlaveDeterminationRelease*) memAlloc (pctxt, sizeof(H245MasterSlaveDeterminationRelease)); @@ -1212,18 +1212,18 @@ int ooSendMasterSlaveDeterminationRelease(OOH323CallData * call) ooFreeH245Message(call, ph245msg); return OO_FAILED; } - OOTRACEDBGA3 ("Built MasterSlave determination Release (%s, %s)\n", + OOTRACEDBGA3 ("Built MasterSlave determination Release (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue MasterSlaveDeterminationRelease " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; } @@ -1234,7 +1234,7 @@ int ooHandleMasterSlaveReject if(call->msdRetries < DEFAULT_MAX_RETRIES) { call->msdRetries++; - OOTRACEDBGA3("Retrying MasterSlaveDetermination. (%s, %s)\n", + OOTRACEDBGA3("Retrying MasterSlaveDetermination. (%s, %s)\n", call->callType, call->callToken); call->masterSlaveState = OO_MasterSlave_Idle; ooSendMasterSlaveDetermination(call); @@ -1260,12 +1260,12 @@ int ooSendRequestModeAck(OOH323CallData* call, H245Message *ph245msg=NULL; OOCTXT *pctxt=call->msgctxt; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - RequestMode " - "Ack (%s, %s)\n",call->callType, + "Ack (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1275,23 +1275,23 @@ int ooSendRequestModeAck(OOH323CallData* call, response->t = T_H245ResponseMessage_requestModeAck; response->u.requestModeAck = (H245RequestModeAck *) ASN1MALLOC(pctxt, sizeof(H245RequestModeAck)); - memset(response->u.requestModeAck, 0, + memset(response->u.requestModeAck, 0, sizeof(H245RequestModeAck)); response->u.requestModeAck->sequenceNumber = sequenceNumber; - response->u.requestModeAck->response.t = + response->u.requestModeAck->response.t = T_H245RequestModeAck_response_willTransmitMostPreferredMode; - OOTRACEDBGA3("Built RequestModeAck (%s, %s)\n", + OOTRACEDBGA3("Built RequestModeAck (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue RequestModeAck message" - " to outbound queue. (%s, %s)\n", call->callType, + " to outbound queue. (%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message(call, ph245msg); return ret; } @@ -1304,12 +1304,12 @@ int ooSendRequestModeReject(OOH323CallData* call, H245Message *ph245msg=NULL; OOCTXT *pctxt=call->msgctxt; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - RequstMode " - "Reject (%s, %s)\n",call->callType, + "Reject (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1319,23 +1319,23 @@ int ooSendRequestModeReject(OOH323CallData* call, response->t = T_H245ResponseMessage_requestModeReject; response->u.requestModeReject = (H245RequestModeReject *) ASN1MALLOC(pctxt, sizeof(H245RequestModeReject)); - memset(response->u.requestModeReject, 0, + memset(response->u.requestModeReject, 0, sizeof(H245RequestModeReject)); response->u.requestModeReject->sequenceNumber = sequenceNumber; - response->u.requestModeReject->cause.t = + response->u.requestModeReject->cause.t = T_H245RequestModeReject_cause_modeUnavailable; - OOTRACEDBGA3("Built RequestModeReject (%s, %s)\n", + OOTRACEDBGA3("Built RequestModeReject (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue RequestModeReject message" - " to outbound queue. (%s, %s)\n", call->callType, + " to outbound queue. (%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message(call, ph245msg); return ret; } @@ -1355,12 +1355,12 @@ int ooSendRequestMode(OOH323CallData* call, if (isT38Mode && !OO_TESTFLAG(call->flags, OO_M_T38SUPPORTED)) /* t38 req but we dont support */ return OO_OK; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); if(ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - RequstMode " - "(%s, %s)\n",call->callType, + "(%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1371,7 +1371,7 @@ int ooSendRequestMode(OOH323CallData* call, request->u.requestMode = (H245RequestMode *) ASN1MALLOC(pctxt, sizeof(H245RequestMode)); - memset(request->u.requestMode, 0, + memset(request->u.requestMode, 0, sizeof(H245RequestMode)); call->requestSequence++; @@ -1390,7 +1390,7 @@ int ooSendRequestMode(OOH323CallData* call, pModeElem.type.u.dataMode->bitRate = 144; if (!ooCreateT38ApplicationData(pctxt,&(pModeElem.type.u.dataMode->application))) { OOTRACEERR3("Error:Memory - ooCapabilityCreateT38Capability - (%s, %s)\n", - call->callType, + call->callType, call->callToken); } } else { @@ -1414,10 +1414,10 @@ int ooSendRequestMode(OOH323CallData* call, if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue RequestMode message" - " to outbound queue. (%s, %s)\n", call->callType, + " to outbound queue. (%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message(call, ph245msg); return ret; } @@ -1451,7 +1451,7 @@ void ooOnReceivedRequestModeAck(OOH323CallData* call, H245RequestModeAck * reque int ooHandleRequestMode(OOH323CallData* call, H245RequestMode *requestMode) { - + H245ModeDescription** pModeRef; H245ModeElement** pModeElem; H245ModeElementType* pMode; @@ -1461,7 +1461,7 @@ int ooHandleRequestMode(OOH323CallData* call, pMode = &((*pModeElem)->type); OOTRACEDBGA5("Handle RequestMode: " " modetype: %d/%d for (%s, %s)\n", pMode->t, pMode->u.dataMode->application.t, - call->callType, + call->callType, call->callToken); switch (pMode->t) { case T_H245ModeElementType_dataMode: @@ -1483,7 +1483,7 @@ int ooHandleRequestMode(OOH323CallData* call, } break; case T_H245ModeElementType_audioMode: - if (ooSendRequestModeAck(call, requestMode->sequenceNumber) == OO_OK && + if (ooSendRequestModeAck(call, requestMode->sequenceNumber) == OO_OK && OO_TESTFLAG(call->flags, OO_M_DATASESSION)) { OO_CLRFLAG(call->flags, OO_M_DATASESSION); @@ -1499,22 +1499,22 @@ int ooHandleRequestMode(OOH323CallData* call, ; } return OO_OK; - + } -int ooHandleOpenLogicalChannel(OOH323CallData* call, +int ooHandleOpenLogicalChannel(OOH323CallData* call, H245OpenLogicalChannel *olc) { H245OpenLogicalChannel_forwardLogicalChannelParameters *flcp = &(olc->forwardLogicalChannelParameters); - + #if 0 if(!call->logicalChans) ooOpenLogicalChannels(call); #endif - /* Check whether channel type is supported. Only supported channel + /* Check whether channel type is supported. Only supported channel type for now is g711ulaw audio channel. */ switch(flcp->dataType.t) @@ -1587,17 +1587,17 @@ int ooHandleOpenLogicalChannel(OOH323CallData* call, T_H245OpenLogicalChannelReject_cause_dataTypeNotSupported); break; default: - OOTRACEERR3("ERROR:Unknown media channel data type (%s, %s)\n", + OOTRACEERR3("ERROR:Unknown media channel data type (%s, %s)\n", call->callType, call->callToken); ooSendOpenLogicalChannelReject(call, olc->forwardLogicalChannelNumber, T_H245OpenLogicalChannelReject_cause_dataTypeNotSupported); } - + return OO_OK; -} +} /*TODO: Need to clean logical channel in case of failure after creating one */ -int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, +int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, H245OpenLogicalChannel*olc) { int ret=0; @@ -1618,7 +1618,7 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, if(!flcp || flcp->multiplexParameters.t != T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR3("Error:ooHandleOpenLogicalChannel_helper - invalid forward " - "logical channel parameters. (%s, %s)\n", call->callType, + "logical channel parameters. (%s, %s)\n", call->callType, call->callToken); ooSendOpenLogicalChannelReject(call, olc->forwardLogicalChannelNumber, T_H245OpenLogicalChannelReject_cause_unspecified); @@ -1641,7 +1641,7 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, if(ret != OO_OK) { OOTRACEERR3("Error: H245 message creation failed for - " - "OpenLogicalChannel Ack (%s, %s)\n", call->callType, + "OpenLogicalChannel Ack (%s, %s)\n", call->callType, call->callToken); memFreePtr(call->pctxt, epCap); epCap = NULL; @@ -1656,18 +1656,18 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, memset(response, 0, sizeof(H245ResponseMessage)); response->t = T_H245ResponseMessage_openLogicalChannelAck; response->u.openLogicalChannelAck = (H245OpenLogicalChannelAck*) - memAlloc(pctxt, sizeof(H245OpenLogicalChannelAck)); + memAlloc(pctxt, sizeof(H245OpenLogicalChannelAck)); olcAck = response->u.openLogicalChannelAck; memset(olcAck, 0, sizeof(H245OpenLogicalChannelAck)); olcAck->forwardLogicalChannelNumber = olc->forwardLogicalChannelNumber; olcAck->m.forwardMultiplexAckParametersPresent = 1; - olcAck->forwardMultiplexAckParameters.t = + olcAck->forwardMultiplexAckParameters.t = T_H245OpenLogicalChannelAck_forwardMultiplexAckParameters_h2250LogicalChannelAckParameters; - olcAck->forwardMultiplexAckParameters.u.h2250LogicalChannelAckParameters = - (H245H2250LogicalChannelAckParameters*)ASN1MALLOC(pctxt, + olcAck->forwardMultiplexAckParameters.u.h2250LogicalChannelAckParameters = + (H245H2250LogicalChannelAckParameters*)ASN1MALLOC(pctxt, sizeof(H245H2250LogicalChannelAckParameters)); - h2250lcap = + h2250lcap = olcAck->forwardMultiplexAckParameters.u.h2250LogicalChannelAckParameters; memset(h2250lcap, 0, sizeof(H245H2250LogicalChannelAckParameters)); @@ -1679,8 +1679,8 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, h2250lcap->sessionID = ooCallGenerateSessionID(call, epCap->capType, "receive"); else h2250lcap->sessionID = h2250lcp->sessionID; - - h2250lcap->mediaChannel.t = + + h2250lcap->mediaChannel.t = T_H245TransportAddress_unicastAddress; h2250lcap->mediaChannel.u.unicastAddress = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); @@ -1702,12 +1702,12 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, memset(iPAddress, 0, sizeof(H245UnicastAddress_iPAddress)); } - pLogicalChannel = ooAddNewLogicalChannel(call, + pLogicalChannel = ooAddNewLogicalChannel(call, olc->forwardLogicalChannelNumber, h2250lcap->sessionID, "receive", epCap); if(!pLogicalChannel) { - OOTRACEERR3("ERROR:Failed to add new logical channel entry to call " + OOTRACEERR3("ERROR:Failed to add new logical channel entry to call " "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -1723,7 +1723,7 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, } /* media contrcol channel */ - h2250lcap->mediaControlChannel.t = + h2250lcap->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; h2250lcap->mediaControlChannel.u.unicastAddress = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); @@ -1752,13 +1752,13 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, iPAddress1->tsapIdentifier = pLogicalChannel->localRtcpPort; } - OOTRACEDBGA3("Built OpenLogicalChannelAck (%s, %s)\n", call->callType, + OOTRACEDBGA3("Built OpenLogicalChannelAck (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to enqueue OpenLogicalChannelAck message to " - "outbound queue. (%s, %s)\n", call->callType, + "outbound queue. (%s, %s)\n", call->callType, call->callToken); } ooFreeH245Message(call, ph245msg); @@ -1766,10 +1766,10 @@ int ooHandleOpenLogicalChannel_helper(OOH323CallData *call, if(epCap->startReceiveChannel) { - epCap->startReceiveChannel(call, pLogicalChannel); - OOTRACEINFO6("Receive channel of type %s started at %s:%d(%s, %s)\n", + epCap->startReceiveChannel(call, pLogicalChannel); + OOTRACEINFO6("Receive channel of type %s started at %s:%d(%s, %s)\n", ooGetCapTypeText(epCap->cap), pLogicalChannel->localIP, - pLogicalChannel->localRtpPort, call->callType, + pLogicalChannel->localRtpPort, call->callType, call->callToken); } else{ @@ -1795,7 +1795,7 @@ int ooSendOpenLogicalChannelReject if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - OpenLogicalChannel" - "Reject (%s, %s)\n",call->callType, + "Reject (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -1804,34 +1804,34 @@ int ooSendOpenLogicalChannelReject response->t = T_H245ResponseMessage_openLogicalChannelReject; - response->u.openLogicalChannelReject = + response->u.openLogicalChannelReject = (H245OpenLogicalChannelReject*) memAlloc (pctxt, sizeof(H245OpenLogicalChannelReject)); if(!response->u.openLogicalChannelReject) { OOTRACEERR3("Error: Failed to allocate memory for OpenLogicalChannel" - "Reject message. (%s, %s)\n", call->callType, + "Reject message. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - response->u.openLogicalChannelReject->forwardLogicalChannelNumber = + response->u.openLogicalChannelReject->forwardLogicalChannelNumber = channelNum; response->u.openLogicalChannelReject->cause.t = cause; - OOTRACEDBGA3 ("Built OpenLogicalChannelReject (%s, %s)\n", + OOTRACEDBGA3 ("Built OpenLogicalChannelReject (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue OpenLogicalChannelReject " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; @@ -1853,20 +1853,20 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, H245UnicastAddress_iP6Address *iP6Address1 = NULL; if(!((olcAck->m.forwardMultiplexAckParametersPresent == 1) && - (olcAck->forwardMultiplexAckParameters.t == + (olcAck->forwardMultiplexAckParameters.t == T_H245OpenLogicalChannelAck_forwardMultiplexAckParameters_h2250LogicalChannelAckParameters))) { OOTRACEERR3("Error: Processing open logical channel ack - LogicalChannel" - "Ack parameters absent (%s, %s)\n", call->callType, + "Ack parameters absent (%s, %s)\n", call->callType, call->callToken); return OO_OK; /* should send CloseLogicalChannel request */ } - h2250lcap = + h2250lcap = olcAck->forwardMultiplexAckParameters.u.h2250LogicalChannelAckParameters; /* Extract media channel address */ if(h2250lcap->m.mediaChannelPresent != 1) - { + { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media channel " "absent (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; @@ -1874,51 +1874,51 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, if(h2250lcap->mediaChannel.t != T_H245TransportAddress_unicastAddress) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media channel " - "address type is not unicast (%s, %s)\n", call->callType, + "address type is not unicast (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + unicastAddr = h2250lcap->mediaChannel.u.unicastAddress; if (call->versionIP == 6) { if(unicastAddr->t != T_H245UnicastAddress_iP6Address) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media channel " - "address type is not IP6 (%s, %s)\n", call->callType, + "address type is not IP6 (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } iP6Address = unicastAddr->u.iP6Address; inet_ntop(AF_INET6, iP6Address->network.data, remoteip, sizeof(remoteip)); - + } else { if(unicastAddr->t != T_H245UnicastAddress_iPAddress) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media channel " - "address type is not IP (%s, %s)\n", call->callType, + "address type is not IP (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } iPAddress = unicastAddr->u.iPAddress; inet_ntop(AF_INET, iPAddress->network.data, remoteip, sizeof(remoteip)); } - + /* Extract media control channel address */ if(h2250lcap->m.mediaControlChannelPresent == 1) { - if(h2250lcap->mediaControlChannel.t != + if(h2250lcap->mediaControlChannel.t != T_H245TransportAddress_unicastAddress) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media control " - "channel address type is not unicast (%s, %s)\n", + "channel address type is not unicast (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + unicastAddr1 = h2250lcap->mediaControlChannel.u.unicastAddress; if (call->versionIP == 6) { if(unicastAddr1->t != T_H245UnicastAddress_iP6Address) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media control " - "channel address type is not IP6 (%s, %s)\n", call->callType, + "channel address type is not IP6 (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -1926,7 +1926,7 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, } else { if(unicastAddr1->t != T_H245UnicastAddress_iPAddress) { OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media control " - "channel address type is not IP (%s, %s)\n", call->callType, + "channel address type is not IP (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -1939,21 +1939,21 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, /* Set remote destination address for rtp session */ // strcpy(call->remoteIP, remoteip); - + /* Start channel here */ pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,olcAck->forwardLogicalChannelNumber); if(!pLogicalChannel) { OOTRACEERR4("ERROR:Logical channel %d not found in the channel list for " - "call (%s, %s)\n", olcAck->forwardLogicalChannelNumber, + "call (%s, %s)\n", olcAck->forwardLogicalChannelNumber, call->callType, call->callToken); return OO_FAILED; } - /* Update session id if we were waiting for remote to assign one and remote + /* Update session id if we were waiting for remote to assign one and remote did assign one. */ if(pLogicalChannel->sessionID == 0 && h2250lcap->m.sessionIDPresent) - pLogicalChannel->sessionID = h2250lcap->sessionID; + pLogicalChannel->sessionID = h2250lcap->sessionID; /* Populate ports &ip for channel */ @@ -1965,7 +1965,7 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, } } - strcpy(pLogicalChannel->remoteIP, remoteip); + strcpy(pLogicalChannel->remoteIP, remoteip); if (call->versionIP == 6) { pLogicalChannel->remoteMediaPort = iP6Address->tsapIdentifier; if (iP6Address1) @@ -1978,7 +1978,7 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, if(pLogicalChannel->chanCap->startTransmitChannel) { pLogicalChannel->chanCap->startTransmitChannel(call, pLogicalChannel); - OOTRACEINFO4("TransmitLogical Channel of type %s started (%s, %s)\n", + OOTRACEINFO4("TransmitLogical Channel of type %s started (%s, %s)\n", ooGetCapTypeText(pLogicalChannel->chanCap->cap), call->callType, call->callToken); } @@ -1991,94 +1991,94 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call, return OO_OK; } -int ooOnReceivedOpenLogicalChannelRejected(OOH323CallData *call, +int ooOnReceivedOpenLogicalChannelRejected(OOH323CallData *call, H245OpenLogicalChannelReject *olcReject) { switch(olcReject->cause.t) { case T_H245OpenLogicalChannelReject_cause_unspecified: OOTRACEINFO4("Open logical channel %d rejected - unspecified (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, call->callType, + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_unsuitableReverseParameters: OOTRACEINFO4("Open logical channel %d rejected - " - "unsuitableReverseParameters (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, call->callType, + "unsuitableReverseParameters (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_dataTypeNotSupported: OOTRACEINFO4("Open logical channel %d rejected - dataTypeNotSupported" - "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, + "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_dataTypeNotAvailable: OOTRACEINFO4("Open logical channel %d rejected - dataTypeNotAvailable" - "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, + "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_unknownDataType: OOTRACEINFO4("Open logical channel %d rejected - unknownDataType" - "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, + "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_dataTypeALCombinationNotSupported: OOTRACEINFO4("Open logical channel %d rejected - " - "dataTypeALCombinationNotSupported(%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "dataTypeALCombinationNotSupported(%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_multicastChannelNotAllowed: OOTRACEINFO4("Open logical channel %d rejected - " - "multicastChannelNotAllowed (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "multicastChannelNotAllowed (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_insufficientBandwidth: OOTRACEINFO4("Open logical channel %d rejected - insufficientBandwidth" - "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, + "(%s, %s)\n", olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_separateStackEstablishmentFailed: OOTRACEINFO4("Open logical channel %d rejected - " - "separateStackEstablishmentFailed (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "separateStackEstablishmentFailed (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_invalidSessionID: OOTRACEINFO4("Open logical channel %d rejected - " - "invalidSessionID (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "invalidSessionID (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_masterSlaveConflict: OOTRACEINFO4("Open logical channel %d rejected - " - "invalidSessionID (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "invalidSessionID (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_waitForCommunicationMode: OOTRACEINFO4("Open logical channel %d rejected - " - "waitForCommunicationMode (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "waitForCommunicationMode (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_invalidDependentChannel: OOTRACEINFO4("Open logical channel %d rejected - " - "invalidDependentChannel (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "invalidDependentChannel (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245OpenLogicalChannelReject_cause_replacementForRejected: OOTRACEINFO4("Open logical channel %d rejected - " - "replacementForRejected (%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + "replacementForRejected (%s, %s)\n", + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; default: OOTRACEERR4("Error: OpenLogicalChannel %d rejected - " "invalid cause(%s, %s)\n", - olcReject->forwardLogicalChannelNumber, + olcReject->forwardLogicalChannelNumber, call->callType, call->callToken); } if(call->callState < OO_CALL_CLEAR) @@ -2098,7 +2098,7 @@ int ooSendEndSessionCommand(OOH323CallData *call) H245CommandMessage * command; OOCTXT *pctxt; H245Message *ph245msg=NULL; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_command); if(ret != OO_OK) { @@ -2130,7 +2130,7 @@ int ooSendEndSessionCommand(OOH323CallData *call) } -int ooHandleH245Command(OOH323CallData *call, +int ooHandleH245Command(OOH323CallData *call, H245CommandMessage *command) { ASN1UINT i; @@ -2141,7 +2141,7 @@ int ooHandleH245Command(OOH323CallData *call, switch(command->t) { case T_H245CommandMessage_endSessionCommand: - OOTRACEINFO3("Received EndSession command (%s, %s)\n", + OOTRACEINFO3("Received EndSession command (%s, %s)\n", call->callType, call->callToken); if(call->h245SessionState == OO_H245SESSION_ENDSENT) { @@ -2150,12 +2150,12 @@ int ooHandleH245Command(OOH323CallData *call, { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if(((ooTimerCallback*)pTimer->cbData)->timerType & + if(((ooTimerCallback*)pTimer->cbData)->timerType & OO_SESSION_TIMER) { ASN1MEMFREEPTR(call->pctxt, pTimer->cbData); ooTimerDelete(call->pctxt, &call->timerList, pTimer); - OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n", + OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n", call->callType, call->callToken); break; } @@ -2170,7 +2170,7 @@ int ooHandleH245Command(OOH323CallData *call, if(call->logicalChans) { OOTRACEINFO3("In response to received EndSessionCommand - " - "Clearing all logical channels. (%s, %s)\n", + "Clearing all logical channels. (%s, %s)\n", call->callType, call->callToken); ooClearAllLogicalChannels(call); } @@ -2178,12 +2178,12 @@ int ooHandleH245Command(OOH323CallData *call, if (call->callState < OO_CALL_CLEAR) call->callState = OO_CALL_CLEAR; } - - + + break; case T_H245CommandMessage_sendTerminalCapabilitySet: OOTRACEWARN3("Warning: Received command Send terminal capability set " - "- Not handled (%s, %s)\n", call->callType, + "- Not handled (%s, %s)\n", call->callType, call->callToken); break; case T_H245CommandMessage_flowControlCommand: @@ -2194,8 +2194,8 @@ int ooHandleH245Command(OOH323CallData *call, OOTRACEWARN3("Warning: Unhandled H245 command message received " "(%s, %s)\n", call->callType, call->callToken); } - OOTRACEDBGC3("Handling H.245 command message done. (%s, %s)\n", - call->callType, call->callToken); + OOTRACEDBGC3("Handling H.245 command message done. (%s, %s)\n", + call->callType, call->callToken); return OO_OK; } @@ -2206,7 +2206,7 @@ int ooOnReceivedTerminalCapabilitySetAck(OOH323CallData* call) call->localTermCapState = OO_LocalTermCapSetAckRecvd; if(call->remoteTermCapState != OO_RemoteTermCapSetAckSent) return OO_OK; - + if(call->masterSlaveState == OO_MasterSlave_Idle) { ret = ooSendMasterSlaveDetermination(call); if(ret != OO_OK) { @@ -2214,7 +2214,7 @@ int ooOnReceivedTerminalCapabilitySetAck(OOH323CallData* call) "(%s, %s)\n", call->callType, call->callToken); return ret; } - } + } if((call->masterSlaveState == OO_MasterSlave_Master || call->masterSlaveState == OO_MasterSlave_Slave) && @@ -2224,7 +2224,7 @@ int ooOnReceivedTerminalCapabilitySetAck(OOH323CallData* call) gH323ep.h323Callbacks.openLogicalChannels(call); /* ooSendStatusInquiry(call); */ - + if(!ooGetTransmitLogicalChannel(call)) ooOpenLogicalChannels(call); #if 0 @@ -2236,7 +2236,7 @@ int ooOnReceivedTerminalCapabilitySetAck(OOH323CallData* call) } #endif } - + return OO_OK; } @@ -2247,7 +2247,7 @@ int ooCloseAllLogicalChannels(OOH323CallData *call, char* dir) temp = call->logicalChans; while(temp) { - if(temp->state == OO_LOGICALCHAN_ESTABLISHED && + if(temp->state == OO_LOGICALCHAN_ESTABLISHED && (dir == NULL || !strcmp(temp->dir,dir))) { /* Sending closelogicalchannel only for outgoing channels*/ @@ -2328,8 +2328,8 @@ int ooSendCloseLogicalChannel(OOH323CallData *call, ooLogicalChannel *logicalCha OOCTXT *pctxt; H245RequestMessage *request; H245CloseLogicalChannel* clc; - - ret = ooCreateH245Message(call, &ph245msg, + + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); if(ret != OO_OK) { @@ -2361,7 +2361,7 @@ int ooSendCloseLogicalChannel(OOH323CallData *call, ooLogicalChannel *logicalCha clc->m.reasonPresent = 1; clc->reason.t = T_H245CloseLogicalChannel_reason_unknown; - OOTRACEDBGA4("Built close logical channel for %d (%s, %s)\n", + OOTRACEDBGA4("Built close logical channel for %d (%s, %s)\n", logicalChan->channelNo, call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2371,7 +2371,7 @@ int ooSendCloseLogicalChannel(OOH323CallData *call, ooLogicalChannel *logicalCha error++; } ooFreeH245Message(call, ph245msg); - + /* Stop the media transmission */ /* Moved to OnReceivedClosedChannelAck */ logicalChan->state = OO_LOGICALCHAN_CLOSEPENDING; @@ -2382,7 +2382,7 @@ int ooSendCloseLogicalChannel(OOH323CallData *call, ooLogicalChannel *logicalCha } /*TODO: Need to pass reason as a parameter */ -int ooSendRequestCloseLogicalChannel(OOH323CallData *call, +int ooSendRequestCloseLogicalChannel(OOH323CallData *call, ooLogicalChannel *logicalChan) { int ret = OO_OK; @@ -2391,12 +2391,12 @@ int ooSendRequestCloseLogicalChannel(OOH323CallData *call, H245RequestMessage *request; H245RequestChannelClose *rclc; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); if(ret != OO_OK) { OOTRACEERR3("ERROR:Failed to create H245 message for " - "requestCloseLogicalChannel message (%s, %s)\n", + "requestCloseLogicalChannel message (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -2420,11 +2420,11 @@ int ooSendRequestCloseLogicalChannel(OOH323CallData *call, rclc = request->u.requestChannelClose; memset(rclc, 0, sizeof(H245RequestChannelClose)); rclc->forwardLogicalChannelNumber = logicalChan->channelNo; - + rclc->m.reasonPresent = 1; rclc->reason.t = T_H245RequestChannelClose_reason_unknown; - OOTRACEDBGA4("Built RequestCloseChannel for %d (%s, %s)\n", + OOTRACEDBGA4("Built RequestCloseChannel for %d (%s, %s)\n", logicalChan->channelNo, call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2445,12 +2445,12 @@ int ooSendRequestChannelCloseRelease(OOH323CallData *call, int channelNum) OOCTXT *pctxt; H245IndicationMessage *indication; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_indication); if(ret != OO_OK) { OOTRACEERR3("ERROR:Failed to create H245 message for " - "RequestChannelCloseRelease message (%s, %s)\n", + "RequestChannelCloseRelease message (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -2465,15 +2465,15 @@ int ooSendRequestChannelCloseRelease(OOH323CallData *call, int channelNum) if(!indication->u.requestChannelCloseRelease) { OOTRACEERR3("Error:Failed to allocate memory for " - "RequestChannelCloseRelease message. (%s, %s)\n", + "RequestChannelCloseRelease message. (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call, ph245msg); } - indication->u.requestChannelCloseRelease->forwardLogicalChannelNumber = + indication->u.requestChannelCloseRelease->forwardLogicalChannelNumber = channelNum; - OOTRACEDBGA4("Built RequestChannelCloseRelease for %d (%s, %s)\n", + OOTRACEDBGA4("Built RequestChannelCloseRelease for %d (%s, %s)\n", channelNum, call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2487,8 +2487,8 @@ int ooSendRequestChannelCloseRelease(OOH323CallData *call, int channelNum) } - -int ooOnReceivedRequestChannelClose(OOH323CallData *call, + +int ooOnReceivedRequestChannelClose(OOH323CallData *call, H245RequestChannelClose *rclc) { int ret=0, error=0; @@ -2499,7 +2499,7 @@ int ooOnReceivedRequestChannelClose(OOH323CallData *call, ooLogicalChannel * lChannel=NULL; /* Send Ack: TODO: Need to send reject, if doesn't exist */ - lChannel = ooFindLogicalChannelByLogicalChannelNo(call, + lChannel = ooFindLogicalChannelByLogicalChannelNo(call, rclc->forwardLogicalChannelNumber); if(!lChannel) { @@ -2517,7 +2517,7 @@ int ooOnReceivedRequestChannelClose(OOH323CallData *call, return OO_FAILED; } } - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { @@ -2543,7 +2543,7 @@ int ooOnReceivedRequestChannelClose(OOH323CallData *call, memset(rclcAck, 0, sizeof(H245RequestChannelCloseAck)); rclcAck->forwardLogicalChannelNumber = rclc->forwardLogicalChannelNumber; - OOTRACEDBGA3("Built RequestCloseChannelAck message (%s, %s)\n", + OOTRACEDBGA3("Built RequestCloseChannelAck message (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2554,7 +2554,7 @@ int ooOnReceivedRequestChannelClose(OOH323CallData *call, } ooFreeH245Message(call, ph245msg); - + /* Send Close Logical Channel if LogChan is established */ if (lChannel->state == OO_LOGICALCHAN_ESTABLISHED) { ret = ooSendCloseLogicalChannel(call, lChannel); @@ -2587,8 +2587,8 @@ int ooSendRoundTripDelayRequest(OOH323CallData *call) } return OO_FAILED; } - - ret = ooCreateH245Message(call, &ph245msg, + + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); if(ret != OO_OK) { @@ -2613,7 +2613,7 @@ int ooSendRoundTripDelayRequest(OOH323CallData *call) memset(rtdr, 0, sizeof(H245RoundTripDelayRequest)); rtdr->sequenceNumber = ++call->rtdrSend; - OOTRACEDBGA3("Built RoundTripDelayRequest message (%s, %s)\n", + OOTRACEDBGA3("Built RoundTripDelayRequest message (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2648,7 +2648,7 @@ int ooSendRoundTripDelayRequest(OOH323CallData *call) return ret; } -int ooOnReceivedRoundTripDelayRequest(OOH323CallData *call, +int ooOnReceivedRoundTripDelayRequest(OOH323CallData *call, H245SequenceNumber sequenceNumber) { int ret=0; @@ -2657,7 +2657,7 @@ int ooOnReceivedRoundTripDelayRequest(OOH323CallData *call, OOCTXT *pctxt=NULL; H245RoundTripDelayResponse *rtdr; - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { @@ -2682,7 +2682,7 @@ int ooOnReceivedRoundTripDelayRequest(OOH323CallData *call, memset(rtdr, 0, sizeof(H245RoundTripDelayResponse)); rtdr->sequenceNumber = sequenceNumber; - OOTRACEDBGA3("Built RoundTripDelayResponse message (%s, %s)\n", + OOTRACEDBGA3("Built RoundTripDelayResponse message (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -2692,19 +2692,19 @@ int ooOnReceivedRoundTripDelayRequest(OOH323CallData *call, } ooFreeH245Message(call, ph245msg); - + return ret; } /* - We clear channel here. Ideally the remote endpoint should send + We clear channel here. Ideally the remote endpoint should send CloseLogicalChannel and then the channel should be cleared. But there's no timer for this and if remote endpoint misbehaves, the call will keep waiting for CloseLogicalChannel and hence, wouldn't be cleared. In case when remote endpoint sends CloseLogicalChannel, we call ooClearLogicalChannel again, which simply returns OO_OK as channel was already cleared. Other option is - to start a timer for call cleanup and if call is not cleaned up within - timeout, we clean call forcefully. Note, no such timer is defined in + to start a timer for call cleanup and if call is not cleaned up within + timeout, we clean call forcefully. Note, no such timer is defined in standards. */ int ooOnReceivedRequestChannelCloseAck @@ -2715,8 +2715,8 @@ int ooOnReceivedRequestChannelCloseAck ret = ooClearLogicalChannel(call, rccAck->forwardLogicalChannelNumber); if(ret != OO_OK) { - OOTRACEERR4("Error:Failed to clear logical channel %d. (%s, %s)\n", - rccAck->forwardLogicalChannelNumber, call->callType, + OOTRACEERR4("Error:Failed to clear logical channel %d. (%s, %s)\n", + rccAck->forwardLogicalChannelNumber, call->callType, call->callToken); } @@ -2731,37 +2731,37 @@ int ooOnReceivedRequestChannelCloseReject { case T_H245RequestChannelCloseReject_cause_unspecified: OOTRACEDBGA4("Remote endpoint has rejected request to close logical " - "channel %d - cause unspecified. (%s, %s)\n", - rccReject->forwardLogicalChannelNumber, call->callType, + "channel %d - cause unspecified. (%s, %s)\n", + rccReject->forwardLogicalChannelNumber, call->callType, call->callToken); break; case T_H245RequestChannelCloseReject_cause_extElem1: OOTRACEDBGA4("Remote endpoint has rejected request to close logical " - "channel %d - cause propriatory. (%s, %s)\n", - rccReject->forwardLogicalChannelNumber, call->callType, - call->callToken); + "channel %d - cause propriatory. (%s, %s)\n", + rccReject->forwardLogicalChannelNumber, call->callType, + call->callToken); break; default: OOTRACEDBGA4("Remote endpoint has rejected request to close logical " - "channel %d - cause INVALID. (%s, %s)\n", - rccReject->forwardLogicalChannelNumber, call->callType, + "channel %d - cause INVALID. (%s, %s)\n", + rccReject->forwardLogicalChannelNumber, call->callType, call->callToken); } - OOTRACEDBGA4("Clearing logical channel %d. (%s, %s)\n", - rccReject->forwardLogicalChannelNumber, call->callType, + OOTRACEDBGA4("Clearing logical channel %d. (%s, %s)\n", + rccReject->forwardLogicalChannelNumber, call->callType, call->callToken); ret = ooClearLogicalChannel(call, rccReject->forwardLogicalChannelNumber); if(ret != OO_OK) { - OOTRACEERR4("Error: failed to clear logical channel %d.(%s, %s)\n", - rccReject->forwardLogicalChannelNumber, call->callType, + OOTRACEERR4("Error: failed to clear logical channel %d.(%s, %s)\n", + rccReject->forwardLogicalChannelNumber, call->callType, call->callToken); } return ret; } /****/ -int ooOnReceivedCloseLogicalChannel(OOH323CallData *call, +int ooOnReceivedCloseLogicalChannel(OOH323CallData *call, H245CloseLogicalChannel* clc) { int ret=0; @@ -2769,10 +2769,10 @@ int ooOnReceivedCloseLogicalChannel(OOH323CallData *call, OOCTXT *pctxt = NULL; H245CloseLogicalChannelAck * clcAck; H245ResponseMessage *response; - + OOTRACEINFO4("Closing logical channel number %d (%s, %s)\n", clc->forwardLogicalChannelNumber, call->callType, call->callToken); - + ret = ooClearLogicalChannel(call, clc->forwardLogicalChannelNumber); if (ret != OO_OK) { OOTRACEERR4("ERROR:Failed to close logical channel %d (%s, %s)\n", @@ -2780,12 +2780,12 @@ int ooOnReceivedCloseLogicalChannel(OOH323CallData *call, return OO_FAILED; } - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { OOTRACEERR3("ERROR:Failed to create H245 message for " - "closeLogicalChannelAck (%s, %s)\n", call->callType, + "closeLogicalChannelAck (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -2820,7 +2820,7 @@ int ooOnReceivedCloseLogicalChannel(OOH323CallData *call, return ret; } -int ooOnReceivedCloseChannelAck(OOH323CallData* call, +int ooOnReceivedCloseChannelAck(OOH323CallData* call, H245CloseLogicalChannelAck* clcAck) { int ret = OO_OK; @@ -2844,17 +2844,17 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) OOTimer *pTimer = NULL; H245Message *pH245 = (H245Message*)pmsg; /* There are four major types of H.245 messages that can be received. - Request/Response/Command/Indication. Each one of them need to be + Request/Response/Command/Indication. Each one of them need to be handled separately. - */ + */ H245RequestMessage *request = NULL; H245ResponseMessage *response = NULL; H245CommandMessage *command = NULL; H245IndicationMessage *indication = NULL; - - OOTRACEDBGC3("Handling H245 message. (%s, %s)\n", call->callType, + + OOTRACEDBGC3("Handling H245 message. (%s, %s)\n", call->callType, call->callToken); - + switch(pH245->h245Msg.t) { /* H.245 Request message is received */ @@ -2863,22 +2863,22 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) switch(request->t) { case T_H245RequestMessage_terminalCapabilitySet: - /* If session isn't marked active yet, do it. possible in case of + /* If session isn't marked active yet, do it. possible in case of tunneling */ if(call->h245SessionState == OO_H245SESSION_IDLE) - call->h245SessionState = OO_H245SESSION_ACTIVE; + call->h245SessionState = OO_H245SESSION_ACTIVE; ooOnReceivedTerminalCapabilitySet(call, pH245); if(call->localTermCapState == OO_LocalTermCapExchange_Idle) ooSendTermCapMsg(call); break; case T_H245RequestMessage_masterSlaveDetermination: - ooHandleMasterSlave(call, - request->u.masterSlaveDetermination, + ooHandleMasterSlave(call, + request->u.masterSlaveDetermination, OOMasterSlaveDetermination); break; case T_H245RequestMessage_openLogicalChannel: - ooHandleOpenLogicalChannel(call, + ooHandleOpenLogicalChannel(call, request->u.openLogicalChannel); if(!ooGetTransmitLogicalChannel(call)) ooOpenLogicalChannels(call); @@ -2886,14 +2886,14 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) case T_H245RequestMessage_requestMode: OOTRACEINFO4("Received request mode - %d (%s, %s)\n", request->u.requestMode->sequenceNumber, call->callType, call->callToken); - ooHandleRequestMode(call, + ooHandleRequestMode(call, request->u.requestMode); break; case T_H245RequestMessage_closeLogicalChannel: OOTRACEINFO4("Received close logical Channel - %d (%s, %s)\n", - request->u.closeLogicalChannel->forwardLogicalChannelNumber, + request->u.closeLogicalChannel->forwardLogicalChannelNumber, call->callType, call->callToken); - if (ooOnReceivedCloseLogicalChannel(call, + if (ooOnReceivedCloseLogicalChannel(call, request->u.closeLogicalChannel) == OO_OK) { if (call->TCSPending && !ooGetTransmitLogicalChannel(call)) { call->TCSPending = FALSE; @@ -2906,9 +2906,9 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) break; case T_H245RequestMessage_requestChannelClose: OOTRACEINFO4("Received RequestChannelClose - %d (%s, %s)\n", - request->u.requestChannelClose->forwardLogicalChannelNumber, + request->u.requestChannelClose->forwardLogicalChannelNumber, call->callType, call->callToken); - ooOnReceivedRequestChannelClose(call, + ooOnReceivedRequestChannelClose(call, request->u.requestChannelClose); break; case T_H245RequestMessage_roundTripDelayRequest: @@ -2920,7 +2920,7 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) ; } /* End of Request Message */ break; - /* H.245 Response message is received */ + /* H.245 Response message is received */ case (T_H245MultimediaSystemControlMessage_response): response = pH245->h245Msg.u.response; switch(response->t) @@ -2941,8 +2941,8 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) } } - ooHandleMasterSlave(call, - response->u.masterSlaveDeterminationAck, + ooHandleMasterSlave(call, + response->u.masterSlaveDeterminationAck, OOMasterSlaveAck); break; case T_H245ResponseMessage_masterSlaveDeterminationReject: @@ -2960,7 +2960,7 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) break; } } - ooHandleMasterSlaveReject(call, + ooHandleMasterSlaveReject(call, response->u.masterSlaveDeterminationReject); break; case T_H245ResponseMessage_terminalCapabilitySetAck: @@ -2983,11 +2983,11 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) case T_H245ResponseMessage_terminalCapabilitySetReject: OOTRACEINFO3("TerminalCapabilitySetReject message received." " (%s, %s)\n", call->callType, call->callToken); - if(response->u.terminalCapabilitySetReject->sequenceNumber != + if(response->u.terminalCapabilitySetReject->sequenceNumber != call->localTermCapSeqNo) { OOTRACEINFO5("Ignoring TCSReject with mismatched seqno %d " - "(local - %d). (%s, %s)\n", + "(local - %d). (%s, %s)\n", response->u.terminalCapabilitySetReject->sequenceNumber, call->localTermCapSeqNo, call->callType, call->callToken); break; @@ -3032,19 +3032,19 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_OLC_TIMER) && - ((ooTimerCallback*)pTimer->cbData)->channelNumber == + if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_OLC_TIMER) && + ((ooTimerCallback*)pTimer->cbData)->channelNumber == response->u.openLogicalChannelAck->forwardLogicalChannelNumber) { memFreePtr(call->pctxt, pTimer->cbData); ooTimerDelete(call->pctxt, &call->timerList, pTimer); - OOTRACEDBGC3("Deleted OpenLogicalChannel Timer. (%s, %s)\n", + OOTRACEDBGC3("Deleted OpenLogicalChannel Timer. (%s, %s)\n", call->callType, call->callToken); break; } } - ooOnReceivedOpenLogicalChannelAck(call, + ooOnReceivedOpenLogicalChannelAck(call, response->u.openLogicalChannelAck); break; case T_H245ResponseMessage_openLogicalChannelReject: @@ -3054,19 +3054,19 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_OLC_TIMER) && - ((ooTimerCallback*)pTimer->cbData)->channelNumber == + if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_OLC_TIMER) && + ((ooTimerCallback*)pTimer->cbData)->channelNumber == response->u.openLogicalChannelAck->forwardLogicalChannelNumber) { ASN1MEMFREEPTR(call->pctxt, pTimer->cbData); ooTimerDelete(call->pctxt, &call->timerList, pTimer); - OOTRACEDBGC3("Deleted OpenLogicalChannel Timer. (%s, %s)\n", + OOTRACEDBGC3("Deleted OpenLogicalChannel Timer. (%s, %s)\n", call->callType, call->callToken); break; } } - ooOnReceivedOpenLogicalChannelRejected(call, + ooOnReceivedOpenLogicalChannelRejected(call, response->u.openLogicalChannelReject); break; case T_H245ResponseMessage_closeLogicalChannelAck: @@ -3077,8 +3077,8 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_CLC_TIMER) && - ((ooTimerCallback*)pTimer->cbData)->channelNumber == + if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_CLC_TIMER) && + ((ooTimerCallback*)pTimer->cbData)->channelNumber == response->u.closeLogicalChannelAck->forwardLogicalChannelNumber) { @@ -3089,7 +3089,7 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) break; } } - ooOnReceivedCloseChannelAck(call, + ooOnReceivedCloseChannelAck(call, response->u.closeLogicalChannelAck); if (call->TCSPending && !ooGetReceiveLogicalChannel(call)) { call->TCSPending = FALSE; @@ -3107,8 +3107,8 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_RCC_TIMER) && - ((ooTimerCallback*)pTimer->cbData)->channelNumber == + if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_RCC_TIMER) && + ((ooTimerCallback*)pTimer->cbData)->channelNumber == response->u.requestChannelCloseAck->forwardLogicalChannelNumber) { @@ -3129,8 +3129,8 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_RCC_TIMER) && - ((ooTimerCallback*)pTimer->cbData)->channelNumber == + if((((ooTimerCallback*)pTimer->cbData)->timerType & OO_RCC_TIMER) && + ((ooTimerCallback*)pTimer->cbData)->channelNumber == response->u.requestChannelCloseReject->forwardLogicalChannelNumber) { @@ -3141,7 +3141,7 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) break; } } - ooOnReceivedRequestChannelCloseReject(call, + ooOnReceivedRequestChannelCloseReject(call, response->u.requestChannelCloseReject); break; case T_H245ResponseMessage_roundTripDelayResponse: @@ -3174,7 +3174,7 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) default: ; } - OOTRACEDBGC3("Finished handling H245 message. (%s, %s)\n", + OOTRACEDBGC3("Finished handling H245 message. (%s, %s)\n", call->callType, call->callToken); return OO_OK; } @@ -3183,19 +3183,19 @@ int ooHandleH245Message(OOH323CallData *call, H245Message * pmsg) int ooOnReceivedUserInputIndication (OOH323CallData *call, H245UserInputIndication *indication) { - if((indication->t == T_H245UserInputIndication_alphanumeric) && + if((indication->t == T_H245UserInputIndication_alphanumeric) && (call->dtmfmode & OO_CAP_DTMF_H245_alphanumeric)) { if(gH323ep.h323Callbacks.onReceivedDTMF) gH323ep.h323Callbacks.onReceivedDTMF(call,indication->u.alphanumeric); } - else if((indication->t == T_H245UserInputIndication_signal) && + else if((indication->t == T_H245UserInputIndication_signal) && (call->dtmfmode & OO_CAP_DTMF_H245_signal)) { if(call->lastDTMF && indication->u.signal->signalType[0] == call->lastDTMF && - call->nextDTMFstamp && indication->u.signal->m.rtpPresent && + call->nextDTMFstamp && indication->u.signal->m.rtpPresent && indication->u.signal->rtp.m.timestampPresent) { if(call->nextDTMFstamp > indication->u.signal->rtp.timestamp) { - OOTRACEERR4("ERROR:Duplicate dtmf %c on ((%s, %s)\n", call->lastDTMF, call->callType, + OOTRACEERR4("ERROR:Duplicate dtmf %c on ((%s, %s)\n", call->lastDTMF, call->callType, call->callToken); return OO_OK; } @@ -3210,7 +3210,7 @@ int ooOnReceivedUserInputIndication call->lastDTMF = 0; } if(gH323ep.h323Callbacks.onReceivedDTMF) - gH323ep.h323Callbacks.onReceivedDTMF(call, + gH323ep.h323Callbacks.onReceivedDTMF(call, indication->u.signal->signalType); } else { @@ -3232,9 +3232,9 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) if(call->remoteTermCapSeqNo > tcs->sequenceNumber) { OOTRACEINFO4("Rejecting TermCapSet message with SeqNo %d, as already " - "acknowledged message with this SeqNo (%s, %s)\n", + "acknowledged message with this SeqNo (%s, %s)\n", call->remoteTermCapSeqNo, call->callType, call->callToken); - ooSendTerminalCapabilitySetReject(call, tcs->sequenceNumber, + ooSendTerminalCapabilitySetReject(call, tcs->sequenceNumber, T_H245TerminalCapabilitySetReject_cause_unspecified); return OO_OK; @@ -3247,7 +3247,7 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) */ /* 20111103 */ -/* for addition for previous we must check repeated tcs if it's not first +/* for addition for previous we must check repeated tcs if it's not first tcs i.e. SeqNo is not null */ if(call->remoteTermCapSeqNo && call->remoteTermCapSeqNo == tcs->sequenceNumber) @@ -3286,7 +3286,7 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) pNode = dListFindByIndex(&tcs->capabilityTable, k); if(pNode) { - OOTRACEDBGC4("Processing CapabilityTable Entry %d (%s, %s)\n", + OOTRACEDBGC4("Processing CapabilityTable Entry %d (%s, %s)\n", k, call->callType, call->callToken); capEntry = (H245CapabilityTableEntry*) pNode->data; if(capEntry->m.capabilityPresent){ @@ -3294,7 +3294,7 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) if(ret != OO_OK) { OOTRACEERR4("Error:Failed to process remote capability in " - "capability table at index %d. (%s, %s)\n", + "capability table at index %d. (%s, %s)\n", k, call->callType, call->callToken); } ooCapabilityUpdateJointCapabilities(call, &capEntry->capability); @@ -3309,11 +3309,11 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) OO_SETFLAG(call->flags, OO_M_T38SUPPORTED); else OO_CLRFLAG(call->flags, OO_M_T38SUPPORTED); - + /* Update remoteTermCapSetState */ call->remoteTermCapState = OO_RemoteTermCapSetRecvd; - ooH245AcknowledgeTerminalCapabilitySet(call); + ooH245AcknowledgeTerminalCapabilitySet(call); /* If we haven't yet send TCS then send it now */ if(call->localTermCapState == OO_LocalTermCapExchange_Idle) @@ -3338,7 +3338,7 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) "(%s, %s)\n", call->callType, call->callToken); return ret; } - } + } /* Check MasterSlave procedure has finished */ @@ -3348,7 +3348,7 @@ int ooOnReceivedTerminalCapabilitySet(OOH323CallData *call, H245Message *pmsg) /* As both MasterSlave and TerminalCapabilitySet procedures have finished, OpenLogicalChannels */ - + if(gH323ep.h323Callbacks.openLogicalChannels) gH323ep.h323Callbacks.openLogicalChannels(call); @@ -3373,7 +3373,7 @@ int ooSendTerminalCapabilitySetReject H245Message *ph245msg=NULL; H245ResponseMessage * response=NULL; OOCTXT *pctxt=NULL; - int ret = ooCreateH245Message(call, &ph245msg, + int ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { @@ -3387,18 +3387,18 @@ int ooSendTerminalCapabilitySetReject /* pctxt = &gH323ep.msgctxt; */ pctxt = call->msgctxt; response->t = T_H245ResponseMessage_terminalCapabilitySetReject; - + response->u.terminalCapabilitySetReject = (H245TerminalCapabilitySetReject*) ASN1MALLOC(pctxt, sizeof(H245TerminalCapabilitySetReject)); - memset(response->u.terminalCapabilitySetReject, 0, + memset(response->u.terminalCapabilitySetReject, 0, sizeof(H245TerminalCapabilitySetReject)); response->u.terminalCapabilitySetReject->sequenceNumber = seqNo; response->u.terminalCapabilitySetReject->cause.t = cause; - OOTRACEDBGA3("Built TerminalCapabilitySetReject (%s, %s)\n", + OOTRACEDBGA3("Built TerminalCapabilitySetReject (%s, %s)\n", call->callType, call->callToken); - + ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) { @@ -3417,7 +3417,7 @@ int ooH245AcknowledgeTerminalCapabilitySet(OOH323CallData *call) H245Message *ph245msg=NULL; H245ResponseMessage * response=NULL; OOCTXT *pctxt=NULL; - int ret = ooCreateH245Message(call, &ph245msg, + int ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_response); if(ret != OO_OK) { @@ -3431,15 +3431,15 @@ int ooH245AcknowledgeTerminalCapabilitySet(OOH323CallData *call) /* pctxt = &gH323ep.msgctxt; */ pctxt = call->msgctxt; response->t = T_H245ResponseMessage_terminalCapabilitySetAck; - + response->u.terminalCapabilitySetAck = (H245TerminalCapabilitySetAck*) ASN1MALLOC(pctxt, sizeof(H245TerminalCapabilitySetAck)); - memset(response->u.terminalCapabilitySetAck, 0, + memset(response->u.terminalCapabilitySetAck, 0, sizeof(H245TerminalCapabilitySetAck)); response->u.terminalCapabilitySetAck->sequenceNumber = call->remoteTermCapSeqNo; - OOTRACEDBGA3("Built TerminalCapabilitySet Ack (%s, %s)\n", + OOTRACEDBGA3("Built TerminalCapabilitySet Ack (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); @@ -3468,7 +3468,7 @@ int ooSendTerminalCapabilitySetRelease(OOH323CallData * call) if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - Terminal" - "CapabilitySetRelease (%s, %s)\n",call->callType, + "CapabilitySetRelease (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -3477,7 +3477,7 @@ int ooSendTerminalCapabilitySetRelease(OOH323CallData * call) indication->t = T_H245IndicationMessage_terminalCapabilitySetRelease; - indication->u.terminalCapabilitySetRelease = + indication->u.terminalCapabilitySetRelease = (H245TerminalCapabilitySetRelease*) memAlloc (pctxt, sizeof(H245TerminalCapabilitySetRelease)); @@ -3488,18 +3488,18 @@ int ooSendTerminalCapabilitySetRelease(OOH323CallData * call) ooFreeH245Message(call, ph245msg); return OO_FAILED; } - OOTRACEDBGA3 ("Built TerminalCapabilitySetRelease (%s, %s)\n", + OOTRACEDBGA3 ("Built TerminalCapabilitySetRelease (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue TerminalCapabilitySetRelease " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; } @@ -3519,7 +3519,7 @@ int ooSendH245UserInputIndication_alphanumeric if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - H245UserInput" - "Indication_alphanumeric (%s, %s)\n",call->callType, + "Indication_alphanumeric (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -3527,7 +3527,7 @@ int ooSendH245UserInputIndication_alphanumeric indication = ph245msg->h245Msg.u.indication; indication->t = T_H245IndicationMessage_userInput; - indication->u.userInput = + indication->u.userInput = (H245UserInputIndication*) memAllocZ (pctxt, sizeof(H245UserInputIndication)); @@ -3549,18 +3549,18 @@ int ooSendH245UserInputIndication_alphanumeric return OO_FAILED; } strcpy(*(char**)&indication->u.userInput->u.alphanumeric, data); - OOTRACEDBGA3 ("Built UserInputIndication_alphanumeric (%s, %s)\n", + OOTRACEDBGA3 ("Built UserInputIndication_alphanumeric (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue UserInputIndication_alphanumeric " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; } @@ -3579,7 +3579,7 @@ int ooSendH245UserInputIndication_signal if (ret != OO_OK) { OOTRACEERR3("Error:H245 message creation failed for - H245UserInput" - "Indication_signal (%s, %s)\n",call->callType, + "Indication_signal (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } @@ -3587,7 +3587,7 @@ int ooSendH245UserInputIndication_signal indication = ph245msg->h245Msg.u.indication; indication->t = T_H245IndicationMessage_userInput; - indication->u.userInput = + indication->u.userInput = (H245UserInputIndication*) memAllocZ (pctxt, sizeof(H245UserInputIndication)); @@ -3612,18 +3612,18 @@ int ooSendH245UserInputIndication_signal return OO_FAILED; } strcpy(*(char**)&indication->u.userInput->u.signal->signalType, data); - OOTRACEDBGA3 ("Built UserInputIndication_signal (%s, %s)\n", + OOTRACEDBGA3 ("Built UserInputIndication_signal (%s, %s)\n", call->callType, call->callToken); ret = ooSendH245Msg (call, ph245msg); if (ret != OO_OK) { - OOTRACEERR3 + OOTRACEERR3 ("Error:Failed to enqueue UserInputIndication_signal " - "message to outbound queue.(%s, %s)\n", call->callType, + "message to outbound queue.(%s, %s)\n", call->callType, call->callToken); } - + ooFreeH245Message (call, ph245msg); return ret; } @@ -3632,8 +3632,8 @@ int ooSendH245UserInputIndication_signal int ooOpenLogicalChannels(OOH323CallData *call) { int ret=0; - OOTRACEINFO3("Opening logical channels (%s, %s)\n", call->callType, - call->callToken); + OOTRACEINFO3("Opening logical channels (%s, %s)\n", call->callType, + call->callToken); /* Audio channels */ if(gH323ep.callMode == OO_CALLMODE_AUDIOCALL || @@ -3654,7 +3654,7 @@ int ooOpenLogicalChannels(OOH323CallData *call) return ret; } } - + if(gH323ep.callMode == OO_CALLMODE_VIDEOCALL) { /* if (!OO_TESTFLAG (call->flags, OO_M_AUDIOSESSION)) @@ -3704,11 +3704,11 @@ int ooOpenLogicalChannel(OOH323CallData *call, enum OOCapType capType ) " (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + /* Go through local endpoints capabilities sequentially, and find out the first one which has a match in the remote endpoints receive capabilities. */ - OOTRACEINFO3("Looking for matching capabilities. (%s, %s)\n", + OOTRACEINFO3("Looking for matching capabilities. (%s, %s)\n", call->callType, call->callToken); /* May */ if(call->masterSlaveState == OO_MasterSlave_Master) @@ -3716,11 +3716,11 @@ int ooOpenLogicalChannel(OOH323CallData *call, enum OOCapType capType ) for(k=0; kcapPrefs.index; k++) { /*Search for audio caps only */ - if(capType == OO_CAP_TYPE_AUDIO && + if(capType == OO_CAP_TYPE_AUDIO && call->capPrefs.order[k] > OO_CAP_VIDEO_BASE) continue; /* Search for video caps only */ - if(capType == OO_CAP_TYPE_VIDEO && + if(capType == OO_CAP_TYPE_VIDEO && call->capPrefs.order[k] <= OO_CAP_VIDEO_BASE) continue; @@ -3743,7 +3743,7 @@ int ooOpenLogicalChannel(OOH323CallData *call, enum OOCapType capType ) if(!epCap) { OOTRACEERR4("ERROR:Incompatible capabilities - Can not open " - "%s channel (%s, %s)\n", + "%s channel (%s, %s)\n", (capType==OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); return OO_FAILED; @@ -3761,12 +3761,12 @@ int ooOpenLogicalChannel(OOH323CallData *call, enum OOCapType capType ) if(!epCap) { OOTRACEERR4("ERROR:Incompatible audio capabilities - Can not open " - "%s channel (%s, %s)\n", + "%s channel (%s, %s)\n", (capType==OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); return OO_FAILED; } - + } switch(epCap->cap) @@ -3792,9 +3792,9 @@ int ooOpenLogicalChannel(OOH323CallData *call, enum OOCapType capType ) ooOpenChannel(call, epCap); break; - + default: - OOTRACEERR3("ERROR:Unknown Audio Capability type (%s, %s)\n", + OOTRACEERR3("ERROR:Unknown Audio Capability type (%s, %s)\n", call->callType, call->callToken); } return OO_OK; @@ -3816,17 +3816,17 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) H245UnicastAddress_iP6Address *iP6Address = NULL; unsigned session_id=0; ooLogicalChannel *pLogicalChannel = NULL; - - OOTRACEDBGC4("Doing Open Channel for %s. (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + + OOTRACEDBGC4("Doing Open Channel for %s. (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); - ret = ooCreateH245Message(call, &ph245msg, + ret = ooCreateH245Message(call, &ph245msg, T_H245MultimediaSystemControlMessage_request); if(ret != OO_OK) { OOTRACEERR4("Error: H245 message creation failed for - Open %s" - "channel (%s, %s)\n", ooGetCapTypeText(epCap->cap), + "channel (%s, %s)\n", ooGetCapTypeText(epCap->cap), call->callType, call->callToken); return OO_FAILED; } @@ -3835,7 +3835,7 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) ph245msg->logicalChannelNo = call->logicalChanNoCur++; if(call->logicalChanNoCur > call->logicalChanNoMax) - call->logicalChanNoCur = call->logicalChanNoBase; + call->logicalChanNoCur = call->logicalChanNoBase; request = ph245msg->h245Msg.u.request; /* pctxt = &gH323ep.msgctxt; */ @@ -3852,19 +3852,19 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) return OO_FAILED; } - memset(request->u.openLogicalChannel, 0, + memset(request->u.openLogicalChannel, 0, sizeof(H245OpenLogicalChannel)); - request->u.openLogicalChannel->forwardLogicalChannelNumber = + request->u.openLogicalChannel->forwardLogicalChannelNumber = ph245msg->logicalChannelNo; - + session_id = ooCallGenerateSessionID(call, epCap->capType, "transmit"); - pLogicalChannel = ooAddNewLogicalChannel(call, + pLogicalChannel = ooAddNewLogicalChannel(call, request->u.openLogicalChannel->forwardLogicalChannelNumber, session_id, "transmit", epCap); - + if(!pLogicalChannel) { OOTRACEERR3("ERROR:Failed to add new logical channel entry (%s, %s)\n", @@ -3887,29 +3887,29 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) if(!audioCap) { OOTRACEERR4("Error:Failed to create duplicate audio capability in " - "ooOpenChannel- %s (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + "ooOpenChannel- %s (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + flcp->dataType.u.audioData = audioCap; } else if(epCap->capType == OO_CAP_TYPE_VIDEO) { - flcp->dataType.t = T_H245DataType_videoData; + flcp->dataType.t = T_H245DataType_videoData; videoCap = ooCapabilityCreateVideoCapability(epCap, pctxt, OOTX); if(!videoCap) { OOTRACEERR4("Error:Failed to create duplicate video capability in " - "ooOpenChannel- %s (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + "ooOpenChannel- %s (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + flcp->dataType.u.videoData = videoCap; } else if(epCap->capType == OO_CAP_TYPE_DATA) @@ -3920,13 +3920,13 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) if(!t38Cap) { OOTRACEERR4("Error:Failed to create duplicate T38 capability in " - "ooOpenChannel- %s (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + "ooOpenChannel- %s (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); ooFreeH245Message(call, ph245msg); return OO_FAILED; } - + flcp->dataType.u.data = t38Cap; } else{ @@ -3934,11 +3934,11 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) return OO_FAILED; } - - flcp->multiplexParameters.t = + + flcp->multiplexParameters.t = T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters; - flcp->multiplexParameters.u.h2250LogicalChannelParameters = - (H245H2250LogicalChannelParameters*)ASN1MALLOC(pctxt, + flcp->multiplexParameters.u.h2250LogicalChannelParameters = + (H245H2250LogicalChannelParameters*)ASN1MALLOC(pctxt, sizeof(H245H2250LogicalChannelParameters)); h2250lcp = flcp->multiplexParameters.u.h2250LogicalChannelParameters; @@ -3949,8 +3949,8 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) h2250lcp->mediaGuaranteedDelivery = 0; h2250lcp->silenceSuppression = 0; h2250lcp->m.mediaControlChannelPresent = 1; - - h2250lcp->mediaControlChannel.t = + + h2250lcp->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; h2250lcp->mediaControlChannel.u.unicastAddress = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); @@ -3978,9 +3978,9 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) iPAddress->network.numocts = 4; iPAddress->tsapIdentifier = pLogicalChannel->localRtcpPort; } - pLogicalChannel->state = OO_LOGICALCHAN_PROPOSED; - OOTRACEDBGA4("Built OpenLogicalChannel-%s (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + pLogicalChannel->state = OO_LOGICALCHAN_PROPOSED; + OOTRACEDBGA4("Built OpenLogicalChannel-%s (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); ret = ooSendH245Msg(call, ph245msg); if(ret != OO_OK) @@ -3990,17 +3990,17 @@ int ooOpenChannel(OOH323CallData* call, ooH323EpCapability *epCap) call->callToken); } ooFreeH245Message(call, ph245msg); - + return ret; } -/* Used to build OLCs for fast connect. Keep in mind that forward and - reverse - are always with respect to the endpoint which proposes channels +/* Used to build OLCs for fast connect. Keep in mind that forward and + reverse + are always with respect to the endpoint which proposes channels TODO: Need to clean logical channel in case of failure. */ int ooBuildFastStartOLC - (OOH323CallData *call, H245OpenLogicalChannel *olc, + (OOH323CallData *call, H245OpenLogicalChannel *olc, ooH323EpCapability *epCap, OOCTXT*pctxt, int dir) { OOBOOL reverse=FALSE, forward=FALSE; @@ -4015,16 +4015,16 @@ int ooBuildFastStartOLC ooLogicalChannel *pLogicalChannel = NULL; int outgoing=FALSE; - if(!strcmp(call->callType, "outgoing")) + if(!strcmp(call->callType, "outgoing")) outgoing = TRUE; - + if(dir & OORX) { OOTRACEDBGA3("Building OpenLogicalChannel for Receive Capability " "(%s, %s)\n", call->callType, call->callToken); session_id = ooCallGenerateSessionID(call, epCap->capType, "receive"); - pLogicalChannel = ooAddNewLogicalChannel(call, - olc->forwardLogicalChannelNumber, session_id, + pLogicalChannel = ooAddNewLogicalChannel(call, + olc->forwardLogicalChannelNumber, session_id, "receive", epCap); if(outgoing) reverse = TRUE; @@ -4036,7 +4036,7 @@ int ooBuildFastStartOLC OOTRACEDBGA3("Building OpenLogicalChannel for transmit Capability " "(%s, %s)\n", call->callType, call->callToken); session_id = ooCallGenerateSessionID(call, epCap->capType, "transmit"); - pLogicalChannel = ooAddNewLogicalChannel(call, + pLogicalChannel = ooAddNewLogicalChannel(call, olc->forwardLogicalChannelNumber, session_id, "transmit", epCap); if(outgoing) @@ -4057,16 +4057,16 @@ int ooBuildFastStartOLC if(forward) { - OOTRACEDBGC3("Building forward olc. (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building forward olc. (%s, %s)\n", call->callType, call->callToken); flcp = &(olc->forwardLogicalChannelParameters); - memset(flcp, 0, + memset(flcp, 0, sizeof(H245OpenLogicalChannel_forwardLogicalChannelParameters)); if(epCap->capType == OO_CAP_TYPE_AUDIO) { sessionID =1; flcp->dataType.t = T_H245DataType_audioData; - flcp->dataType.u.audioData = ooCapabilityCreateAudioCapability(epCap, + flcp->dataType.u.audioData = ooCapabilityCreateAudioCapability(epCap, pctxt, dir); } else if(epCap->capType == OO_CAP_TYPE_VIDEO) { @@ -4076,41 +4076,41 @@ int ooBuildFastStartOLC pctxt, dir); } flcp->multiplexParameters.t = T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters; - pH2250lcp1 = (H245H2250LogicalChannelParameters*)ASN1MALLOC(pctxt, + pH2250lcp1 = (H245H2250LogicalChannelParameters*)ASN1MALLOC(pctxt, sizeof(H245H2250LogicalChannelParameters)); memset(pH2250lcp1, 0, sizeof(H245H2250LogicalChannelParameters)); flcp->multiplexParameters.t = T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters; - + flcp->multiplexParameters.u.h2250LogicalChannelParameters = pH2250lcp1; - + pH2250lcp1->sessionID = sessionID; if(!outgoing) { pH2250lcp1->m.mediaChannelPresent = 1; - pH2250lcp1->mediaChannel.t = + pH2250lcp1->mediaChannel.t = T_H245TransportAddress_unicastAddress; - pUniAddrs = (H245UnicastAddress*) ASN1MALLOC(pctxt, + pUniAddrs = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); memset(pUniAddrs, 0, sizeof(H245UnicastAddress)); pH2250lcp1->mediaChannel.u.unicastAddress = pUniAddrs; if (call->versionIP == 6) { pUniAddrs->t = T_H245UnicastAddress_iP6Address; - pUniIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, + pUniIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iP6Address)); memset(pUniIp6Addrs, 0, sizeof(H245UnicastAddress_iP6Address)); pUniAddrs->u.iP6Address = pUniIp6Addrs; - + inet_pton(AF_INET6, pLogicalChannel->localIP, pUniIp6Addrs->network.data); pUniIp6Addrs->network.numocts = 16; pUniIp6Addrs->tsapIdentifier = pLogicalChannel->localRtpPort; } else { pUniAddrs->t = T_H245UnicastAddress_iPAddress; - pUniIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, + pUniIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iPAddress)); memset(pUniIpAddrs, 0, sizeof(H245UnicastAddress_iPAddress)); pUniAddrs->u.iPAddress = pUniIpAddrs; - + inet_pton(AF_INET, pLogicalChannel->localIP, pUniIpAddrs->network.data); pUniIpAddrs->network.numocts = 4; @@ -4118,30 +4118,30 @@ int ooBuildFastStartOLC } } pH2250lcp1->m.mediaControlChannelPresent = 1; - pH2250lcp1->mediaControlChannel.t = + pH2250lcp1->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; - pUnicastAddrs = (H245UnicastAddress*) ASN1MALLOC(pctxt, + pUnicastAddrs = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); memset(pUnicastAddrs, 0, sizeof(H245UnicastAddress)); pH2250lcp1->mediaControlChannel.u.unicastAddress = pUnicastAddrs; if (call->versionIP == 6) { pUnicastAddrs->t = T_H245UnicastAddress_iP6Address; - pIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, + pIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iP6Address)); memset(pIp6Addrs, 0, sizeof(H245UnicastAddress_iP6Address)); pUnicastAddrs->u.iP6Address = pIp6Addrs; - + inet_pton(AF_INET6, pLogicalChannel->localIP, pIp6Addrs->network.data); pIp6Addrs->network.numocts = 16; pIp6Addrs->tsapIdentifier = pLogicalChannel->localRtcpPort; } else { pUnicastAddrs->t = T_H245UnicastAddress_iPAddress; - pIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, + pIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iPAddress)); memset(pIpAddrs, 0, sizeof(H245UnicastAddress_iPAddress)); pUnicastAddrs->u.iPAddress = pIpAddrs; - + inet_pton(AF_INET, pLogicalChannel->localIP, pIpAddrs->network.data); pIpAddrs->network.numocts = 4; @@ -4151,16 +4151,16 @@ int ooBuildFastStartOLC if(!outgoing) { if(epCap->startReceiveChannel) - { - epCap->startReceiveChannel(call, pLogicalChannel); - OOTRACEINFO4("Receive channel of type %s started (%s, %s)\n", + { + epCap->startReceiveChannel(call, pLogicalChannel); + OOTRACEINFO4("Receive channel of type %s started (%s, %s)\n", (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); } else{ OOTRACEERR4("ERROR:No callback registered to start receive %s" - " channel (%s, %s)\n", - (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", + " channel (%s, %s)\n", + (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); return OO_FAILED; } @@ -4169,11 +4169,11 @@ int ooBuildFastStartOLC if(reverse) { - OOTRACEDBGC3("Building reverse olc. (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building reverse olc. (%s, %s)\n", call->callType, call->callToken); - olc->forwardLogicalChannelParameters.dataType.t = + olc->forwardLogicalChannelParameters.dataType.t = T_H245DataType_nullData; - olc->forwardLogicalChannelParameters.multiplexParameters.t = + olc->forwardLogicalChannelParameters.multiplexParameters.t = T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_none; olc->m.reverseLogicalChannelParametersPresent = 1; rlcp = &(olc->reverseLogicalChannelParameters); @@ -4181,15 +4181,15 @@ int ooBuildFastStartOLC if(epCap->capType == OO_CAP_TYPE_AUDIO) { sessionID = 1; rlcp->dataType.t = T_H245DataType_audioData; - - rlcp->dataType.u.audioData = ooCapabilityCreateAudioCapability(epCap, + + rlcp->dataType.u.audioData = ooCapabilityCreateAudioCapability(epCap, pctxt, dir); } else if(epCap->capType == OO_CAP_TYPE_VIDEO) { sessionID = 2; rlcp->dataType.t = T_H245DataType_videoData; - - rlcp->dataType.u.videoData = ooCapabilityCreateVideoCapability(epCap, + + rlcp->dataType.u.videoData = ooCapabilityCreateVideoCapability(epCap, pctxt, dir); } @@ -4204,33 +4204,33 @@ int ooBuildFastStartOLC { pH2250lcp2->m.mediaChannelPresent = 1; - pH2250lcp2->mediaChannel.t = + pH2250lcp2->mediaChannel.t = T_H245TransportAddress_unicastAddress; - pUnicastAddrs = (H245UnicastAddress*) memAlloc(pctxt, + pUnicastAddrs = (H245UnicastAddress*) memAlloc(pctxt, sizeof(H245UnicastAddress)); memset(pUnicastAddrs, 0, sizeof(H245UnicastAddress)); pH2250lcp2->mediaChannel.u.unicastAddress = pUnicastAddrs; /* May 20101022 */ - + if (call->versionIP == 6) { pUnicastAddrs->t = T_H245UnicastAddress_iP6Address; - pIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, + pIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iP6Address)); memset(pIp6Addrs, 0, sizeof(H245UnicastAddress_iP6Address)); pUnicastAddrs->u.iP6Address = pIp6Addrs; - + inet_pton(AF_INET6, pLogicalChannel->localIP, pIp6Addrs->network.data); pIp6Addrs->network.numocts = 16; pIp6Addrs->tsapIdentifier = pLogicalChannel->localRtpPort; } else { pUnicastAddrs->t = T_H245UnicastAddress_iPAddress; - pIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, + pIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iPAddress)); memset(pIpAddrs, 0, sizeof(H245UnicastAddress_iPAddress)); pUnicastAddrs->u.iPAddress = pIpAddrs; - + inet_pton(AF_INET, pLogicalChannel->localIP, pIpAddrs->network.data); pIpAddrs->network.numocts = 4; @@ -4239,33 +4239,33 @@ int ooBuildFastStartOLC } pH2250lcp2->m.mediaControlChannelPresent = 1; - pH2250lcp2->mediaControlChannel.t = + pH2250lcp2->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; pUniAddrs = (H245UnicastAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress)); - + memset(pUniAddrs, 0, sizeof(H245UnicastAddress)); pH2250lcp2->mediaControlChannel.u.unicastAddress = pUniAddrs; /* May 20101023 */ - + if (call->versionIP == 6) { pUniAddrs->t = T_H245UnicastAddress_iP6Address; - pUniIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, + pUniIp6Addrs = (H245UnicastAddress_iP6Address*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iP6Address)); memset(pUniIp6Addrs, 0, sizeof(H245UnicastAddress_iP6Address)); pUniAddrs->u.iP6Address = pUniIp6Addrs; - + inet_pton(AF_INET6, pLogicalChannel->localIP, pUniIp6Addrs->network.data); pUniIp6Addrs->network.numocts = 16; pUniIp6Addrs->tsapIdentifier = pLogicalChannel->localRtcpPort; } else { pUniAddrs->t = T_H245UnicastAddress_iPAddress; - pUniIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, + pUniIpAddrs = (H245UnicastAddress_iPAddress*) ASN1MALLOC(pctxt, sizeof(H245UnicastAddress_iPAddress)); memset(pUniIpAddrs, 0, sizeof(H245UnicastAddress_iPAddress)); pUniAddrs->u.iPAddress = pUniIpAddrs; - + inet_pton(AF_INET, pLogicalChannel->localIP, pUniIpAddrs->network.data); pUniIpAddrs->network.numocts = 4; @@ -4281,23 +4281,23 @@ int ooBuildFastStartOLC { if(epCap->startReceiveChannel) { - epCap->startReceiveChannel(call, pLogicalChannel); + epCap->startReceiveChannel(call, pLogicalChannel); OOTRACEINFO4("Receive channel of type %s started (%s, %s)\n", (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); } else{ OOTRACEERR4("ERROR:No callback registered to start receive %s " - "channel (%s, %s)\n", - (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", + "channel (%s, %s)\n", + (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", call->callType, call->callToken); return OO_FAILED; } } } - /* State of logical channel. for out going calls, as we are sending setup, - state of all channels are proposed, for incoming calls, state is + /* State of logical channel. for out going calls, as we are sending setup, + state of all channels are proposed, for incoming calls, state is established. */ if(!outgoing) { pLogicalChannel->state = OO_LOGICALCHAN_ESTABLISHED; @@ -4307,7 +4307,7 @@ int ooBuildFastStartOLC /* Call is "outgoing */ pLogicalChannel->state = OO_LOGICALCHAN_PROPOSEDFS; } - + return OO_OK; } @@ -4329,12 +4329,12 @@ int ooMSDTimerExpired(void *data) return OO_OK; } - + int ooTCSTimerExpired(void *data) { ooTimerCallback *cbData = (ooTimerCallback*)data; OOH323CallData *call = cbData->call; - OOTRACEINFO3("TerminalCapabilityExchange timeout. (%s, %s)\n", + OOTRACEINFO3("TerminalCapabilityExchange timeout. (%s, %s)\n", call->callType, call->callToken); ASN1MEMFREEPTR(call->pctxt, cbData); ooSendTerminalCapabilitySetRelease(call); @@ -4366,11 +4366,11 @@ int ooOpenLogicalChannelTimerExpired(void *pdata) ooLogicalChannel *pChannel = NULL; OOTRACEINFO3("OpenLogicalChannelTimer expired. (%s, %s)\n", call->callType, call->callToken); - pChannel = ooFindLogicalChannelByLogicalChannelNo(call, + pChannel = ooFindLogicalChannelByLogicalChannelNo(call, cbData->channelNumber); if(pChannel) ooSendCloseLogicalChannel(call, pChannel); - + if(call->callState < OO_CALL_CLEAR) { call->callState = OO_CALL_CLEAR; @@ -4389,7 +4389,7 @@ int ooCloseLogicalChannelTimerExpired(void *pdata) call->callToken); ooClearLogicalChannel(call, cbData->channelNumber); - + if(call->callState < OO_CALL_CLEAR) { call->callState = OO_CALL_CLEAR; @@ -4408,21 +4408,21 @@ int ooRequestChannelCloseTimerExpired(void *pdata) OOTRACEINFO3("CloseLogicalChannelTimer expired. (%s, %s)\n", call->callType, call->callToken); - - pChannel = ooFindLogicalChannelByLogicalChannelNo(call, + + pChannel = ooFindLogicalChannelByLogicalChannelNo(call, cbData->channelNumber); if(pChannel) ooSendRequestChannelCloseRelease(call, cbData->channelNumber); else return OO_OK; - + ret = ooClearLogicalChannel(call, cbData->channelNumber); if(ret != OO_OK) { OOTRACEERR4("Error:Failed to clear logical channel %d. (%s, %s)\n", cbData->channelNumber, call->callType, call->callToken); - } + } if(call->callState < OO_CALL_CLEAR) { @@ -4442,29 +4442,29 @@ int ooSessionTimerExpired(void *pdata) OOTRACEINFO3("SessionTimer expired. (%s, %s)\n", call->callType, call->callToken); - if(call->h245SessionState != OO_H245SESSION_IDLE && + if(call->h245SessionState != OO_H245SESSION_IDLE && call->h245SessionState != OO_H245SESSION_CLOSED && call->h245SessionState != OO_H245SESSION_PAUSED) { ret = ooCloseH245Connection(call); - + if(ret != OO_OK) { OOTRACEERR3("Error:Failed to close H.245 connection (%s, %s)\n", call->callType, call->callToken); - } + } } memFreePtr(call->pctxt, cbData); if(call->callState == OO_CALL_CLEAR_RELEASESENT) call->callState = OO_CALL_CLEARED; - + return OO_OK; } int ooGetIpPortFromH245TransportAddress - (OOH323CallData *call, H245TransportAddress *h245Address, char *ip, + (OOH323CallData *call, H245TransportAddress *h245Address, char *ip, int *port) { H245UnicastAddress *unicastAddress = NULL; @@ -4477,8 +4477,8 @@ int ooGetIpPortFromH245TransportAddress OOTRACEERR3("ERROR:Unsupported H245 address type " "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; - } - + } + unicastAddress = h245Address->u.unicastAddress; if (call->versionIP == 6) { if (unicastAddress->t != T_H245UnicastAddress_iP6Address) { @@ -4513,7 +4513,7 @@ int ooGetIpPortFromH245TransportAddress int ooPrepareFastStartResponseOLC - (OOH323CallData *call, H245OpenLogicalChannel *olc, + (OOH323CallData *call, H245OpenLogicalChannel *olc, ooH323EpCapability *epCap, OOCTXT*pctxt, int dir) { OOBOOL reverse=FALSE, forward=FALSE; @@ -4525,14 +4525,14 @@ int ooPrepareFastStartResponseOLC H245UnicastAddress_iP6Address *pIp6Addrs=NULL, *pUniIp6Addrs=NULL; unsigned session_id = 0; ooLogicalChannel *pLogicalChannel = NULL; - + if(dir & OORX) { OOTRACEDBGA3("ooPrepareFastStartResponseOLC for Receive Capability " "(%s, %s)\n", call->callType, call->callToken); session_id = ooCallGenerateSessionID(call, epCap->capType, "receive"); - pLogicalChannel = ooAddNewLogicalChannel(call, - olc->forwardLogicalChannelNumber, session_id, + pLogicalChannel = ooAddNewLogicalChannel(call, + olc->forwardLogicalChannelNumber, session_id, "receive", epCap); forward = TRUE; } @@ -4541,7 +4541,7 @@ int ooPrepareFastStartResponseOLC OOTRACEDBGA3("ooPrepareFastStartResponseOLC for transmit Capability " "(%s, %s)\n", call->callType, call->callToken); session_id = ooCallGenerateSessionID(call, epCap->capType, "transmit"); - pLogicalChannel = ooAddNewLogicalChannel(call, + pLogicalChannel = ooAddNewLogicalChannel(call, olc->forwardLogicalChannelNumber, session_id, "transmit", epCap); reverse = TRUE; @@ -4559,24 +4559,24 @@ int ooPrepareFastStartResponseOLC if(forward) { - OOTRACEDBGC3("Preparing olc for receive channel. (%s, %s)\n", + OOTRACEDBGC3("Preparing olc for receive channel. (%s, %s)\n", call->callType, call->callToken); flcp = &(olc->forwardLogicalChannelParameters); pH2250lcp1 = flcp->multiplexParameters.u.h2250LogicalChannelParameters; - + pH2250lcp1->m.mediaChannelPresent = 1; pH2250lcp1->mediaChannel.t = T_H245TransportAddress_unicastAddress; - pUniAddrs = (H245UnicastAddress*) memAllocZ(pctxt, + pUniAddrs = (H245UnicastAddress*) memAllocZ(pctxt, sizeof(H245UnicastAddress)); pH2250lcp1->mediaChannel.u.unicastAddress = pUniAddrs; if (call->versionIP == 6) { - pUniIp6Addrs = (H245UnicastAddress_iP6Address*) memAllocZ(pctxt, + pUniIp6Addrs = (H245UnicastAddress_iP6Address*) memAllocZ(pctxt, sizeof(H245UnicastAddress_iP6Address)); if(!pUniAddrs || !pUniIpAddrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - pUniAddrs" - "/pUniIpAddrs (%s, %s)\n", call->callType, + "/pUniIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -4589,11 +4589,11 @@ int ooPrepareFastStartResponseOLC pUniIp6Addrs->tsapIdentifier = pLogicalChannel->localRtpPort; } else { - pUniIpAddrs = (H245UnicastAddress_iPAddress*) memAllocZ(pctxt, + pUniIpAddrs = (H245UnicastAddress_iPAddress*) memAllocZ(pctxt, sizeof(H245UnicastAddress_iPAddress)); if(!pUniAddrs || !pUniIpAddrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - pUniAddrs" - "/pUniIpAddrs (%s, %s)\n", call->callType, + "/pUniIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -4601,25 +4601,25 @@ int ooPrepareFastStartResponseOLC pUniAddrs->t = T_H245UnicastAddress_iPAddress; pUniAddrs->u.iPAddress = pUniIpAddrs; inet_pton(AF_INET, pLogicalChannel->localIP, pUniIpAddrs->network.data); - + pUniIpAddrs->network.numocts = 4; pUniIpAddrs->tsapIdentifier = pLogicalChannel->localRtpPort; } pH2250lcp1->m.mediaControlChannelPresent = 1; - pH2250lcp1->mediaControlChannel.t = + pH2250lcp1->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; - pUnicastAddrs = (H245UnicastAddress*) memAllocZ(pctxt, + pUnicastAddrs = (H245UnicastAddress*) memAllocZ(pctxt, sizeof(H245UnicastAddress)); pH2250lcp1->mediaControlChannel.u.unicastAddress = pUnicastAddrs; if (call->versionIP == 6) { - pIp6Addrs = (H245UnicastAddress_iP6Address*) memAllocZ(pctxt, + pIp6Addrs = (H245UnicastAddress_iP6Address*) memAllocZ(pctxt, sizeof(H245UnicastAddress_iP6Address)); if(!pUnicastAddrs || !pIp6Addrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - " - "pUnicastAddrs/pIpAddrs (%s, %s)\n", call->callType, + "pUnicastAddrs/pIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -4630,11 +4630,11 @@ int ooPrepareFastStartResponseOLC pIp6Addrs->tsapIdentifier = pLogicalChannel->localRtcpPort; } else { - pIpAddrs = (H245UnicastAddress_iPAddress*) memAllocZ(pctxt, + pIpAddrs = (H245UnicastAddress_iPAddress*) memAllocZ(pctxt, sizeof(H245UnicastAddress_iPAddress)); if(!pUnicastAddrs || !pIpAddrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - " - "pUnicastAddrs/pIpAddrs (%s, %s)\n", call->callType, + "pUnicastAddrs/pIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -4648,7 +4648,7 @@ int ooPrepareFastStartResponseOLC if(reverse) { - OOTRACEDBGC3("Building reverse olc. (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building reverse olc. (%s, %s)\n", call->callType, call->callToken); rlcp = &(olc->reverseLogicalChannelParameters); @@ -4658,53 +4658,50 @@ int ooPrepareFastStartResponseOLC memset(&pH2250lcp2->mediaChannel, 0, sizeof(H245TransportAddress)); pH2250lcp2->m.mediaControlChannelPresent = 1; - pH2250lcp2->mediaControlChannel.t = + pH2250lcp2->mediaControlChannel.t = T_H245TransportAddress_unicastAddress; - pUniAddrs = (H245UnicastAddress*) memAlloc(pctxt, + pUniAddrs = (H245UnicastAddress*) memAlloc(pctxt, sizeof(H245UnicastAddress)); pH2250lcp2->mediaControlChannel.u.unicastAddress = pUniAddrs; if (call->versionIP == 6) { - pUniIp6Addrs = (H245UnicastAddress_iP6Address*) memAlloc(pctxt, + pUniIp6Addrs = (H245UnicastAddress_iP6Address*) memAlloc(pctxt, sizeof(H245UnicastAddress_iP6Address)); if(!pUniAddrs || !pUniIp6Addrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - " - "pUniAddrs/pUniIpAddrs (%s, %s)\n", call->callType, + "pUniAddrs/pUniIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + pUniAddrs->t = T_H245UnicastAddress_iP6Address; - pUniAddrs->u.iP6Address = pUniIp6Addrs; + pUniAddrs->u.iP6Address = pUniIp6Addrs; inet_pton(AF_INET6, pLogicalChannel->localIP, pUniIp6Addrs->network.data); pUniIp6Addrs->network.numocts = 16; pUniIp6Addrs->tsapIdentifier = pLogicalChannel->localRtcpPort; } else { - pUniIpAddrs = (H245UnicastAddress_iPAddress*) memAlloc(pctxt, + pUniIpAddrs = (H245UnicastAddress_iPAddress*) memAlloc(pctxt, sizeof(H245UnicastAddress_iPAddress)); if(!pUniAddrs || !pUniIpAddrs) { OOTRACEERR3("Error:Memory - ooPrepareFastStartResponseOLC - " - "pUniAddrs/pUniIpAddrs (%s, %s)\n", call->callType, + "pUniAddrs/pUniIpAddrs (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } pH2250lcp2->mediaControlChannel.u.unicastAddress = pUniAddrs; - + pUniAddrs->t = T_H245UnicastAddress_iPAddress; - pUniAddrs->u.iPAddress = pUniIpAddrs; + pUniAddrs->u.iPAddress = pUniIpAddrs; inet_pton(AF_INET, pLogicalChannel->localIP, pUniIpAddrs->network.data); pUniIpAddrs->network.numocts = 4; pUniIpAddrs->tsapIdentifier = pLogicalChannel->localRtcpPort; } - + } pLogicalChannel->state = OO_LOGICALCHAN_ESTABLISHED; return OO_OK; } - - - diff --git a/addons/ooh323c/src/ooh245.h b/addons/ooh323c/src/ooh245.h index a2df67056d..9635a4e10c 100644 --- a/addons/ooh323c/src/ooh245.h +++ b/addons/ooh323c/src/ooh245.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooh245.h - * This file contains functions to support H245 negotiations. + * @file ooh245.h + * This file contains functions to support H245 negotiations. */ #ifndef _OOH245HDR_H_ #define _OOH245HDR_H_ @@ -43,7 +43,7 @@ extern "C" { struct OOH323CallData; -/** +/** * @defgroup h245 H.245 Message Handling * @{ */ @@ -59,15 +59,15 @@ typedef struct H245Message { /** * Creates an outgoing H245 message of the type specified by the type - * argument for the Application context. + * argument for the Application context. * - * @param msg A pointer to pointer to message which will be assigned to + * @param msg A pointer to pointer to message which will be assigned to * allocated memory. * @param type Type of the message to be created. * (Request/Response/Command/Indication) * * @return Completion status of operation: 0 (OO_OK) = success, - * negative return value is error. + * negative return value is error. */ EXTERN int ooCreateH245Message(OOH323CallData* call, H245Message **msg, int type); @@ -77,7 +77,7 @@ EXTERN int ooCreateH245Message(OOH323CallData* call, H245Message **msg, int type * @param call Handle to the call * @param pmsg Pointer to an H245 message structure. * - * @return OO_OK, on success. OO_FAILED, on failure + * @return OO_OK, on success. OO_FAILED, on failure */ EXTERN int ooFreeH245Message(struct OOH323CallData *call, H245Message *pmsg); @@ -92,8 +92,8 @@ EXTERN int ooFreeH245Message(struct OOH323CallData *call, H245Message *pmsg); EXTERN int ooSendH245Msg(struct OOH323CallData *call, H245Message *msg); /** - * This function is used to retrieve an H.245 message enqueued in the outgoing - * queue. + * This function is used to retrieve an H.245 message enqueued in the outgoing + * queue. * @param call Pointer to the call for which message has to be retrieved. * @param msgbuf Pointer to a buffer in which the message will be returned. * @param len Pointer to an int variable which will contain length of @@ -103,17 +103,17 @@ EXTERN int ooSendH245Msg(struct OOH323CallData *call, H245Message *msg); * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooGetOutgoingH245Msgbuf(struct OOH323CallData *call, - ASN1OCTET *msgbuf, +EXTERN int ooGetOutgoingH245Msgbuf(struct OOH323CallData *call, + ASN1OCTET *msgbuf, int *len, int *msgType); /** - * This function is used to send out a terminal capability set message. + * This function is used to send out a terminal capability set message. * * @param call Pointer to a call for which TerminalCapabilitySet message * will be sent. - * - * @return OO_OK, on success. OO_FAILED, on failure. + * + * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooSendTermCapMsg(struct OOH323CallData *call); EXTERN int ooSendEmptyTermCapMsg(struct OOH323CallData *call); @@ -128,10 +128,10 @@ EXTERN ASN1UINT ooGenerateStatusDeterminationNumber(void); /** * This fuction is used to handle received MasterSlaveDetermination procedure - * messages. + * messages. * @param call Pointer to the call for which a message is received. * @param pmsg Pointer to MSD message - * @param msgType Message type indicating whether received message is MSD, + * @param msgType Message type indicating whether received message is MSD, * MSDAck, MSDReject etc... * * @return OO_OK, on success. OO_FAILED, on failure. @@ -152,11 +152,11 @@ EXTERN int ooSendMasterSlaveDetermination(struct OOH323CallData *call); * This function is used to send a MasterSlaveDeterminationAck message. * @param call Pointer to call for which MasterSlaveDeterminationAck has * to be sent. - * @param status Result of the determination process(Master/Slave as it + * @param status Result of the determination process(Master/Slave as it * applies to remote endpoint) * * @return OO_OK, on success. OO_FAILED, on failure. - */ + */ EXTERN int ooSendMasterSlaveDeterminationAck (struct OOH323CallData* call, char * status); @@ -164,19 +164,19 @@ EXTERN int ooSendMasterSlaveDeterminationAck * This function is used to send a MasterSlaveDeterminationReject message. * @param call Pointer to call for which message is to be sent. * @return OO_OK, on success. OO_FAILED, on failure. - */ + */ EXTERN int ooSendMasterSlaveDeterminationReject (struct OOH323CallData* call); /** * This function is used to handle MasterSlaveReject message. If number of - * retries is less than max allowed, then it restarts the + * retries is less than max allowed, then it restarts the * MasterSlaveDetermination procedure. - * @param call Handle to the call for which MasterSlaveReject is + * @param call Handle to the call for which MasterSlaveReject is * received. * @param reject Poinetr to the received reject message. * - * @return OO_OK, on success. OO_FAILED, on failure. + * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooHandleMasterSlaveReject (struct OOH323CallData *call, H245MasterSlaveDeterminationReject* reject); @@ -193,13 +193,13 @@ EXTERN int ooHandleOpenLogicalChannel (struct OOH323CallData* call, H245OpenLogicalChannel *olc); /** - * This is a helper function used to handle a received OpenLogicalChannel + * This is a helper function used to handle a received OpenLogicalChannel * message. It builds an OpenLogicalChannelAck message and sends it. * * @param call Pointer to cll for which OLC was received. * @param olc The received OpenLogicalChannel message. - * - * @return OO_OK, on success. OO_FAILED, on failure. + * + * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooHandleOpenLogicalChannel_helper (struct OOH323CallData *call, H245OpenLogicalChannel*olc); @@ -222,22 +222,22 @@ int ooSendOpenLogicalChannelReject * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooOnReceivedOpenLogicalChannelAck(struct OOH323CallData *call, +EXTERN int ooOnReceivedOpenLogicalChannelAck(struct OOH323CallData *call, H245OpenLogicalChannelAck *olcAck); /** - * This function is used to handle the received OpenLogicalChannelReject + * This function is used to handle the received OpenLogicalChannelReject * message. * @param call Handle to the call for which the message is received. * @param olcRejected Pointer to received OpenLogicalChannelReject message. * * @return OO_OK, on success. OO_FAILED, on failure. */ -int ooOnReceivedOpenLogicalChannelRejected(struct OOH323CallData *call, +int ooOnReceivedOpenLogicalChannelRejected(struct OOH323CallData *call, H245OpenLogicalChannelReject *olcRejected); /** - * This message is used to send an EndSession command. It builds a EndSession + * This message is used to send an EndSession command. It builds a EndSession * command message and queues it into the calls outgoing queue. * @param call Pointer to call for which EndSession command has to be * sent. @@ -246,7 +246,7 @@ int ooOnReceivedOpenLogicalChannelRejected(struct OOH323CallData *call, EXTERN int ooSendEndSessionCommand(struct OOH323CallData *call); /** - * This function is used to handle a received H245Command message. + * This function is used to handle a received H245Command message. * @param call Pointer to call for which an H245Command is received. * @param command Pointer to a command message. * @@ -259,7 +259,7 @@ EXTERN int ooHandleH245Command /** * This function is used to handle a received UserInput Indication message. * It extracts the dtmf received through user-input message and calls endpoints - * onReceivedDTMF callback function, if such a function is registered by the + * onReceivedDTMF callback function, if such a function is registered by the * endpoint. * @param call Handle to the call for which user-input indication * message is received. @@ -272,7 +272,7 @@ EXTERN int ooOnReceivedUserInputIndication /** * This function is called on receiving a TreminalCapabilitySetAck message. - * If the MasterSlaveDetermination process is also over, this function + * If the MasterSlaveDetermination process is also over, this function * initiates the process of opening logical channels. * @param call Pointer to call for which TCSAck is received. * @@ -282,9 +282,9 @@ EXTERN int ooOnReceivedTerminalCapabilitySetAck(struct OOH323CallData* call); /** * This function is called to close all the open logical channels. It sends - * CloseLogicalChannel message for all the forward channels and sends + * CloseLogicalChannel message for all the forward channels and sends * RequestCloseLogicalChannel message for all the reverse channels. - * @param call Pointer to call for which logical channels have to be + * @param call Pointer to call for which logical channels have to be * closed. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -311,10 +311,10 @@ EXTERN int ooSendCloseLogicalChannel * closeLogicalChannelAck message to the remote endpoint. * @param call Pointer to call for which CloseLogicalChannel message is received. * @param clc Pointer to received CloseLogicalChannel message. - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooOnReceivedCloseLogicalChannel(struct OOH323CallData *call, +EXTERN int ooOnReceivedCloseLogicalChannel(struct OOH323CallData *call, H245CloseLogicalChannel* clc); /** @@ -322,10 +322,10 @@ EXTERN int ooOnReceivedCloseLogicalChannel(struct OOH323CallData *call, * channel and removes it from the list of active logical channels. * @param call Pointer to call for which CLCAck message is received. * @param clcAck Pointer to the received CloseLogicalChannelAck message. - * + * * @return OO_OK, on success. OO_FAILED, on failure */ -EXTERN int ooOnReceivedCloseChannelAck(struct OOH323CallData* call, +EXTERN int ooOnReceivedCloseChannelAck(struct OOH323CallData* call, H245CloseLogicalChannelAck* clcAck); /** @@ -365,27 +365,27 @@ EXTERN int ooH245AcknowledgeTerminalCapabilitySet(struct OOH323CallData *call); * @param call Pointer to call for which logical channels have to be opened. * * @return OO_OK, on success. OO_FAILED, on failure. - */ + */ EXTERN int ooOpenLogicalChannels(struct OOH323CallData *call); /** - * This function is used to send OpenLogicalChannel message for audio/video + * This function is used to send OpenLogicalChannel message for audio/video * channel. * @param call Pointer to call for which channel has to be opened. * @param capType Type of media channel. * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooOpenLogicalChannel(struct OOH323CallData *call, +EXTERN int ooOpenLogicalChannel(struct OOH323CallData *call, enum OOCapType capType); /** * This function is used to build and send OpenLogicalChannel message using * capability passed as parameter. - * @param call Pointer to call for which OpenLogicalChannel message + * @param call Pointer to call for which OpenLogicalChannel message * has to be built. * @param epCap Pointer to capability - * + * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooOpenChannel @@ -415,7 +415,7 @@ EXTERN int ooSendH245UserInputIndication_signal /** * This function is used to request a remote end point to close a logical - * channel. + * channel. * @param call Pointer to call for which the logical channel has to * be closed. * @param logicalChan Pointer to the logical channel structure which needs @@ -423,7 +423,7 @@ EXTERN int ooSendH245UserInputIndication_signal * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooSendRequestCloseLogicalChannel(struct OOH323CallData *call, +EXTERN int ooSendRequestCloseLogicalChannel(struct OOH323CallData *call, ooLogicalChannel *logicalChan); /** @@ -447,11 +447,11 @@ int ooSendRequestChannelCloseRelease * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooOnReceivedRequestChannelClose(struct OOH323CallData *call, +EXTERN int ooOnReceivedRequestChannelClose(struct OOH323CallData *call, H245RequestChannelClose *rclc); /** - * This function is used to handle a received RequestChannelCloseReject + * This function is used to handle a received RequestChannelCloseReject * response message. * @param call Handle to the call. * @param rccReject Pointer to the received reject response message. @@ -462,7 +462,7 @@ int ooOnReceivedRequestChannelCloseReject (struct OOH323CallData *call, H245RequestChannelCloseReject *rccReject); /** - * This function is used to handle a received RequestChannelCloseAck + * This function is used to handle a received RequestChannelCloseAck * response message. * @param call Handle to the call. * @param rccAck Pointer to the received ack response message. @@ -473,21 +473,21 @@ int ooOnReceivedRequestChannelCloseAck (struct OOH323CallData *call, H245RequestChannelCloseAck *rccAck); /** - * Builds an OLC for faststart with an audio/video capability passed as + * Builds an OLC for faststart with an audio/video capability passed as * parameter. * @param call Handle to call for which OLC has to be built. * @param olc Pointer to an OLC structure which will be populated. - * @param epCap Pointer to the capability which will be used to + * @param epCap Pointer to the capability which will be used to * build OLC. - * @param pctxt Pointer to an OOCTXT structure which will be used + * @param pctxt Pointer to an OOCTXT structure which will be used * to allocate additional memory for OLC. * @param dir Direction of OLC * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooBuildFastStartOLC(struct OOH323CallData *call, - H245OpenLogicalChannel *olc, - ooH323EpCapability *epCap, +EXTERN int ooBuildFastStartOLC(struct OOH323CallData *call, + H245OpenLogicalChannel *olc, + ooH323EpCapability *epCap, OOCTXT*pctxt, int dir); /** @@ -496,16 +496,16 @@ EXTERN int ooBuildFastStartOLC(struct OOH323CallData *call, * of the olc received in SETUP. * @param call Handle to call for which OLC has to be built. * @param olc Pointer to an received OLC structure. - * @param epCap Pointer to the capability which will be used for + * @param epCap Pointer to the capability which will be used for * this channel. - * @param pctxt Pointer to an OOCTXT structure which will be used + * @param pctxt Pointer to an OOCTXT structure which will be used * to allocate additional memory for OLC. * @param dir Direction of channel OORX, OOTX etc. * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooPrepareFastStartResponseOLC - (OOH323CallData *call, H245OpenLogicalChannel *olc, + (OOH323CallData *call, H245OpenLogicalChannel *olc, ooH323EpCapability *epCap, OOCTXT*pctxt, int dir); /** @@ -533,7 +533,7 @@ int ooSendMasterSlaveDeterminationRelease(struct OOH323CallData * call); /** * This function is used to send a terminal capability set reject message * to the remote endpoint. - * @param call Handle to the call for which reject message has to + * @param call Handle to the call for which reject message has to * be sent. * @param seqNo Sequence number of the TCS message to be rejected. * @param cause Cause for rejecting a TCS message. @@ -546,7 +546,7 @@ int ooSendTerminalCapabilitySetReject /** * This function is used to send a TerminalCapabilitySetRelease message after * capability exchange timer has expired. - * @param call Handle to call for which release message has to be + * @param call Handle to call for which release message has to be * sent. * * @return OO_OK, on success; OO_FAILED, on failure. @@ -557,26 +557,26 @@ int ooSendRequestMode(OOH323CallData* call, int isT38Mode); /** - * This is an helper function used to extract ip address and port info from + * This is an helper function used to extract ip address and port info from * H245TransportAddress structure. * @param call Handle to associated call. - * @param h245Address Handle to H245TransportAddress structure from which + * @param h245Address Handle to H245TransportAddress structure from which * information has to be extracted. - * @param ip Pointer to buffer in which ip address will be + * @param ip Pointer to buffer in which ip address will be * returned. Make sure that buffer has sufficient length. - * @param port Pointer to integer in which port number will be + * @param port Pointer to integer in which port number will be * returned. * * @return OO_OK, on success. OO_FAILED, on failure. */ int ooGetIpPortFromH245TransportAddress - (OOH323CallData *call, H245TransportAddress *h245Address, char *ip, + (OOH323CallData *call, H245TransportAddress *h245Address, char *ip, int *port); /** - * This is a callback function for handling an expired master-slave + * This is a callback function for handling an expired master-slave * determination timer. - * @param data Callback data registered at the time of creation of + * @param data Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -584,9 +584,9 @@ int ooGetIpPortFromH245TransportAddress int ooMSDTimerExpired(void *data); /** - * This is a callback function for handling an expired capability exchange + * This is a callback function for handling an expired capability exchange * timer. - * @param data Callback data registered at the time of creation of + * @param data Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -594,9 +594,9 @@ int ooMSDTimerExpired(void *data); int ooTCSTimerExpired(void *data); /** - * This is a callback function for handling an expired OpenLogicalChannel + * This is a callback function for handling an expired OpenLogicalChannel * timer. - * @param pdata Callback data registered at the time of creation of + * @param pdata Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -604,9 +604,9 @@ int ooTCSTimerExpired(void *data); int ooOpenLogicalChannelTimerExpired(void *pdata); /** - * This is a callback function for handling an expired CloseLogicalChannel + * This is a callback function for handling an expired CloseLogicalChannel * timer. - * @param pdata Callback data registered at the time of creation of + * @param pdata Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -614,9 +614,9 @@ int ooOpenLogicalChannelTimerExpired(void *pdata); int ooCloseLogicalChannelTimerExpired(void *pdata); /** - * This is a callback function for handling an expired RequestChannelClose + * This is a callback function for handling an expired RequestChannelClose * timer. - * @param pdata Callback data registered at the time of creation of + * @param pdata Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. @@ -625,14 +625,14 @@ int ooRequestChannelCloseTimerExpired(void *pdata); /** * This is a callback function for handling an expired EndSession timer. - * @param pdata Callback data registered at the time of creation of + * @param pdata Callback data registered at the time of creation of * the timer. * * @return OO_OK, on success. OO_FAILED, otherwise. */ int ooSessionTimerExpired(void *pdata); -/** - * @} +/** + * @} */ int ooRTDTimerExpired(void *pdata); diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c index b04a954edf..be02f8f884 100644 --- a/addons/ooh323c/src/ooh323.c +++ b/addons/ooh323c/src/ooh323.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -50,7 +50,7 @@ int ooHandleDisplayIE(OOH323CallData *call, Q931Message *q931Msg) { if(pDisplayIE) { if (call->remoteDisplayName) memFreePtr(call->pctxt, call->remoteDisplayName); - call->remoteDisplayName = (char *) memAllocZ(call->pctxt, + call->remoteDisplayName = (char *) memAllocZ(call->pctxt, pDisplayIE->length*sizeof(ASN1OCTET)+1); strncpy(call->remoteDisplayName, (char *)pDisplayIE->data, pDisplayIE->length*sizeof(ASN1OCTET)); } @@ -62,7 +62,7 @@ int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier* protocolIdent if (!call->h225version && (protocolIdentifier->numids >= 6) && (protocolIdentifier->subid[3] == 2250)) { call->h225version = protocolIdentifier->subid[5]; - OOTRACEDBGC4("Extract H.225 remote version, it's %d, (%s, %s)\n", call->h225version, + OOTRACEDBGC4("Extract H.225 remote version, it's %d, (%s, %s)\n", call->h225version, call->callType, call->callToken); } @@ -74,7 +74,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) H245OpenLogicalChannel* olc; ASN1OCTET msgbuf[MAXMSGLEN]; ooLogicalChannel * pChannel = NULL; - H245H2250LogicalChannelParameters * h2250lcp = NULL; + H245H2250LogicalChannelParameters * h2250lcp = NULL; int i=0, ret=0; /* Handle fast-start */ @@ -92,7 +92,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) { olc = NULL; - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -109,9 +109,9 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, facility->fastStart.elem[i].data, + memcpy(msgbuf, facility->fastStart.elem[i].data, facility->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, facility->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -136,7 +136,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) { OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. " "(%s, %s)\n", - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -145,9 +145,9 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) if(pChannel->channelNo != olc->forwardLogicalChannelNumber) { OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel" - "Number from %d to %d (%s, %s)\n", - pChannel->channelNo, - olc->forwardLogicalChannelNumber, call->callType, + "Number from %d to %d (%s, %s)\n", + pChannel->channelNo, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); pChannel->channelNo = olc->forwardLogicalChannelNumber; } @@ -158,12 +158,12 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", + "channel %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -182,10 +182,10 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - ret = ooGetIpPortFromH245TransportAddress(call, + ret = ooGetIpPortFromH245TransportAddress(call, &h2250lcp->mediaChannel, pChannel->remoteIP, &pChannel->remoteMediaPort); - + if(ret != OO_OK) { if(call->callState < OO_CALL_CLEAR) @@ -199,17 +199,17 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) removeEventHandler(call->pctxt); return OO_FAILED; } - + if(!pChannel->chanCap->startTransmitChannel) { OOTRACEERR3("ERROR:No callback registered to start transmit " - "channel (%s, %s)\n",call->callType, + "channel (%s, %s)\n",call->callType, call->callToken); return OO_FAILED; } pChannel->chanCap->startTransmitChannel(call, pChannel); } - /* Mark the current channel as established and close all other + /* Mark the current channel as established and close all other logical channels with same session id and in same direction. */ ooOnLogicalChannelEstablished(call, pChannel); @@ -218,7 +218,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) removeEventHandler(call->pctxt); OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED); } - + } if(facility->m.h245AddressPresent) @@ -227,16 +227,16 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); OOTRACEINFO3("Tunneling is disabled for call as H245 address is " - "provided in facility message (%s, %s)\n", + "provided in facility message (%s, %s)\n", call->callType, call->callToken); } - ret = ooH323GetIpPortFromH225TransportAddress(call, + ret = ooH323GetIpPortFromH225TransportAddress(call, &facility->h245Address, call->remoteIP, &call->remoteH245Port); if(ret != OO_OK) { OOTRACEERR3("Error: Unknown H245 address type in received " - "Facility message (%s, %s)", call->callType, + "Facility message (%s, %s)", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -247,11 +247,11 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility) return OO_FAILED; } if(call->remoteH245Port != 0 && !call->pH245Channel) { - /* Create an H.245 connection. + /* Create an H.245 connection. */ if(ooCreateH245Connection(call)== OO_FAILED) { - OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", + OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -286,8 +286,8 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg) { cause = q931Msg->causeIE->data[1]; /* Get rid of the extension bit.For more info, check ooQ931SetCauseIE */ - cause = cause & 0x7f; - OOTRACEDBGA4("Cause of Release Complete is %x. (%s, %s)\n", cause, + cause = cause & 0x7f; + OOTRACEDBGA4("Cause of Release Complete is %x. (%s, %s)\n", cause, call->callType, call->callToken); } @@ -296,18 +296,18 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if(((ooTimerCallback*)pTimer->cbData)->timerType & + if(((ooTimerCallback*)pTimer->cbData)->timerType & OO_SESSION_TIMER) { memFreePtr(call->pctxt, pTimer->cbData); ooTimerDelete(call->pctxt, &call->timerList, pTimer); - OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n", + OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n", call->callType, call->callToken); break; } } - + if(!q931Msg->userInfo) { OOTRACEERR3("ERROR:No User-User IE in received ReleaseComplete message " @@ -326,14 +326,14 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg) if(releaseComplete->m.reasonPresent) { - OOTRACEINFO4("Release complete reason code %d. (%s, %s)\n", + OOTRACEINFO4("Release complete reason code %d. (%s, %s)\n", releaseComplete->reason.t, call->callType, call->callToken); reasonCode = releaseComplete->reason.t; } } if(call->callEndReason == OO_REASON_UNKNOWN) - call->callEndReason = ooGetCallClearReasonFromCauseAndReasonCode(cause, + call->callEndReason = ooGetCallClearReasonFromCauseAndReasonCode(cause, reasonCode); call->q931cause = cause; #if 0 @@ -349,7 +349,7 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg) " (%s, %s)\n", call->callType, call->callToken); } #endif - if(call->h245SessionState != OO_H245SESSION_IDLE && + if(call->h245SessionState != OO_H245SESSION_IDLE && call->h245SessionState != OO_H245SESSION_CLOSED) { ooCloseH245Connection(call); @@ -384,7 +384,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) char remoteIP[2+8*4+7] = ""; call->callReference = q931Msg->callReference; - + if(!q931Msg->userInfo) { OOTRACEERR3("ERROR:No User-User IE in received SETUP message (%s, %s)\n", @@ -399,10 +399,10 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } ooHandleH2250ID(call, &setup->protocolIdentifier); - memcpy(call->callIdentifier.guid.data, setup->callIdentifier.guid.data, + memcpy(call->callIdentifier.guid.data, setup->callIdentifier.guid.data, setup->callIdentifier.guid.numocts); call->callIdentifier.guid.numocts = setup->callIdentifier.guid.numocts; - + memcpy(call->confIdentifier.data, setup->conferenceID.data, setup->conferenceID.numocts); call->confIdentifier.numocts = setup->conferenceID.numocts; @@ -411,7 +411,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) pDisplayIE = ooQ931GetIE(q931Msg, Q931DisplayIE); if(pDisplayIE) { - call->remoteDisplayName = (char *) memAllocZ(call->pctxt, + call->remoteDisplayName = (char *) memAllocZ(call->pctxt, pDisplayIE->length*sizeof(ASN1OCTET)+1); strncpy(call->remoteDisplayName, (char *)pDisplayIE->data, pDisplayIE->length*sizeof(ASN1OCTET)); } @@ -420,7 +420,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) { if(setup->sourceAddress.count>0) { - ooH323RetrieveAliases(call, &setup->sourceAddress, + ooH323RetrieveAliases(call, &setup->sourceAddress, &call->remoteAliases); pAlias = call->remoteAliases; while(pAlias) @@ -444,13 +444,13 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) } /* Extract, aliases used for us, if present. Also, Populate calledPartyNumber from dialedDigits, if not yet populated using - calledPartyNumber Q931 IE. - */ + calledPartyNumber Q931 IE. + */ if(setup->m.destinationAddressPresent) { if(setup->destinationAddress.count>0) { - ooH323RetrieveAliases(call, &setup->destinationAddress, + ooH323RetrieveAliases(call, &setup->destinationAddress, &call->ourAliases); pAlias = call->ourAliases; while(pAlias) @@ -468,7 +468,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) } break; } - pAlias = pAlias->next; + pAlias = pAlias->next; } } } @@ -511,7 +511,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) } OO_CLRFLAG (call->flags, OO_M_TUNNELING); } - + /* Extract Remote IP address */ if(!setup->m.sourceCallSignalAddressPresent) { @@ -525,7 +525,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) call->remotePort = setup->sourceCallSignalAddress.u.ip6Address->port; } else if(setup->sourceCallSignalAddress.t == T_H225TransportAddress_ipAddress) { ip = &setup->sourceCallSignalAddress.u.ipAddress->ip; - sprintf(remoteIP, "%d.%d.%d.%d", ip->data[0], ip->data[1], + sprintf(remoteIP, "%d.%d.%d.%d", ip->data[0], ip->data[1], ip->data[2], ip->data[3]); call->remotePort = setup->sourceCallSignalAddress.u.ipAddress->port; } else { @@ -543,9 +543,9 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } } - + /* check for fast start */ - + if(setup->m.fastStartPresent) { if(!OO_TESTFLAG(gH323ep.flags, OO_M_FASTSTART)) @@ -579,11 +579,11 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) { olc = NULL; /* memset(msgbuf, 0, sizeof(msgbuf));*/ - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { - OOTRACEERR3("ERROR:Memory - ooOnReceivedSetup - olc (%s, %s)\n", + OOTRACEERR3("ERROR:Memory - ooOnReceivedSetup - olc (%s, %s)\n", call->callType, call->callToken); /*Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -596,10 +596,10 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, setup->fastStart.elem[i].data, + memcpy(msgbuf, setup->fastStart.elem[i].data, setup->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, setup->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -635,7 +635,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) H245OpenLogicalChannel* olc; ASN1OCTET msgbuf[MAXMSGLEN]; ooLogicalChannel * pChannel = NULL; - H245H2250LogicalChannelParameters * h2250lcp = NULL; + H245H2250LogicalChannelParameters * h2250lcp = NULL; int i=0, ret=0; if(!q931Msg->userInfo) @@ -644,12 +644,12 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) " (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - callProceeding = + callProceeding = q931Msg->userInfo->h323_uu_pdu.h323_message_body.u.callProceeding; if(callProceeding == NULL) { OOTRACEERR3("Error: Received CallProceeding message does not have " - "CallProceeding UUIE (%s, %s)\n", call->callType, + "CallProceeding UUIE (%s, %s)\n", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -676,7 +676,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) { olc = NULL; - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -693,9 +693,9 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, callProceeding->fastStart.elem[i].data, + memcpy(msgbuf, callProceeding->fastStart.elem[i].data, callProceeding->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, callProceeding->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -720,7 +720,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) { OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. " "(%s, %s)\n", - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -729,9 +729,9 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) if(pChannel->channelNo != olc->forwardLogicalChannelNumber) { OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel" - "Number from %d to %d (%s, %s)\n", - pChannel->channelNo, - olc->forwardLogicalChannelNumber, call->callType, + "Number from %d to %d (%s, %s)\n", + pChannel->channelNo, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); pChannel->channelNo = olc->forwardLogicalChannelNumber; } @@ -741,12 +741,12 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", + "channel %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -767,10 +767,10 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); return OO_FAILED; } - ret = ooGetIpPortFromH245TransportAddress(call, + ret = ooGetIpPortFromH245TransportAddress(call, &h2250lcp->mediaChannel, pChannel->remoteIP, &pChannel->remoteMediaPort); - + if(ret != OO_OK) { if(call->callState < OO_CALL_CLEAR) @@ -784,11 +784,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); return OO_FAILED; } - + if(!pChannel->chanCap->startTransmitChannel) { OOTRACEERR3("ERROR:No callback registered to start transmit " - "channel (%s, %s)\n",call->callType, + "channel (%s, %s)\n",call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -796,7 +796,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) } pChannel->chanCap->startTransmitChannel(call, pChannel); } - /* Mark the current channel as established and close all other + /* Mark the current channel as established and close all other logical channels with same session id and in same direction. */ ooOnLogicalChannelEstablished(call, pChannel); @@ -805,11 +805,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED); } - + } /* Retrieve tunneling info/H.245 control channel address from the connect msg */ - if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && + if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) { if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); @@ -822,7 +822,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) OO_TESTFLAG (call->flags, OO_M_TUNNELING) && callProceeding->m.h245AddressPresent) { OOTRACEINFO3("Tunneling and h245address provided." - "Using Tunneling for H.245 messages (%s, %s)\n", + "Using Tunneling for H.245 messages (%s, %s)\n", call->callType, call->callToken); } else if(callProceeding->m.h245AddressPresent) @@ -831,16 +831,16 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); OOTRACEINFO3("Tunneling is disabled for call as H245 address is " - "provided in callProceeding message (%s, %s)\n", + "provided in callProceeding message (%s, %s)\n", call->callType, call->callToken); } - ret = ooH323GetIpPortFromH225TransportAddress(call, + ret = ooH323GetIpPortFromH225TransportAddress(call, &callProceeding->h245Address, call->remoteIP, &call->remoteH245Port); if(ret != OO_OK) { OOTRACEERR3("Error: Unknown H245 address type in received " - "CallProceeding message (%s, %s)", call->callType, + "CallProceeding message (%s, %s)", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -851,11 +851,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } if(call->remoteH245Port != 0 && !call->pH245Channel) { - /* Create an H.245 connection. + /* Create an H.245 connection. */ if(ooCreateH245Connection(call)== OO_FAILED) { - OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", + OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -878,7 +878,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) H245OpenLogicalChannel* olc; ASN1OCTET msgbuf[MAXMSGLEN]; ooLogicalChannel * pChannel = NULL; - H245H2250LogicalChannelParameters * h2250lcp = NULL; + H245H2250LogicalChannelParameters * h2250lcp = NULL; int i=0, ret=0; ooHandleDisplayIE(call, q931Msg); @@ -893,7 +893,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) if(alerting == NULL) { OOTRACEERR3("Error: Received Alerting message does not have " - "alerting UUIE (%s, %s)\n", call->callType, + "alerting UUIE (%s, %s)\n", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -920,7 +920,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) { olc = NULL; - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -937,9 +937,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, alerting->fastStart.elem[i].data, + memcpy(msgbuf, alerting->fastStart.elem[i].data, alerting->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, alerting->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -964,7 +964,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) { OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. " "(%s, %s)\n", - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -973,9 +973,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) if(pChannel->channelNo != olc->forwardLogicalChannelNumber) { OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel" - "Number from %d to %d (%s, %s)\n", - pChannel->channelNo, - olc->forwardLogicalChannelNumber, call->callType, + "Number from %d to %d (%s, %s)\n", + pChannel->channelNo, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); pChannel->channelNo = olc->forwardLogicalChannelNumber; } @@ -985,12 +985,12 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", + "channel %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -1011,10 +1011,10 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); return OO_FAILED; } - ret = ooGetIpPortFromH245TransportAddress(call, + ret = ooGetIpPortFromH245TransportAddress(call, &h2250lcp->mediaChannel, pChannel->remoteIP, &pChannel->remoteMediaPort); - + if(ret != OO_OK) { if(call->callState < OO_CALL_CLEAR) @@ -1026,18 +1026,18 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + if(!pChannel->chanCap->startTransmitChannel) { OOTRACEERR3("ERROR:No callback registered to start transmit " - "channel (%s, %s)\n",call->callType, + "channel (%s, %s)\n",call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); return OO_FAILED; } pChannel->chanCap->startTransmitChannel(call, pChannel); - /* Mark the current channel as established and close all other + /* Mark the current channel as established and close all other logical channels with same session id and in same direction. */ ooOnLogicalChannelEstablished(call, pChannel); @@ -1046,12 +1046,12 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) finishPrint(); removeEventHandler(call->pctxt); OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED); - } + } } /* Retrieve tunneling info/H.245 control channel address from the connect msg */ - if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && + if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) { if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); @@ -1062,9 +1062,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && q931Msg->userInfo->h323_uu_pdu.h245Tunneling && OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { - if (alerting->m.h245AddressPresent) + if (alerting->m.h245AddressPresent) OOTRACEINFO3("Tunneling and h245address provided." - "Giving preference to Tunneling (%s, %s)\n", + "Giving preference to Tunneling (%s, %s)\n", call->callType, call->callToken); if (call->h225version >= 4) { ret =ooSendTCSandMSD(call); @@ -1077,16 +1077,16 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); OOTRACEINFO3("Tunneling is disabled for call as H245 address is " - "provided in Alerting message (%s, %s)\n", + "provided in Alerting message (%s, %s)\n", call->callType, call->callToken); } - ret = ooH323GetIpPortFromH225TransportAddress(call, + ret = ooH323GetIpPortFromH225TransportAddress(call, &alerting->h245Address, call->remoteIP, &call->remoteH245Port); if(ret != OO_OK) { OOTRACEERR3("Error: Unknown H245 address type in received " - "Alerting message (%s, %s)", call->callType, + "Alerting message (%s, %s)", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -1097,11 +1097,11 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } if(call->remoteH245Port != 0 && !call->pH245Channel) { - /* Create an H.245 connection. + /* Create an H.245 connection. */ if(ooCreateH245Connection(call)== OO_FAILED) { - OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", + OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -1127,7 +1127,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) H245OpenLogicalChannel* olc; ASN1OCTET msgbuf[MAXMSGLEN]; ooLogicalChannel * pChannel = NULL; - H245H2250LogicalChannelParameters * h2250lcp = NULL; + H245H2250LogicalChannelParameters * h2250lcp = NULL; int i=0, ret=0; ooHandleDisplayIE(call, q931Msg); @@ -1142,7 +1142,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) if(progress == NULL) { OOTRACEERR3("Error: Received Progress message does not have " - "progress UUIE (%s, %s)\n", call->callType, + "progress UUIE (%s, %s)\n", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -1169,7 +1169,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) { olc = NULL; - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -1186,9 +1186,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, progress->fastStart.elem[i].data, + memcpy(msgbuf, progress->fastStart.elem[i].data, progress->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, progress->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -1213,7 +1213,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) { OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. " "(%s, %s)\n", - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -1222,9 +1222,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) if(pChannel->channelNo != olc->forwardLogicalChannelNumber) { OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel" - "Number from %d to %d (%s, %s)\n", - pChannel->channelNo, - olc->forwardLogicalChannelNumber, call->callType, + "Number from %d to %d (%s, %s)\n", + pChannel->channelNo, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); pChannel->channelNo = olc->forwardLogicalChannelNumber; } @@ -1234,12 +1234,12 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", + "channel %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -1260,10 +1260,10 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); return OO_FAILED; } - ret = ooGetIpPortFromH245TransportAddress(call, + ret = ooGetIpPortFromH245TransportAddress(call, &h2250lcp->mediaChannel, pChannel->remoteIP, &pChannel->remoteMediaPort); - + if(ret != OO_OK) { if(call->callState < OO_CALL_CLEAR) @@ -1277,11 +1277,11 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); return OO_FAILED; } - + if(!pChannel->chanCap->startTransmitChannel) { OOTRACEERR3("ERROR:No callback registered to start transmit " - "channel (%s, %s)\n",call->callType, + "channel (%s, %s)\n",call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -1289,7 +1289,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) } pChannel->chanCap->startTransmitChannel(call, pChannel); } - /* Mark the current channel as established and close all other + /* Mark the current channel as established and close all other logical channels with same session id and in same direction. */ ooOnLogicalChannelEstablished(call, pChannel); @@ -1298,12 +1298,12 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) removeEventHandler(call->pctxt); OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED); } - + } /* Retrieve the H.245 control channel address from the connect msg */ /* Retrieve tunneling info/H.245 control channel address from the connect msg */ - if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && + if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) { if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); @@ -1314,9 +1314,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && q931Msg->userInfo->h323_uu_pdu.h245Tunneling && OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { - if (progress->m.h245AddressPresent) + if (progress->m.h245AddressPresent) OOTRACEINFO3("Tunneling and h245address provided." - "Giving preference to Tunneling (%s, %s)\n", + "Giving preference to Tunneling (%s, %s)\n", call->callType, call->callToken); if (call->h225version >= 4) { ret =ooSendTCSandMSD(call); @@ -1328,16 +1328,16 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); OOTRACEINFO3("Tunneling is disabled for call as H245 address is " - "provided in Progress message (%s, %s)\n", + "provided in Progress message (%s, %s)\n", call->callType, call->callToken); } - ret = ooH323GetIpPortFromH225TransportAddress(call, + ret = ooH323GetIpPortFromH225TransportAddress(call, &progress->h245Address, call->remoteIP, &call->remoteH245Port); if(ret != OO_OK) { OOTRACEERR3("Error: Unknown H245 address type in received " - "Progress message (%s, %s)", call->callType, + "Progress message (%s, %s)", call->callType, call->callToken); /* Mark call for clearing */ if(call->callState < OO_CALL_CLEAR) @@ -1348,11 +1348,11 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) return OO_FAILED; } if(call->remoteH245Port != 0 && !call->pH245Channel) { - /* Create an H.245 connection. + /* Create an H.245 connection. */ if(ooCreateH245Connection(call)== OO_FAILED) { - OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", + OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -1371,7 +1371,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg) return OO_OK; } - + int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) { @@ -1380,7 +1380,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) H245OpenLogicalChannel* olc; ASN1OCTET msgbuf[MAXMSGLEN]; ooLogicalChannel * pChannel = NULL; - H245H2250LogicalChannelParameters * h2250lcp = NULL; + H245H2250LogicalChannelParameters * h2250lcp = NULL; ooHandleDisplayIE(call, q931Msg); @@ -1412,7 +1412,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) } ooHandleH2250ID(call, &connect->protocolIdentifier); /*Handle fast-start */ - if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) && + if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) && !OO_TESTFLAG (call->flags, OO_M_FASTSTARTANSWERED)) { if(!connect->m.fastStartPresent) @@ -1423,7 +1423,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) } } - if (connect->m.fastStartPresent && + if (connect->m.fastStartPresent && !OO_TESTFLAG(call->flags, OO_M_FASTSTARTANSWERED)) { /* For printing the decoded message to log, initialize handler. */ @@ -1436,7 +1436,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) { olc = NULL; /* memset(msgbuf, 0, sizeof(msgbuf));*/ - olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -1453,9 +1453,9 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - memcpy(msgbuf, connect->fastStart.elem[i].data, + memcpy(msgbuf, connect->fastStart.elem[i].data, connect->fastStart.elem[i].numocts); - setPERBuffer(call->pctxt, msgbuf, + setPERBuffer(call->pctxt, msgbuf, connect->fastStart.elem[i].numocts, 1); ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc); if(ret != ASN_OK) @@ -1480,7 +1480,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) { OOTRACEERR4("ERROR: Logical Channel %d not found, fasts start " "answered. (%s, %s)\n", - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); finishPrint(); removeEventHandler(call->pctxt); @@ -1490,21 +1490,21 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) { OOTRACEINFO5("Remote endpoint changed forwardLogicalChannelNumber" "from %d to %d (%s, %s)\n", pChannel->channelNo, - olc->forwardLogicalChannelNumber, call->callType, + olc->forwardLogicalChannelNumber, call->callType, call->callToken); pChannel->channelNo = olc->forwardLogicalChannelNumber; } if(!strcmp(pChannel->dir, "transmit")) { - if(olc->forwardLogicalChannelParameters.multiplexParameters.t != + if(olc->forwardLogicalChannelParameters.multiplexParameters.t != T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for channel" - " %d (%s, %s)\n", olc->forwardLogicalChannelNumber, + " %d (%s, %s)\n", olc->forwardLogicalChannelNumber, call->callType, call->callToken); continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -1526,7 +1526,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) return OO_FAILED; } - ret = ooGetIpPortFromH245TransportAddress(call, + ret = ooGetIpPortFromH245TransportAddress(call, &h2250lcp->mediaChannel, pChannel->remoteIP, &pChannel->remoteMediaPort); if(ret != OO_OK) @@ -1552,7 +1552,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) } pChannel->chanCap->startTransmitChannel(call, pChannel); } - /* Mark the current channel as established and close all other + /* Mark the current channel as established and close all other logical channels with same session id and in same direction. */ ooOnLogicalChannelEstablished(call, pChannel); @@ -1563,7 +1563,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) } /* Retrieve tunneling info/H.245 control channel address from the connect msg */ - if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && + if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent && !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) { if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); @@ -1576,7 +1576,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) OO_TESTFLAG (call->flags, OO_M_TUNNELING) && connect->m.h245AddressPresent) { OOTRACEINFO3("Tunneling and h245address provided." - "Giving preference to Tunneling (%s, %s)\n", + "Giving preference to Tunneling (%s, %s)\n", call->callType, call->callToken); } else if(connect->m.h245AddressPresent) @@ -1585,10 +1585,10 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) { OO_CLRFLAG (call->flags, OO_M_TUNNELING); OOTRACEINFO3("Tunneling is disabled for call as H245 address is " - "provided in connect message (%s, %s)\n", + "provided in connect message (%s, %s)\n", call->callType, call->callToken); } - ret = ooH323GetIpPortFromH225TransportAddress(call, + ret = ooH323GetIpPortFromH225TransportAddress(call, &connect->h245Address, call->remoteIP, &call->remoteH245Port); if(ret != OO_OK) { @@ -1606,11 +1606,11 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) if(call->remoteH245Port != 0 && !call->pH245Channel) { - /* Create an H.245 connection. + /* Create an H.245 connection. */ if(ooCreateH245Connection(call)== OO_FAILED) { - OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", + OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -1645,7 +1645,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) } /* - Send TCS as call established and no capability exchange has yet + Send TCS as call established and no capability exchange has yet started. This will be true only when separate h245 connection is not established and tunneling is being used. */ @@ -1665,7 +1665,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg) if (call->rtdrCount > 0 && call->rtdrInterval > 0) { return ooSendRoundTripDelayRequest(call); } - return OO_OK; + return OO_OK; } int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) @@ -1697,21 +1697,21 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) if (ret != OO_OK) { call->callState = OO_CALL_CLEAR; } else { - + /* H225 message callback */ if(gH323ep.h225Callbacks.onReceivedSetup) ret = gH323ep.h225Callbacks.onReceivedSetup(call, q931Msg); } - /* Free up the mem used by the received message, as it's processing - is done. + /* Free up the mem used by the received message, as it's processing + is done. */ if (ret == OO_OK) { ooFreeQ931Message(call->msgctxt, q931Msg); - - /* DISABLEGK is used to selectively disable gatekeeper use. For - incoming calls DISABLEGK can be set in onReceivedSetup callback by - application. Very useful in pbx applications where gk is used only + + /* DISABLEGK is used to selectively disable gatekeeper use. For + incoming calls DISABLEGK can be set in onReceivedSetup callback by + application. Very useful in pbx applications where gk is used only when call is to or from outside pbx domian */ if(gH323ep.gkClient && !OO_TESTFLAG(call->flags, OO_M_DISABLEGK)) @@ -1720,7 +1720,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) { call->callState = OO_CALL_WAITING_ADMISSION; ast_mutex_lock(&call->GkLock); - ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, call, + ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, call, FALSE); tv = ast_tvnow(); ts.tv_sec = tv.tv_sec + 24; @@ -1761,7 +1761,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) case Q931AlertingMsg:/* ALERTING message received */ - OOTRACEINFO3("H.225 Alerting message received (%s, %s)\n", + OOTRACEINFO3("H.225 Alerting message received (%s, %s)\n", call->callType, call->callToken); call->alertingTime = (H235TimeStamp) time(NULL); @@ -1774,7 +1774,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) case Q931ProgressMsg:/* PROGRESS message received */ - OOTRACEINFO3("H.225 Progress message received (%s, %s)\n", + OOTRACEINFO3("H.225 Progress message received (%s, %s)\n", call->callType, call->callToken); ooOnReceivedProgress(call, q931Msg); @@ -1796,12 +1796,12 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) { pNode = dListFindByIndex(&call->timerList, i); pTimer = (OOTimer*)pNode->data; - if(((ooTimerCallback*)pTimer->cbData)->timerType & + if(((ooTimerCallback*)pTimer->cbData)->timerType & OO_CALLESTB_TIMER) { memFreePtr(call->pctxt, pTimer->cbData); ooTimerDelete(call->pctxt, &call->timerList, pTimer); - OOTRACEDBGC3("Deleted CallESTB timer. (%s, %s)\n", + OOTRACEDBGC3("Deleted CallESTB timer. (%s, %s)\n", call->callType, call->callToken); break; } @@ -1840,14 +1840,14 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) call->endTime = (H235TimeStamp) time(NULL); ooOnReceivedReleaseComplete(call, q931Msg); - + ooFreeQ931Message(call->msgctxt, q931Msg); break; - case Q931FacilityMsg: + case Q931FacilityMsg: OOTRACEINFO3("H.225 Facility message Received (%s, %s)\n", call->callType, call->callToken); - ooOnReceivedFacility(call, q931Msg); + ooOnReceivedFacility(call, q931Msg); ooFreeQ931Message(call->msgctxt, q931Msg); break; case Q931StatusMsg: @@ -1866,7 +1866,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg) call->callType, call->callToken); ooFreeQ931Message(call->msgctxt, q931Msg); break; - case Q931NotifyMsg: + case Q931NotifyMsg: OOTRACEINFO3("H.225 Notify message Received (%s, %s)\n", call->callType, call->callToken); ooFreeQ931Message(call->msgctxt, q931Msg); @@ -1886,7 +1886,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) int ret; H225TransportAddress_ipAddress_ip *ip = NULL; H225TransportAddress_ip6Address_ip *ip6 = NULL; - OOTRACEDBGC3("Received Facility Message.(%s, %s)\n", call->callType, + OOTRACEDBGC3("Received Facility Message.(%s, %s)\n", call->callType, call->callToken); ooHandleDisplayIE(call, pQ931Msg); @@ -1945,11 +1945,11 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) { OOTRACEINFO3("Call Forward Facility message received. (%s, %s)\n", call->callType, call->callToken); - if(!facility->m.alternativeAddressPresent && + if(!facility->m.alternativeAddressPresent && !facility->m.alternativeAliasAddressPresent) { OOTRACEERR3("Error:No alternative address provided in call forward" - "facility message.(%s, %s)\n", call->callType, + "facility message.(%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) { @@ -1958,7 +1958,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) } return OO_OK; } - call->pCallFwdData = (OOCallFwdData *) memAlloc(call->pctxt, + call->pCallFwdData = (OOCallFwdData *) memAlloc(call->pctxt, sizeof(OOCallFwdData)); if(!call->pCallFwdData) { @@ -1972,40 +1972,40 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) if(facility->m.alternativeAddressPresent) { if (call->versionIP == 6) { - if(facility->alternativeAddress.t != + if(facility->alternativeAddress.t != T_H225TransportAddress_ip6Address) { OOTRACEERR3("ERROR: Source call signalling address type not ip6 " "(%s, %s)\n", call->callType, call->callToken); - + return OO_FAILED; } ip6 = &facility->alternativeAddress.u.ip6Address->ip; inet_ntop(AF_INET6, ip6->data, call->pCallFwdData->ip, INET6_ADDRSTRLEN); - call->pCallFwdData->port = + call->pCallFwdData->port = facility->alternativeAddress.u.ip6Address->port; } else { - if(facility->alternativeAddress.t != + if(facility->alternativeAddress.t != T_H225TransportAddress_ipAddress) { OOTRACEERR3("ERROR: Source call signalling address type not ip " "(%s, %s)\n", call->callType, call->callToken); - + return OO_FAILED; } ip = &facility->alternativeAddress.u.ipAddress->ip; - sprintf(call->pCallFwdData->ip, "%d.%d.%d.%d", ip->data[0], + sprintf(call->pCallFwdData->ip, "%d.%d.%d.%d", ip->data[0], ip->data[1], ip->data[2], ip->data[3]); - call->pCallFwdData->port = + call->pCallFwdData->port = facility->alternativeAddress.u.ipAddress->port; } } if(facility->m.alternativeAliasAddressPresent) { - ooH323RetrieveAliases(call, &facility->alternativeAliasAddress, + ooH323RetrieveAliases(call, &facility->alternativeAliasAddress, &call->pCallFwdData->aliases); } /* Now we have to clear the current call and make a new call to @@ -2035,12 +2035,12 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) } } else{ - OOTRACEINFO3("Unhandled Facility reason type received (%s, %s)\n", + OOTRACEINFO3("Unhandled Facility reason type received (%s, %s)\n", call->callType, call->callToken); } } else{ /* Empty facility message Check for tunneling */ - if (pH323UUPdu->h323_message_body.t == + if (pH323UUPdu->h323_message_body.t == T_H225H323_UU_PDU_h323_message_body_empty) { OOTRACEDBGB3("Handling tunneled messages in empty Facility message." " (%s, %s)\n", call->callType, call->callToken); @@ -2049,7 +2049,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg) "message. (%s, %s)\n", call->callType, call->callToken); } } - + return OO_OK; } @@ -2059,7 +2059,7 @@ int ooHandleStartH245FacilityMessage H225TransportAddress_ipAddress *ipAddress = NULL; H225TransportAddress_ip6Address *ip6Address = NULL; int ret; - + /* Extract H245 address */ if(!facility->m.h245AddressPresent) { @@ -2097,7 +2097,7 @@ int ooHandleStartH245FacilityMessage "address found. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + sprintf(call->remoteIP, "%d.%d.%d.%d", ipAddress->ip.data[0], ipAddress->ip.data[1], ipAddress->ip.data[2], @@ -2131,17 +2131,17 @@ int ooHandleTunneledH245Messages H245Message *pmsg; OOCTXT *pctxt = call->msgctxt; int ret=0,i=0; - - OOTRACEDBGC3("Checking for tunneled H.245 messages (%s, %s)\n", + + OOTRACEDBGC3("Checking for tunneled H.245 messages (%s, %s)\n", call->callType, call->callToken); - /* Check whether there are tunneled messages */ + /* Check whether there are tunneled messages */ if(pH323UUPdu->m.h245TunnelingPresent) { if(pH323UUPdu->h245Tunneling) { OOTRACEDBGB4("Total number of tunneled H245 messages are %d.(%s, %s)" - "\n", (int)pH323UUPdu->h245Control.n, call->callType, + "\n", (int)pH323UUPdu->h245Control.n, call->callType, call->callToken); for(i=0; i< (int)pH323UUPdu->h245Control.n; i++) { @@ -2156,21 +2156,21 @@ int ooHandleTunneledH245Messages return OO_FAILED; } - setPERBuffer(pctxt, + setPERBuffer(pctxt, (ASN1OCTET*)pH323UUPdu->h245Control.elem[i].data, - pH323UUPdu->h245Control.elem[i].numocts, 1); + pH323UUPdu->h245Control.elem[i].numocts, 1); initializePrintHandler(&printHandler, "Tunneled H.245 Message"); memset(pmsg, 0, sizeof(H245Message)); /* Set event handler */ setEventHandler (pctxt, &printHandler); - OOTRACEDBGC4("Decoding %d tunneled H245 message. (%s, %s)\n", + OOTRACEDBGC4("Decoding %d tunneled H245 message. (%s, %s)\n", i+1, call->callType, call->callToken); - ret = asn1PD_H245MultimediaSystemControlMessage(pctxt, + ret = asn1PD_H245MultimediaSystemControlMessage(pctxt, &(pmsg->h245Msg)); if(ret != ASN_OK) { - OOTRACEERR3("Error decoding H245 message (%s, %s)\n", + OOTRACEERR3("Error decoding H245 message (%s, %s)\n", call->callType, call->callToken); ooFreeH245Message(call,pmsg); return OO_FAILED; @@ -2187,7 +2187,7 @@ int ooHandleTunneledH245Messages } int ooH323RetrieveAliases - (OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses, + (OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses, OOAliases **aliasList) { int i=0,j=0,k=0; @@ -2198,14 +2198,14 @@ int ooH323RetrieveAliases if(!pAddresses) { - OOTRACEWARN3("Warn:No Aliases present (%s, %s)\n", call->callType, + OOTRACEWARN3("Warn:No Aliases present (%s, %s)\n", call->callType, call->callToken); return OO_OK; } /* check for aliases */ if(pAddresses->count<=0) return OO_OK; - + for(i=0; i<(int)pAddresses->count; i++) { pNode = dListFindByIndex (pAddresses, i); @@ -2230,14 +2230,14 @@ int ooH323RetrieveAliases { case T_H225AliasAddress_dialedDigits: newAlias->type = T_H225AliasAddress_dialedDigits; - newAlias->value = (char*) memAlloc(call->pctxt, + newAlias->value = (char*) memAlloc(call->pctxt, strlen(pAliasAddress->u.dialedDigits)*sizeof(char)+1); if(!newAlias->value) { OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - " - "newAlias->value(dialedDigits) (%s, %s)\n", + "newAlias->value(dialedDigits) (%s, %s)\n", call->callType, call->callToken); - memFreePtr(call->pctxt, newAlias); + memFreePtr(call->pctxt, newAlias); return OO_FAILED; } @@ -2247,14 +2247,14 @@ int ooH323RetrieveAliases break; case T_H225AliasAddress_h323_ID: newAlias->type = T_H225AliasAddress_h323_ID; - newAlias->value = (char*)memAlloc(call->pctxt, + newAlias->value = (char*)memAlloc(call->pctxt, (pAliasAddress->u.h323_ID.nchars+1)*sizeof(char)+1); if(!newAlias->value) { OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - " - "newAlias->value(h323id) (%s, %s)\n", call->callType, + "newAlias->value(h323id) (%s, %s)\n", call->callType, call->callToken); - memFreePtr(call->pctxt, newAlias); + memFreePtr(call->pctxt, newAlias); return OO_FAILED; } @@ -2266,7 +2266,7 @@ int ooH323RetrieveAliases } } newAlias->value[k] = '\0'; - break; + break; case T_H225AliasAddress_url_ID: newAlias->type = T_H225AliasAddress_url_ID; newAlias->value = (char*)memAlloc(call->pctxt, @@ -2274,9 +2274,9 @@ int ooH323RetrieveAliases if(!newAlias->value) { OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - " - "newAlias->value(urlid) (%s, %s)\n", call->callType, + "newAlias->value(urlid) (%s, %s)\n", call->callType, call->callToken); - memFreePtr(call->pctxt, newAlias); + memFreePtr(call->pctxt, newAlias); return OO_FAILED; } @@ -2288,18 +2288,18 @@ int ooH323RetrieveAliases newAlias->type = T_H225AliasAddress_transportID; pTransportAddrss = pAliasAddress->u.transportID; if(pTransportAddrss->t == T_H225TransportAddress_ip6Address) { - /* hopefully ip:port value can't exceed more than 30 + /* hopefully ip:port value can't exceed more than 30 characters */ - newAlias->value = (char*)memAlloc(call->pctxt, + newAlias->value = (char*)memAlloc(call->pctxt, INET6_ADDRSTRLEN*sizeof(char)*2); inet_ntop(AF_INET6, pTransportAddrss->u.ip6Address->ip.data, newAlias->value, INET6_ADDRSTRLEN); sprintf(newAlias->value+strlen(newAlias->value), ":%d", pTransportAddrss->u.ip6Address->port); } else if(pTransportAddrss->t == T_H225TransportAddress_ipAddress) { - /* hopefully ip:port value can't exceed more than 30 + /* hopefully ip:port value can't exceed more than 30 characters */ - newAlias->value = (char*)memAlloc(call->pctxt, + newAlias->value = (char*)memAlloc(call->pctxt, 30*sizeof(char)); - sprintf(newAlias->value, "%d.%d.%d.%d:%d", + sprintf(newAlias->value, "%d.%d.%d.%d:%d", pTransportAddrss->u.ipAddress->ip.data[0], pTransportAddrss->u.ipAddress->ip.data[1], pTransportAddrss->u.ipAddress->ip.data[2], @@ -2313,14 +2313,14 @@ int ooH323RetrieveAliases break; case T_H225AliasAddress_email_ID: newAlias->type = T_H225AliasAddress_email_ID; - newAlias->value = (char*)memAlloc(call->pctxt, + newAlias->value = (char*)memAlloc(call->pctxt, strlen(pAliasAddress->u.email_ID)*sizeof(char)+1); if(!newAlias->value) { OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - " - "newAlias->value(emailid) (%s, %s)\n", call->callType, + "newAlias->value(emailid) (%s, %s)\n", call->callType, call->callToken); - memFreePtr(call->pctxt, newAlias); + memFreePtr(call->pctxt, newAlias); return OO_FAILED; } @@ -2329,7 +2329,7 @@ int ooH323RetrieveAliases newAlias->value[strlen(pAliasAddress->u.email_ID)*sizeof(char)]='\0'; break; default: - OOTRACEERR3("Error:Unhandled Alias type (%s, %s)\n", + OOTRACEERR3("Error:Unhandled Alias type (%s, %s)\n", call->callType, call->callToken); memFreePtr(call->pctxt, newAlias); continue; @@ -2339,7 +2339,7 @@ int ooH323RetrieveAliases *aliasList = newAlias; newAlias = NULL; - + pAliasAddress = NULL; pNode = NULL; }/* endof: for */ @@ -2364,7 +2364,7 @@ int ooPopulatePrefixList(OOCTXT *pctxt, OOAliases *pAliases, switch(pAlias->type) { case T_H225AliasAddress_dialedDigits: - pPrefixEntry = (H225SupportedPrefix *)memAlloc(pctxt, + pPrefixEntry = (H225SupportedPrefix *)memAlloc(pctxt, sizeof(H225SupportedPrefix)); if(!pPrefixEntry) { OOTRACEERR1("ERROR:Memory - ooPopulatePrefixList - pAliasEntry\n"); @@ -2383,12 +2383,12 @@ int ooPopulatePrefixList(OOCTXT *pctxt, OOAliases *pAliases, bValid = TRUE; break; default: - bValid = FALSE; + bValid = FALSE; } - + if(bValid) dListAppend( pctxt, pPrefixList, (void*)pPrefixEntry ); - + pAlias = pAlias->next; } } @@ -2412,7 +2412,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, pAlias = pAlias->next; continue; } - pAliasEntry = (H225AliasAddress*)memAlloc(pctxt, + pAliasEntry = (H225AliasAddress*)memAlloc(pctxt, sizeof(H225AliasAddress)); if(!pAliasEntry) { @@ -2445,7 +2445,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, pAliasEntry->u.h323_ID.nchars = strlen(pAlias->value); pAliasEntry->u.h323_ID.data = (ASN116BITCHAR*)memAllocZ (pctxt, strlen(pAlias->value)*sizeof(ASN116BITCHAR)); - + if(!pAliasEntry->u.h323_ID.data) { OOTRACEERR1("ERROR:Memory - ooPopulateAliasList - h323_id\n"); @@ -2458,12 +2458,12 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, break; case T_H225AliasAddress_url_ID: pAliasEntry->t = T_H225AliasAddress_url_ID; - pAliasEntry->u.url_ID = (ASN1IA5String)memAlloc(pctxt, + pAliasEntry->u.url_ID = (ASN1IA5String)memAlloc(pctxt, strlen(pAlias->value)+1); if(!pAliasEntry->u.url_ID) { OOTRACEERR1("ERROR:Memory - ooPopulateAliasList - url_id\n"); - memFreePtr(pctxt, pAliasEntry); + memFreePtr(pctxt, pAliasEntry); return OO_FAILED; } strcpy(*(char**)&pAliasEntry->u.url_ID, pAlias->value); @@ -2471,7 +2471,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, break; case T_H225AliasAddress_email_ID: pAliasEntry->t = T_H225AliasAddress_email_ID; - pAliasEntry->u.email_ID = (ASN1IA5String)memAlloc(pctxt, + pAliasEntry->u.email_ID = (ASN1IA5String)memAlloc(pctxt, strlen(pAlias->value)+1); if(!pAliasEntry->u.email_ID) { @@ -2484,14 +2484,14 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, break; default: OOTRACEERR1("ERROR: Unhandled alias type\n"); - bValid = FALSE; + bValid = FALSE; } - + if(bValid) dListAppend( pctxt, pAliasList, (void*)pAliasEntry ); else memFreePtr(pctxt, pAliasEntry); - + pAlias = pAlias->next; } } @@ -2544,7 +2544,7 @@ OOAliases* ooH323AddAliasToList int j=0,k=0; OOAliases *newAlias=NULL; H225TransportAddress *pTransportAddrss=NULL; - + newAlias = (OOAliases*) memAlloc(pctxt, sizeof(OOAliases)); if(!newAlias) { @@ -2562,7 +2562,7 @@ OOAliases* ooH323AddAliasToList break; case T_H225AliasAddress_h323_ID: newAlias->type = T_H225AliasAddress_h323_ID; - newAlias->value = (char*)memAlloc(pctxt, + newAlias->value = (char*)memAlloc(pctxt, (pAliasAddress->u.h323_ID.nchars+1)*sizeof(char)+1); for(j=0, k=0; j<(int)pAliasAddress->u.h323_ID.nchars; j++) @@ -2573,7 +2573,7 @@ OOAliases* ooH323AddAliasToList } } newAlias->value[k] = '\0'; - break; + break; case T_H225AliasAddress_url_ID: newAlias->type = T_H225AliasAddress_url_ID; newAlias->value = (char*)memAlloc(pctxt, @@ -2585,18 +2585,18 @@ OOAliases* ooH323AddAliasToList newAlias->type = T_H225AliasAddress_transportID; pTransportAddrss = pAliasAddress->u.transportID; if(pTransportAddrss->t == T_H225TransportAddress_ip6Address) { - /* hopefully ip:port value can't exceed more than 30 + /* hopefully ip:port value can't exceed more than 30 characters */ - newAlias->value = (char*)memAlloc(pctxt, + newAlias->value = (char*)memAlloc(pctxt, INET6_ADDRSTRLEN*sizeof(char)*2); inet_ntop(AF_INET6, pTransportAddrss->u.ip6Address->ip.data, newAlias->value, INET6_ADDRSTRLEN); sprintf(newAlias->value+strlen(newAlias->value), ":%d", pTransportAddrss->u.ip6Address->port); } else if(pTransportAddrss->t == T_H225TransportAddress_ipAddress) { - /* hopefully ip:port value can't exceed more than 30 + /* hopefully ip:port value can't exceed more than 30 characters */ - newAlias->value = (char*)memAlloc(pctxt, + newAlias->value = (char*)memAlloc(pctxt, 30*sizeof(char)); - sprintf(newAlias->value, "%d.%d.%d.%d:%d", + sprintf(newAlias->value, "%d.%d.%d.%d:%d", pTransportAddrss->u.ipAddress->ip.data[0], pTransportAddrss->u.ipAddress->ip.data[1], pTransportAddrss->u.ipAddress->ip.data[2], @@ -2610,7 +2610,7 @@ OOAliases* ooH323AddAliasToList break; case T_H225AliasAddress_email_ID: newAlias->type = T_H225AliasAddress_email_ID; - newAlias->value = (char*)memAlloc(pctxt, + newAlias->value = (char*)memAlloc(pctxt, strlen(pAliasAddress->u.email_ID)*sizeof(char)+1); strcpy(newAlias->value, pAliasAddress->u.email_ID); @@ -2626,7 +2626,7 @@ OOAliases* ooH323AddAliasToList return newAlias; } -int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, +int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, H225TransportAddress *h225Address, char *ip, int *port) { if (call->versionIP == 6) { @@ -2646,8 +2646,8 @@ int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, call->callToken); return OO_FAILED; } - sprintf(ip, "%d.%d.%d.%d", - h225Address->u.ipAddress->ip.data[0], + sprintf(ip, "%d.%d.%d.%d", + h225Address->u.ipAddress->ip.data[0], h225Address->u.ipAddress->ip.data[1], h225Address->u.ipAddress->ip.data[2], h225Address->u.ipAddress->ip.data[3]); diff --git a/addons/ooh323c/src/ooh323.h b/addons/ooh323c/src/ooh323.h index 96b54f5f06..3877772af1 100644 --- a/addons/ooh323c/src/ooh323.h +++ b/addons/ooh323c/src/ooh323.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooh323.h - * This file contains functions to support H.225 messages. + * @file ooh323.h + * This file contains functions to support H.225 messages. */ #ifndef _OOH323HDR_H_ #define _OOH323HDR_H_ @@ -95,7 +95,7 @@ EXTERN int ooOnReceivedFacility * * @return OO_OK, on success. OO_FAILED, on failure. */ -EXTERN int ooHandleTunneledH245Messages(struct OOH323CallData *call, +EXTERN int ooHandleTunneledH245Messages(struct OOH323CallData *call, H225H323_UU_PDU * pH323UUPdu); /** @@ -103,7 +103,7 @@ EXTERN int ooHandleTunneledH245Messages(struct OOH323CallData *call, * @param call Handle to the call * @param facility Pointer to the facility message. */ -EXTERN int ooHandleStartH245FacilityMessage(struct OOH323CallData *call, +EXTERN int ooHandleStartH245FacilityMessage(struct OOH323CallData *call, H225Facility_UUIE *facility); /** @@ -112,13 +112,13 @@ EXTERN int ooHandleStartH245FacilityMessage(struct OOH323CallData *call, * @param call Handle to the call.Null when retrieving registered * aliases. * @param pAddresses Pointer to the sequence of alias addresses. - * @param aliasList Handle to alias list to be populated with retrieved + * @param aliasList Handle to alias list to be populated with retrieved * aliases. * * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooH323RetrieveAliases - (struct OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses, + (struct OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses, OOAliases **aliasList); /** @@ -133,16 +133,16 @@ EXTERN int ooPopulatePrefixList(OOCTXT *pctxt, OOAliases *pAliases, * @param pAliases Pointer to aliases to be used for populating list. * @param pAliasList Pointer to alias list to be populated. * - * @return OO_OK, on success. OO_FAILED, otherwise. + * @return OO_OK, on success. OO_FAILED, otherwise. */ EXTERN int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases, - H225_SeqOfH225AliasAddress *pAliasList, int pAliasType); + H225_SeqOfH225AliasAddress *pAliasList, int pAliasType); /** * This function is used to search a particular alias in the alias list. The * search can be on the basis of alias type or value or both. * @param aliasList Handle to the alias list to be searched. - * @param type Type of the alias, if search has to consider type as + * @param type Type of the alias, if search has to consider type as * criterion, otherwise 0. * @param value Value of the alias, if the search has to consider value as * criterion, NULL otherwise. @@ -153,7 +153,7 @@ EXTERN OOAliases* ooH323GetAliasFromList /** * This function is used to add a new alias to alias list. * @param pAliasList Pointer to Alias list. - * @param pctxt Pointer to OOCTXT structure to be used for memory + * @param pctxt Pointer to OOCTXT structure to be used for memory * allocation. * @param pAliasAddress New alias address to be added. * @@ -169,12 +169,12 @@ EXTERN OOAliases* ooH323AddAliasToList * @param h225Address Pointer to H225TransportAddress structure * @param ip Pointer to the buffer in which dotted ip address will * be returned. - * @param port Pointer to the integer in which port value will be + * @param port Pointer to the integer in which port value will be * returned. * * @return OO_OK, on success; OO_FAILED, on failure. */ -int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, +int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, H225TransportAddress *h225Address, char *ip, int *port); /** * @} @@ -184,4 +184,3 @@ int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call, #endif #endif - diff --git a/addons/ooh323c/src/ooh323ep.c b/addons/ooh323c/src/ooh323ep.c index 92e6a2479b..1dedecdb8f 100644 --- a/addons/ooh323c/src/ooh323ep.c +++ b/addons/ooh323c/src/ooh323ep.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -36,7 +36,7 @@ extern DList g_TimerList; int ooH323EpInitialize (enum OOCallMode callMode, const char* tracefile) { - + memset(&gH323ep, 0, sizeof(ooEndPoint)); initContext(&(gH323ep.ctxt)); @@ -46,25 +46,25 @@ int ooH323EpInitialize { if(strlen(tracefile)>= MAXFILENAME) { - printf("Error:File name longer than allowed maximum %d\n", + printf("Error:File name longer than allowed maximum %d\n", MAXFILENAME-1); return OO_FAILED; } strcpy(gH323ep.traceFile, tracefile); } else{ - strcpy(gH323ep.traceFile, DEFAULT_TRACEFILE); + strcpy(gH323ep.traceFile, DEFAULT_TRACEFILE); } gH323ep.fptraceFile = fopen(gH323ep.traceFile, "a"); if(gH323ep.fptraceFile == NULL) { - printf("Error:Failed to open trace file %s for write.\n", + printf("Error:Failed to open trace file %s for write.\n", gH323ep.traceFile); return OO_FAILED; } - /* Initialize default port ranges that will be used by stack. + /* Initialize default port ranges that will be used by stack. Apps can override these by explicitely setting port ranges */ @@ -79,12 +79,12 @@ int ooH323EpInitialize gH323ep.rtpPorts.start = RTPPORTSSTART; gH323ep.rtpPorts.max = RTPPORTSEND; gH323ep.rtpPorts.current = RTPPORTSSTART; - + OO_SETFLAG(gH323ep.flags, OO_M_FASTSTART); OO_SETFLAG(gH323ep.flags, OO_M_TUNNELING); OO_SETFLAG(gH323ep.flags, OO_M_AUTOANSWER); OO_CLRFLAG(gH323ep.flags, OO_M_GKROUTED); - + gH323ep.aliases = NULL; gH323ep.termType = DEFAULT_TERMTYPE; @@ -107,7 +107,7 @@ int ooH323EpInitialize ooH323EpSetCallerID(DEFAULT_CALLERID); - + gH323ep.myCaps = NULL; gH323ep.noOfCaps = 0; gH323ep.callList = NULL; @@ -116,7 +116,7 @@ int ooH323EpInitialize ast_mutex_init(&newCallLock); ast_mutex_init(&bindPortLock); gH323ep.dtmfmode = 0; - gH323ep.callingPartyNumber[0]='\0'; + gH323ep.callingPartyNumber[0]='\0'; gH323ep.callMode = callMode; gH323ep.isGateway = FALSE; @@ -164,7 +164,7 @@ int ooH323EpSetLocalAddress(const char* localip, int listenport) strcpy(gH323ep.signallingIP, localip); OOTRACEINFO2("Signalling IP address is set to %s\n", localip); } - + if(listenport) { gH323ep.listenPort = listenport; @@ -332,7 +332,7 @@ int ooH323EpSetH225MsgCallbacks(OOH225MsgCallbacks h225Callbacks) return OO_OK; } - + int ooH323EpSetH323Callbacks(OOH323CALLBACKS h323Callbacks) { gH323ep.h323Callbacks.onNewCallCreated = h323Callbacks.onNewCallCreated; @@ -376,10 +376,10 @@ int ooH323EpDestroy(void) if(gH323ep.listener) { ooSocketClose(*(gH323ep.listener)); - gH323ep.listener = NULL; + gH323ep.listener = NULL; } - ooGkClientDestroy(); + ooGkClientDestroy(); if(gH323ep.fptraceFile) { @@ -461,7 +461,7 @@ int ooH323EpEnableH245Tunneling(void) OO_SETFLAG(gH323ep.flags, OO_M_TUNNELING); return OO_OK; } - + int ooH323EpDisableH245Tunneling(void) { OO_CLRFLAG(gH323ep.flags, OO_M_TUNNELING); @@ -527,7 +527,7 @@ int ooH323EpSetCallingPartyNumber(const char* number) int ret=OO_OK; if(number) { - strncpy(gH323ep.callingPartyNumber, number, + strncpy(gH323ep.callingPartyNumber, number, sizeof(gH323ep.callingPartyNumber)-1); ret = ooH323EpAddAliasDialedDigits((char*)number); return ret; @@ -544,7 +544,7 @@ int ooH323EpSetTraceLevel(int traceLevel) void ooH323EpPrintConfig(void) { OOTRACEINFO1("H.323 Endpoint Configuration is as follows:\n"); - + OOTRACEINFO2("\tTrace File: %s\n", gH323ep.traceFile); if(!OO_TESTFLAG(gH323ep.flags, OO_M_FASTSTART)) @@ -575,7 +575,7 @@ void ooH323EpPrintConfig(void) OOTRACEINFO1("\tAutoAnswer - enabled\n"); else OOTRACEINFO1("\tAutoAnswer - disabled\n"); - + OOTRACEINFO2("\tTerminal Type - %d\n", gH323ep.termType); OOTRACEINFO2("\tT35 CountryCode - %d\n", gH323ep.t35CountryCode); @@ -585,7 +585,7 @@ void ooH323EpPrintConfig(void) OOTRACEINFO2("\tManufacturer Code - %d\n", gH323ep.manufacturerCode); OOTRACEINFO2("\tProductID - %s\n", gH323ep.productID); - + OOTRACEINFO2("\tVersionID - %s\n", gH323ep.versionID); OOTRACEINFO2("\tLocal signalling IP address - %s\n", gH323ep.signallingIP); @@ -595,8 +595,8 @@ void ooH323EpPrintConfig(void) OOTRACEINFO2("\tCallerID - %s\n", gH323ep.callerid); - OOTRACEINFO2("\tCall Establishment Timeout - %d seconds\n", - gH323ep.callEstablishmentTimeout); + OOTRACEINFO2("\tCall Establishment Timeout - %d seconds\n", + gH323ep.callEstablishmentTimeout); OOTRACEINFO2("\tMasterSlaveDetermination Timeout - %d seconds\n", gH323ep.msdTimeout); @@ -609,7 +609,7 @@ void ooH323EpPrintConfig(void) OOTRACEINFO2("\tSession Timeout - %d seconds\n", gH323ep.sessionTimeout); - return; + return; } @@ -620,7 +620,7 @@ int ooH323EpAddG711Capability(int cap, int txframes, int rxframes, int dir, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } @@ -631,7 +631,7 @@ int ooH323EpAddG728Capability(int cap, int txframes, int rxframes, int dir, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } @@ -642,89 +642,89 @@ int ooH323EpAddG729Capability(int cap, int txframes, int rxframes, int dir, cb_StopTransmitChannel stopTransmitChannel) { return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, FALSE, - dir, startReceiveChannel, startTransmitChannel, + dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddG7231Capability(int cap, int txframes, int rxframes, +int ooH323EpAddG7231Capability(int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddG726Capability(int cap, int txframes, int rxframes, +int ooH323EpAddG726Capability(int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddAMRNBCapability(int cap, int txframes, int rxframes, +int ooH323EpAddAMRNBCapability(int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddSpeexCapability(int cap, int txframes, int rxframes, +int ooH323EpAddSpeexCapability(int cap, int txframes, int rxframes, OOBOOL silenceSuppression, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, - silenceSuppression, dir, startReceiveChannel, - startTransmitChannel, stopReceiveChannel, + return ooCapabilityAddSimpleCapability(NULL, cap, txframes, rxframes, + silenceSuppression, dir, startReceiveChannel, + startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddGSMCapability(int cap, ASN1USINT framesPerPkt, +int ooH323EpAddGSMCapability(int cap, ASN1USINT framesPerPkt, OOBOOL comfortNoise, OOBOOL scrambled, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddGSMCapability(NULL, cap, framesPerPkt, comfortNoise, - scrambled, dir, startReceiveChannel, + return ooCapabilityAddGSMCapability(NULL, cap, framesPerPkt, comfortNoise, + scrambled, dir, startReceiveChannel, startTransmitChannel, stopReceiveChannel, stopTransmitChannel, FALSE); } -int ooH323EpAddH263VideoCapability(int cap, unsigned sqcifMPI, - unsigned qcifMPI, unsigned cifMPI, - unsigned cif4MPI, unsigned cif16MPI, - unsigned maxBitRate, int dir, +int ooH323EpAddH263VideoCapability(int cap, unsigned sqcifMPI, + unsigned qcifMPI, unsigned cifMPI, + unsigned cif4MPI, unsigned cif16MPI, + unsigned maxBitRate, int dir, cb_StartReceiveChannel startReceiveChannel, cb_StartTransmitChannel startTransmitChannel, cb_StopReceiveChannel stopReceiveChannel, cb_StopTransmitChannel stopTransmitChannel) { - return ooCapabilityAddH263VideoCapability(NULL, sqcifMPI, qcifMPI, cifMPI, + return ooCapabilityAddH263VideoCapability(NULL, sqcifMPI, qcifMPI, cifMPI, cif4MPI, cif16MPI, maxBitRate,dir, startReceiveChannel, startTransmitChannel, - stopReceiveChannel, stopTransmitChannel, + stopReceiveChannel, stopTransmitChannel, FALSE); } @@ -805,7 +805,7 @@ int ooH323EpSetTCPPortRange(int base, int max) gH323ep.tcpPorts.start = base; if(max > 65500) gH323ep.tcpPorts.max = 65500; - else + else gH323ep.tcpPorts.max = max; if(gH323ep.tcpPorts.max 65500) gH323ep.udpPorts.max = 65500; - else + else gH323ep.udpPorts.max = max; - + if(gH323ep.udpPorts.max 65500) gH323ep.rtpPorts.max = 65500; - else + else gH323ep.rtpPorts.max = max; - + if(gH323ep.rtpPorts.maxfromDestination) OOTRACEDBGB1(" from = destination\n"); else - OOTRACEDBGB1(" from = originator\n"); + OOTRACEDBGB1(" from = originator\n"); msg->messageType = data[4]; OOTRACEDBGB2(" messageType = %x\n", msg->messageType); - + /* Have preamble, start getting the informationElements into buffers */ offset = 5; while (offset < length) { @@ -101,10 +101,10 @@ EXTERN int ooQ931Decode the Q931 documentation claims the length is a single byte, unfortunately all H.323 based apps have a 16 bit length here, so we allow for said longer length. There is presumably an addendum - to Q931 which describes this, and provides a means to - discriminate between the old 1 byte and the new 2 byte systems. + to Q931 which describes this, and provides a means to + discriminate between the old 1 byte and the new 2 byte systems. However, at present we assume it is always 2 bytes until we find - something that breaks it. + something that breaks it. */ len <<= 8; len |= data[offset++]; @@ -125,27 +125,27 @@ EXTERN int ooQ931Decode } else alen = len; - ie = (Q931InformationElement*) + ie = (Q931InformationElement*) memAlloc (pctxt, sizeof(*ie) - sizeof(ie->data) + alen); if(!ie) { - OOTRACEERR3("Error:Memory - ooQ931Decode - ie(%s, %s)\n", + OOTRACEERR3("Error:Memory - ooQ931Decode - ie(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } ie->discriminator = discriminator; ie->offset = ieOff; ie->length = len; - if (alen != 0) + if (alen != 0) memcpy(ie->data, data + offset, alen); offset += len; } else { - ie = (Q931InformationElement*) memAlloc (pctxt, + ie = (Q931InformationElement*) memAlloc (pctxt, sizeof(*ie)); if(!ie) { - OOTRACEERR3("Error:Memory - ooQ931Decode - ie(%s, %s)\n", + OOTRACEERR3("Error:Memory - ooQ931Decode - ie(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -188,14 +188,14 @@ EXTERN int ooQ931Decode gH323ep.h323Callbacks.onReceivedDTMF(call, (char *)ie->data); } } - /* Extract calling party number TODO:Give respect to presentation and + /* Extract calling party number TODO:Give respect to presentation and screening indicators ;-) */ if(ie->discriminator == Q931CallingPartyNumberIE) { OOTRACEDBGB1(" CallingPartyNumber IE = {\n"); if(ie->length < OO_MAX_NUMBER_LENGTH) { - int numoffset=1; + int numoffset=1; if(!(0x80 & ie->data[0])) numoffset = 2; memcpy(number, ie->data+numoffset,ie->length-numoffset); number[ie->length-numoffset]='\0'; @@ -204,7 +204,7 @@ EXTERN int ooQ931Decode ooCallSetCallingPartyNumber(call, number); } else{ - OOTRACEERR3("Error:Calling party number too long. (%s, %s)\n", + OOTRACEERR3("Error:Calling party number too long. (%s, %s)\n", call->callType, call->callToken); } OOTRACEDBGB1(" }\n"); @@ -223,7 +223,7 @@ EXTERN int ooQ931Decode ooCallSetCalledPartyNumber(call, number); } else{ - OOTRACEERR3("Error:Calling party number too long. (%s, %s)\n", + OOTRACEERR3("Error:Calling party number too long. (%s, %s)\n", call->callType, call->callToken); } OOTRACEDBGB1(" }\n"); @@ -252,8 +252,8 @@ EXTERN int ooQ931Decode if (rv != ASN_OK) return rv; } - - /*cisco router sends Q931Notify without UU ie, + + /*cisco router sends Q931Notify without UU ie, we just ignore notify message as of now as handling is optional for end point*/ if(msg->messageType != Q931NotifyMsg && msg->messageType != Q931StatusMsg) @@ -261,7 +261,7 @@ EXTERN int ooQ931Decode return rv; } -EXTERN Q931InformationElement* ooQ931GetIE (const Q931Message* q931msg, +EXTERN Q931InformationElement* ooQ931GetIE (const Q931Message* q931msg, int ieCode) { DListNode* curNode; @@ -373,20 +373,20 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) { printf("Q.931 Message:\n"); printf(" protocolDiscriminator: %u\n", q931msg->protocolDiscriminator); printf(" callReference: %u\n", q931msg->callReference); - printf(" from: %s\n", (q931msg->fromDestination ? + printf(" from: %s\n", (q931msg->fromDestination ? "destination" : "originator")); - printf(" messageType: %s (0x%X)\n\n", - ooQ931GetMessageTypeName(q931msg->messageType, buf), + printf(" messageType: %s (0x%X)\n\n", + ooQ931GetMessageTypeName(q931msg->messageType, buf), q931msg->messageType); for(i = 0, curNode = q931msg->ies.head; i < q931msg->ies.count; i++) { Q931InformationElement *ie = (Q931InformationElement*) curNode->data; int length = (ie->length >= 0) ? ie->length : -ie->length; printf(" IE[%u] (offset 0x%X):\n", i, (unsigned)ie->offset); - printf(" discriminator: %s (0x%X)\n", + printf(" discriminator: %s (0x%X)\n", ooQ931GetIEName(ie->discriminator, buf), (unsigned)ie->discriminator); printf(" data length: %i\n", length); - + curNode = curNode->next; printf("\n"); } @@ -395,9 +395,9 @@ EXTERN void ooQ931Print (const Q931Message* q931msg) { int ooCreateQ931Message(OOCTXT* pctxt, Q931Message **q931msg, int msgType) { /* OOCTXT *pctxt = &gH323ep.msgctxt; */ - + *q931msg = (Q931Message*)memAllocZ(pctxt, sizeof(Q931Message)); - + if(!*q931msg) { OOTRACEERR1("Error:Memory - ooCreateQ931Message - q931msg\n"); @@ -483,7 +483,7 @@ int ooGenerateCallIdentifier(H225CallIdentifier *callid) ASN1INT64 timestamp; int i=0; #ifdef _WIN32 - + SYSTEMTIME systemTime; GetLocalTime(&systemTime); SystemTimeToFileTime(&systemTime, (LPFILETIME)×tamp); @@ -534,7 +534,7 @@ int ooEncodeUUIE(OOCTXT* pctxt, Q931Message *q931msg) OOTRACEERR1("ERROR: Invalid Q931 message in add user-user IE\n"); return OO_FAILED; } - + if(!q931msg->userInfo) { OOTRACEERR1("ERROR: No User-User IE to encode\n"); @@ -542,8 +542,8 @@ int ooEncodeUUIE(OOCTXT* pctxt, Q931Message *q931msg) } setPERBuffer(pctxt, msgbuf, sizeof(msgbuf), aligned); - - if(asn1PE_H225H323_UserInformation (pctxt, + + if(asn1PE_H225H323_UserInformation (pctxt, q931msg->userInfo)==ASN_OK) { OOTRACEDBGC1("UserInfo encoding - successful\n"); @@ -565,11 +565,11 @@ int ooEncodeUUIE(OOCTXT* pctxt, Q931Message *q931msg) ie->discriminator = Q931UserUserIE; ie->length = len; memcpy(ie->data, msgptr, len); - /* Add the user to user IE NOTE: ALL IEs SHOULD BE IN ASCENDING ORDER OF - THEIR DISCRIMINATOR AS PER SPEC. + /* Add the user to user IE NOTE: ALL IEs SHOULD BE IN ASCENDING ORDER OF + THEIR DISCRIMINATOR AS PER SPEC. */ dListInit (&(q931msg->ies)); - if((dListAppend (pctxt, + if((dListAppend (pctxt, &(q931msg->ies), ie)) == NULL) { OOTRACEERR1("Error: Failed to add UUIE in outgoing message\n"); @@ -592,10 +592,10 @@ int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg) OOTRACEERR1("Error: ooDecodeUUIE failed - NULL q931 message\n"); return OO_FAILED; } - + /* Search for UserUser IE */ - for(i = 0, curNode = q931Msg->ies.head; i < q931Msg->ies.count; - i++, curNode = curNode->next) + for(i = 0, curNode = q931Msg->ies.head; i < q931Msg->ies.count; + i++, curNode = curNode->next) { ie = (Q931InformationElement*) curNode->data; if(ie && ie->discriminator == Q931UserUserIE) @@ -606,7 +606,7 @@ int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg) OOTRACEERR1("No UserUser IE found in ooDecodeUUIE\n"); return OO_FAILED; } - + /* Decode user-user ie */ q931Msg->userInfo = (H225H323_UserInformation *) memAlloc(pctxt, sizeof(H225H323_UserInformation)); @@ -630,7 +630,7 @@ int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg) } #ifndef _COMPACT -static void ooQ931PrintMessage +static void ooQ931PrintMessage (OOH323CallData* call, ASN1OCTET *msgbuf, ASN1UINT msglen) { @@ -649,7 +649,7 @@ static void ooQ931PrintMessage ret = ooQ931Decode (call, &q931Msg, msglen, msgbuf, 0); if(ret != OO_OK) { - OOTRACEERR3("Error:Failed decoding Q931 message. (%s, %s)\n", + OOTRACEERR3("Error:Failed decoding Q931 message. (%s, %s)\n", call->callType, call->callToken); } finishPrint(); @@ -660,7 +660,7 @@ static void ooQ931PrintMessage -int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, +int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, char *msgbuf, int size) { int len=0, i=0, j=0, ieLen=0; @@ -683,7 +683,7 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, else if(pq931Msg->messageType == Q931CallProceedingMsg){ msgbuf[i++] = OOCallProceeding; } - else if(pq931Msg->messageType == Q931AlertingMsg || + else if(pq931Msg->messageType == Q931AlertingMsg || pq931Msg->messageType == Q931ProgressMsg){ msgbuf[i++] = OOAlert; } @@ -712,17 +712,17 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, stat = ooEncodeUUIE(call->msgctxt, pq931Msg); if(stat != OO_OK) { - OOTRACEERR3("Error:Failed to encode uuie. (%s, %s)\n", call->callType, + OOTRACEERR3("Error:Failed to encode uuie. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - + msgbuf[i++] = 3; /* TPKT version */ msgbuf[i++] = 0; /* TPKT resevred */ /* 1st octet of length, will be populated once len is determined */ - msgbuf[i++] = 0; + msgbuf[i++] = 0; /* 2nd octet of length, will be populated once len is determined */ - msgbuf[i++] = 0; + msgbuf[i++] = 0; /* Q931 protocol discriminator */ msgbuf[i++] = pq931Msg->protocolDiscriminator; msgbuf[i++] = 2; /* length of call ref is two octets */ @@ -732,22 +732,22 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, else i++; /* fromOriginator*/ - + msgbuf[i++] = pq931Msg->callReference; /* populate 2nd octet */ msgbuf[i++] = pq931Msg->messageType; /* type of q931 message */ /* Note: the order in which ies are added is important. It is in the - ascending order of ie codes. + ascending order of ie codes. */ /* Add bearer IE */ if(pq931Msg->bearerCapabilityIE) - { + { msgbuf[i++] = Q931BearerCapabilityIE; /* ie discriminator */ msgbuf[i++] = pq931Msg->bearerCapabilityIE->length; - memcpy(msgbuf+i, pq931Msg->bearerCapabilityIE->data, + memcpy(msgbuf+i, pq931Msg->bearerCapabilityIE->data, pq931Msg->bearerCapabilityIE->length); i += pq931Msg->bearerCapabilityIE->length; - } + } /* Add cause IE */ if(pq931Msg->causeIE) @@ -756,8 +756,8 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, msgbuf[i++] = pq931Msg->causeIE->length; memcpy(msgbuf+i, pq931Msg->causeIE->data, pq931Msg->causeIE->length); i += pq931Msg->causeIE->length; - } - + } + /* Add progress indicator IE */ if(pq931Msg->messageType == Q931AlertingMsg || pq931Msg->messageType == Q931ProgressMsg) { @@ -797,7 +797,7 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, pq931Msg->calledPartyNumberIE->length); i += pq931Msg->calledPartyNumberIE->length; } - + /* Add keypad ie */ if(pq931Msg->keypadIE) { @@ -814,19 +814,19 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, i += pq931Msg->callstateIE->length; } - /* Note: Have to fix this, though it works. Need to get rid of ie list. + /* Note: Have to fix this, though it works. Need to get rid of ie list. Right now we only put UUIE in ie list. Can be easily removed. */ - for(j = 0, curNode = pq931Msg->ies.head; j < (int)pq931Msg->ies.count; j++) + for(j = 0, curNode = pq931Msg->ies.head; j < (int)pq931Msg->ies.count; j++) { Q931InformationElement *ie = (Q931InformationElement*) curNode->data; - + ieLen = ie->length; /* Add the ie discriminator in message buffer */ - msgbuf[i++] = ie->discriminator; - + msgbuf[i++] = ie->discriminator; + /* For user-user IE, we have to add protocol discriminator */ if (ie->discriminator == Q931UserUserIE) { @@ -838,7 +838,7 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, memcpy((msgbuf + i), ie->data, ieLen); i += ieLen; - + } else { @@ -847,13 +847,13 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, } } // len = i+1-4; /* complete message length */ - + /* Tpkt length octets populated with total length of the message */ if(msgbuf[0] != OOFacility) { len = i-1; - msgbuf[3] = (len >> 8); + msgbuf[3] = (len >> 8); msgbuf[4] = len; /* including tpkt header */ } else{ @@ -861,7 +861,7 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, msgbuf[6] = (len >> 8); msgbuf[7] = len; } - + #ifndef _COMPACT if(msgbuf[0] != OOFacility) ooQ931PrintMessage (call, (unsigned char *)msgbuf+5, len-4); @@ -977,18 +977,18 @@ int ooHandleFastStartChannels(OOH323CallData *pCall) } -int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, +int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, ASN1UINT *fsCount, ASN1DynOctStr **fsElem) { /* OOCTXT *pctxt = &gH323ep.msgctxt; */ - OOCTXT *pctxt = pCall->msgctxt; + OOCTXT *pctxt = pCall->msgctxt; int ret = 0, i=0, j=0, remoteMediaPort=0, remoteMediaControlPort = 0, dir=0; char remoteMediaIP[2+8*4+7], remoteMediaControlIP[2+8*4+7]; DListNode *pNode = NULL; H245OpenLogicalChannel *olc = NULL, printOlc; ooH323EpCapability *epCap = NULL; ASN1DynOctStr *pFS=NULL; - H245H2250LogicalChannelParameters *h2250lcp = NULL; + H245H2250LogicalChannelParameters *h2250lcp = NULL; ooLogicalChannel* pChannel; @@ -1005,26 +1005,26 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, (*fsElem)[k].numocts = pCall->pFastStartRes->elem[k].numocts; pData = (ASN1OCTET*) memAlloc( pctxt, (*fsElem)[k].numocts * sizeof(ASN1OCTET)); - memcpy(pData, - pCall->pFastStartRes->elem[k].data, + memcpy(pData, + pCall->pFastStartRes->elem[k].data, pCall->pFastStartRes->elem[k].numocts); (*fsElem)[k].data = pData; } return ASN_OK; } - - + + /* If fast start supported and remote endpoint has sent faststart element */ - if(OO_TESTFLAG(pCall->flags, OO_M_FASTSTART) && + if(OO_TESTFLAG(pCall->flags, OO_M_FASTSTART) && pCall->remoteFastStartOLCs.count>0) { - pFS = (ASN1DynOctStr*)memAlloc(pctxt, + pFS = (ASN1DynOctStr*)memAlloc(pctxt, pCall->remoteFastStartOLCs.count*sizeof(ASN1DynOctStr)); if(!pFS) { - OOTRACEERR3("Error:Memory - ooSetFastStartResponse - pFS (%s, %s)\n", - pCall->callType, pCall->callToken); + OOTRACEERR3("Error:Memory - ooSetFastStartResponse - pFS (%s, %s)\n", + pCall->callType, pCall->callToken); return OO_FAILED; } memset(pFS, 0, pCall->remoteFastStartOLCs.count*sizeof(ASN1DynOctStr)); @@ -1037,7 +1037,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, olc = (H245OpenLogicalChannel*)pNode->data; /* Don't support both direction channel */ - if(olc->forwardLogicalChannelParameters.dataType.t != + if(olc->forwardLogicalChannelParameters.dataType.t != T_H245DataType_nullData && olc->m.reverseLogicalChannelParametersPresent) { @@ -1047,18 +1047,18 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, } /* Check forward logic channel */ - if(olc->forwardLogicalChannelParameters.dataType.t != + if(olc->forwardLogicalChannelParameters.dataType.t != T_H245DataType_nullData) { /* Forward Channel - remote transmits - local receives */ - OOTRACEDBGC4("Processing received forward olc %d (%s, %s)\n", - olc->forwardLogicalChannelNumber, pCall->callType, + OOTRACEDBGC4("Processing received forward olc %d (%s, %s)\n", + olc->forwardLogicalChannelNumber, pCall->callType, pCall->callToken); dir = OORX; - epCap = ooIsDataTypeSupported(pCall, + epCap = ooIsDataTypeSupported(pCall, &olc->forwardLogicalChannelParameters.dataType, OORX); - + if(!epCap) { continue; } /* Not Supported Channel */ OOTRACEINFO1("Receive Channel data type supported\n"); @@ -1066,8 +1066,8 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", - olc->forwardLogicalChannelNumber, + "channel %d (%s, %s)\n", + olc->forwardLogicalChannelNumber, pCall->callType, pCall->callToken); memFreePtr(pCall->pctxt, epCap); epCap = NULL; @@ -1080,7 +1080,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, { OOTRACEINFO4("Receive channel with sessionID %d already " - "established.(%s, %s)\n", olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters->sessionID, + "established.(%s, %s)\n", olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters->sessionID, pCall->callType, pCall->callToken); memFreePtr(pCall->pctxt, epCap); epCap = NULL; @@ -1090,8 +1090,8 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, /* Extract mediaControlChannel info, if supplied */ if(h2250lcp->m.mediaControlChannelPresent) { - if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, - &h2250lcp->mediaControlChannel, + if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, + &h2250lcp->mediaControlChannel, remoteMediaControlIP, &remoteMediaControlPort)) { OOTRACEERR3("Error: Invalid media control channel address " @@ -1106,11 +1106,11 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, else if(olc->m.reverseLogicalChannelParametersPresent) { /* Reverse channel - remote receives - local transmits */ - OOTRACEDBGC4("Processing received reverse olc %d (%s, %s)\n", - olc->forwardLogicalChannelNumber, pCall->callType, + OOTRACEDBGC4("Processing received reverse olc %d (%s, %s)\n", + olc->forwardLogicalChannelNumber, pCall->callType, pCall->callToken); dir = OOTX; - epCap = ooIsDataTypeSupported(pCall, + epCap = ooIsDataTypeSupported(pCall, &olc->reverseLogicalChannelParameters.dataType, OOTX); @@ -1118,12 +1118,12 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, OOTRACEINFO1("Transmit Channel data type supported\n"); - if(olc->reverseLogicalChannelParameters.multiplexParameters.t != + if(olc->reverseLogicalChannelParameters.multiplexParameters.t != T_H245OpenLogicalChannel_reverseLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) { OOTRACEERR4("ERROR:Unknown multiplex parameter type for " - "channel %d (%s, %s)\n", - olc->forwardLogicalChannelNumber, + "channel %d (%s, %s)\n", + olc->forwardLogicalChannelNumber, pCall->callType, pCall->callToken); memFreePtr(pCall->pctxt, epCap); epCap = NULL; @@ -1141,7 +1141,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, epCap = NULL; continue; } - + /* Extract the remote media endpoint address */ h2250lcp = olc->reverseLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters; if(!h2250lcp) @@ -1153,7 +1153,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, epCap = NULL; return OO_FAILED; } - + /* Reverse Channel info will be always present, crash proof */ if(!h2250lcp->m.mediaChannelPresent) { @@ -1166,8 +1166,8 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, } /* Get IP, PORT of reverse channel */ - if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, - &h2250lcp->mediaChannel, + if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, + &h2250lcp->mediaChannel, remoteMediaIP, &remoteMediaPort)) { OOTRACEERR3("Error: Invalid media channel address " @@ -1180,8 +1180,8 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, /* Extract mediaControlChannel info, if supplied */ if(h2250lcp->m.mediaControlChannelPresent) { - if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, - &h2250lcp->mediaControlChannel, + if(OO_OK != ooGetIpPortFromH245TransportAddress(pCall, + &h2250lcp->mediaControlChannel, remoteMediaControlIP, &remoteMediaControlPort)) { OOTRACEERR3("Error: Invalid media control channel address " @@ -1194,7 +1194,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, } if(dir & OOTX) - { + { /* According to the spec if we are accepting olc for transmission from called endpoint to calling endpoint, called endpoint should insert a unqiue forwardLogicalChannelNumber into olc @@ -1204,28 +1204,28 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, pCall->logicalChanNoCur = pCall->logicalChanNoBase; } - + ooBuildFastStartOLC(pCall, olc, epCap, pctxt, dir); - + pChannel = ooFindLogicalChannelByLogicalChannelNo (pCall, olc->forwardLogicalChannelNumber); - + /* start receive and tramsmit channel listening */ if(dir & OORX) { strcpy(pChannel->remoteIP, remoteMediaControlIP); pChannel->remoteMediaControlPort = remoteMediaControlPort; if(epCap->startReceiveChannel) - { - epCap->startReceiveChannel(pCall, pChannel); - OOTRACEINFO4("Receive channel of type %s started (%s, %s)\n", + { + epCap->startReceiveChannel(pCall, pChannel); + OOTRACEINFO4("Receive channel of type %s started (%s, %s)\n", (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", pCall->callType, pCall->callToken); } else{ OOTRACEERR4("ERROR:No callback registered to start receive %s" - " channel (%s, %s)\n", - (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", + " channel (%s, %s)\n", + (epCap->capType == OO_CAP_TYPE_AUDIO)?"audio":"video", pCall->callType, pCall->callToken); return OO_FAILED; } @@ -1237,15 +1237,15 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, pChannel->remoteMediaControlPort = remoteMediaControlPort; if(epCap->startTransmitChannel) - { - epCap->startTransmitChannel(pCall, pChannel); + { + epCap->startTransmitChannel(pCall, pChannel); OOTRACEINFO3("Transmit channel of type audio started " "(%s, %s)\n", pCall->callType, pCall->callToken); /*OO_SETFLAG (pCall->flags, OO_M_AUDIO);*/ } else{ OOTRACEERR3("ERROR:No callback registered to start transmit" - " audio channel (%s, %s)\n", pCall->callType, + " audio channel (%s, %s)\n", pCall->callType, pCall->callToken); return OO_FAILED; } @@ -1276,7 +1276,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, ret = asn1PD_H245OpenLogicalChannel(pctxt, &(printOlc)); if(ret != ASN_OK) { - OOTRACEERR3("Error: Failed decoding FastStart Element (%s, %s)\n", + OOTRACEERR3("Error: Failed decoding FastStart Element (%s, %s)\n", pCall->callType, pCall->callToken); ooFreeQ931Message(pctxt, pQ931msg); if(pCall->callState < OO_CALL_CLEAR) @@ -1287,7 +1287,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, return OO_FAILED; } finishPrint(); - removeEventHandler(pctxt); + removeEventHandler(pctxt); /* end print call */ olc = NULL; @@ -1302,18 +1302,18 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, ASN1OCTET* pData; //*fsPresent = TRUE; *fsCount = j; - *fsElem = pFS; + *fsElem = pFS; /* save the fast start response for later use in ALERTING, CONNECT */ pCall->pFastStartRes = (FastStartResponse*) memAlloc(pCall->pctxt, sizeof(FastStartResponse)); pCall->pFastStartRes->n = j; - pCall->pFastStartRes->elem = (ASN1DynOctStr*) memAlloc(pCall->pctxt, + pCall->pFastStartRes->elem = (ASN1DynOctStr*) memAlloc(pCall->pctxt, pCall->pFastStartRes->n * sizeof(ASN1DynOctStr)); for(k = 0; k < pCall->pFastStartRes->n; k ++) { pCall->pFastStartRes->elem[k].numocts = (*fsElem)[k].numocts; - pData = (ASN1OCTET*) memAlloc(pCall->pctxt, + pData = (ASN1OCTET*) memAlloc(pCall->pctxt, pCall->pFastStartRes->elem[k].numocts * sizeof(ASN1OCTET)); memcpy(pData, (*fsElem)[k].data, (*fsElem)[k].numocts); pCall->pFastStartRes->elem[k].data = pData; @@ -1321,7 +1321,7 @@ int ooSetFastStartResponse(OOH323CallData *pCall, Q931Message *pQ931msg, } else{ OOTRACEINFO3("None of the faststart elements received in setup can be" - " supported, rejecting faststart.(%s, %s)\n", + " supported, rejecting faststart.(%s, %s)\n", pCall->callType, pCall->callToken); //*fsPresent = FALSE; OO_CLRFLAG(pCall->flags, OO_M_FASTSTART); @@ -1360,23 +1360,23 @@ int ooSendTCSandMSD(OOH323CallData *call) int ooSendCallProceeding(OOH323CallData *call) { - int ret; + int ret; H225VendorIdentifier *vendor; H225CallProceeding_UUIE *callProceeding; Q931Message *q931msg=NULL; /* OOCTXT *pctxt = &gH323ep.msgctxt; */ OOCTXT *pctxt = call->msgctxt; - OOTRACEDBGC3("Building CallProceeding (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building CallProceeding (%s, %s)\n", call->callType, call->callToken); ret = ooCreateQ931Message(pctxt, &q931msg, Q931CallProceedingMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 Call " "Proceeding message\n"); return OO_FAILED; } - + q931msg->callReference = call->callReference; q931msg->userInfo = (H225H323_UserInformation*)memAlloc(pctxt, @@ -1387,12 +1387,12 @@ int ooSendCallProceeding(OOH323CallData *call) return OO_FAILED; } memset (q931msg->userInfo, 0, sizeof(H225H323_UserInformation)); - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG(call->flags, OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG(call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_callProceeding; - + callProceeding = (H225CallProceeding_UUIE*)memAlloc(pctxt, sizeof(H225CallProceeding_UUIE)); if(!callProceeding) @@ -1408,12 +1408,12 @@ int ooSendCallProceeding(OOH323CallData *call) callProceeding->maintainConnection = FALSE; callProceeding->m.callIdentifierPresent = 1; - callProceeding->callIdentifier.guid.numocts = + callProceeding->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(callProceeding->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(callProceeding->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - callProceeding->protocolIdentifier = gProtocolID; + callProceeding->protocolIdentifier = gProtocolID; /* Pose as Terminal or Gateway */ if(gH323ep.isGateway) @@ -1426,26 +1426,26 @@ int ooSendCallProceeding(OOH323CallData *call) if(gH323ep.productID) { vendor->m.productIdPresent = 1; - vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), + vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), sizeof(vendor->productId.data)); - strncpy((char *)vendor->productId.data, gH323ep.productID, + strncpy((char *)vendor->productId.data, gH323ep.productID, vendor->productId.numocts); } if(gH323ep.versionID) { vendor->m.versionIdPresent = 1; - vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), + vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), sizeof(vendor->versionId.data)); - strncpy((char *)vendor->versionId.data, gH323ep.versionID, - vendor->versionId.numocts); + strncpy((char *)vendor->versionId.data, gH323ep.versionID, + vendor->versionId.numocts); } vendor->vendor.t35CountryCode = gH323ep.t35CountryCode; vendor->vendor.t35Extension = gH323ep.t35Extension; vendor->vendor.manufacturerCode = gH323ep.manufacturerCode; - - OOTRACEDBGA3("Built Call Proceeding(%s, %s)\n", call->callType, - call->callToken); + + OOTRACEDBGA3("Built Call Proceeding(%s, %s)\n", call->callType, + call->callToken); ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -1460,7 +1460,7 @@ int ooSendCallProceeding(OOH323CallData *call) int ooSendAlerting(OOH323CallData *call) { - int ret; + int ret; H225Alerting_UUIE *alerting; H225VendorIdentifier *vendor; Q931Message *q931msg=NULL; @@ -1469,7 +1469,7 @@ int ooSendAlerting(OOH323CallData *call) ret = ooCreateQ931Message(pctxt, &q931msg, Q931AlertingMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 " "Alerting message\n"); return OO_FAILED; @@ -1487,13 +1487,13 @@ int ooSendAlerting(OOH323CallData *call) return OO_FAILED; } memset (q931msg->userInfo, 0, sizeof(H225H323_UserInformation)); - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, - OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, + OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_alerting; - - alerting = (H225Alerting_UUIE*)memAlloc(pctxt, + + alerting = (H225Alerting_UUIE*)memAlloc(pctxt, sizeof(H225Alerting_UUIE)); if(!alerting) { @@ -1510,7 +1510,7 @@ int ooSendAlerting(OOH323CallData *call) /*Populate aliases */ alerting->m.alertingAddressPresent = TRUE; if(call->ourAliases) - ret = ooPopulateAliasList(pctxt, call->ourAliases, + ret = ooPopulateAliasList(pctxt, call->ourAliases, &alerting->alertingAddress, 0); else ret = ooPopulateAliasList(pctxt, gH323ep.aliases, @@ -1522,7 +1522,7 @@ int ooSendAlerting(OOH323CallData *call) return OO_FAILED; } alerting->m.presentationIndicatorPresent = TRUE; - alerting->presentationIndicator.t = + alerting->presentationIndicator.t = T_H225PresentationIndicator_presentationAllowed; alerting->m.screeningIndicatorPresent = TRUE; alerting->screeningIndicator = userProvidedNotScreened; @@ -1530,12 +1530,12 @@ int ooSendAlerting(OOH323CallData *call) alerting->m.callIdentifierPresent = 1; - alerting->callIdentifier.guid.numocts = + alerting->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(alerting->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(alerting->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - alerting->protocolIdentifier = gProtocolID; + alerting->protocolIdentifier = gProtocolID; /* Pose as Terminal or Gateway */ if(gH323ep.isGateway) @@ -1548,26 +1548,26 @@ int ooSendAlerting(OOH323CallData *call) if(gH323ep.productID) { vendor->m.productIdPresent = 1; - vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), + vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), sizeof(vendor->productId.data)); - strncpy((char *)vendor->productId.data, gH323ep.productID, + strncpy((char *)vendor->productId.data, gH323ep.productID, vendor->productId.numocts); } if(gH323ep.versionID) { vendor->m.versionIdPresent = 1; - vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), + vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), sizeof(vendor->versionId.data)); - strncpy((char *)vendor->versionId.data, gH323ep.versionID, - vendor->versionId.numocts); + strncpy((char *)vendor->versionId.data, gH323ep.versionID, + vendor->versionId.numocts); } - + vendor->vendor.t35CountryCode = gH323ep.t35CountryCode; vendor->vendor.t35Extension = gH323ep.t35Extension; vendor->vendor.manufacturerCode = gH323ep.manufacturerCode; - + if (!call->fsSent) { - ret = ooSetFastStartResponse(call, q931msg, + ret = ooSetFastStartResponse(call, q931msg, &alerting->fastStart.n, &alerting->fastStart.elem); if(ret != ASN_OK) { return ret; } if(alerting->fastStart.n > 0) { @@ -1580,7 +1580,7 @@ int ooSendAlerting(OOH323CallData *call) } OOTRACEDBGA3("Built Alerting (%s, %s)\n", call->callType, call->callToken); - + ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -1597,7 +1597,7 @@ int ooSendAlerting(OOH323CallData *call) int ooSendProgress(OOH323CallData *call) { - int ret; + int ret; H225Progress_UUIE *progress; H225VendorIdentifier *vendor; Q931Message *q931msg=NULL; @@ -1607,7 +1607,7 @@ int ooSendProgress(OOH323CallData *call) ret = ooCreateQ931Message(pctxt, &q931msg, Q931ProgressMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 " "Alerting message\n"); return OO_FAILED; @@ -1623,13 +1623,13 @@ int ooSendProgress(OOH323CallData *call) return OO_FAILED; } memset (q931msg->userInfo, 0, sizeof(H225H323_UserInformation)); - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, - OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, + OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_progress; - - progress = (H225Progress_UUIE*)memAlloc(pctxt, + + progress = (H225Progress_UUIE*)memAlloc(pctxt, sizeof(H225Progress_UUIE)); if(!progress) { @@ -1643,12 +1643,12 @@ int ooSendProgress(OOH323CallData *call) progress->multipleCalls = FALSE; progress->maintainConnection = FALSE; - progress->callIdentifier.guid.numocts = + progress->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(progress->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(progress->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - progress->protocolIdentifier = gProtocolID; + progress->protocolIdentifier = gProtocolID; /* Pose as Terminal or Gateway */ if(gH323ep.isGateway) @@ -1661,26 +1661,26 @@ int ooSendProgress(OOH323CallData *call) if(gH323ep.productID) { vendor->m.productIdPresent = 1; - vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), + vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), sizeof(vendor->productId.data)); - strncpy((char *)vendor->productId.data, gH323ep.productID, + strncpy((char *)vendor->productId.data, gH323ep.productID, vendor->productId.numocts); } if(gH323ep.versionID) { vendor->m.versionIdPresent = 1; - vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), + vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), sizeof(vendor->versionId.data)); - strncpy((char *)vendor->versionId.data, gH323ep.versionID, - vendor->versionId.numocts); + strncpy((char *)vendor->versionId.data, gH323ep.versionID, + vendor->versionId.numocts); } - + vendor->vendor.t35CountryCode = gH323ep.t35CountryCode; vendor->vendor.t35Extension = gH323ep.t35Extension; vendor->vendor.manufacturerCode = gH323ep.manufacturerCode; - + if (!call->fsSent) { - ret = ooSetFastStartResponse(call, q931msg, + ret = ooSetFastStartResponse(call, q931msg, &progress->fastStart.n, &progress->fastStart.elem); if(ret != ASN_OK) { return ret; } if(progress->fastStart.n > 0) { @@ -1694,7 +1694,7 @@ int ooSendProgress(OOH323CallData *call) /* Add h245 listener address. Do not add H245 listener address in case of tunneling. */ - if (/* (!OO_TESTFLAG(call->flags, OO_M_FASTSTART) || + if (/* (!OO_TESTFLAG(call->flags, OO_M_FASTSTART) || call->remoteFastStartOLCs.count == 0) && */ !OO_TESTFLAG (call->flags, OO_M_TUNNELING) && !call->h245listener && ooCreateH245Listener(call) == OO_OK) @@ -1702,7 +1702,7 @@ int ooSendProgress(OOH323CallData *call) if (call->versionIP == 6) { progress->m.h245AddressPresent = TRUE; progress->h245Address.t = T_H225TransportAddress_ip6Address; - + h245Ip6Addr = (H225TransportAddress_ip6Address*) memAllocZ (pctxt, sizeof(H225TransportAddress_ip6Address)); if(!h245Ip6Addr) @@ -1718,7 +1718,7 @@ int ooSendProgress(OOH323CallData *call) } else { progress->m.h245AddressPresent = TRUE; progress->h245Address.t = T_H225TransportAddress_ipAddress; - + h245IpAddr = (H225TransportAddress_ipAddress*) memAllocZ (pctxt, sizeof(H225TransportAddress_ipAddress)); if(!h245IpAddr) @@ -1735,7 +1735,7 @@ int ooSendProgress(OOH323CallData *call) } OOTRACEDBGA3("Built Progress (%s, %s)\n", call->callType, call->callToken); - + ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -1860,20 +1860,20 @@ int ooSendStartH245Facility(OOH323CallData *call) sizeof(H225H323_UserInformation)); if(!pQ931Msg->userInfo) { - OOTRACEERR3("ERROR:Memory - ooSendFacility - userInfo(%s, %s)\n", + OOTRACEERR3("ERROR:Memory - ooSendFacility - userInfo(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } memset (pQ931Msg->userInfo, 0, sizeof(H225H323_UserInformation)); - pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG (call->flags, OO_M_TUNNELING); + pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG (call->flags, OO_M_TUNNELING); - pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = + pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_facility; - - facility = (H225Facility_UUIE*) + + facility = (H225Facility_UUIE*) memAllocZ (pctxt, sizeof(H225Facility_UUIE)); if(!facility) @@ -1886,12 +1886,12 @@ int ooSendStartH245Facility(OOH323CallData *call) pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.u.facility = facility; /* Populate Facility UUIE */ - facility->protocolIdentifier = gProtocolID; + facility->protocolIdentifier = gProtocolID; facility->m.callIdentifierPresent = 1; - facility->callIdentifier.guid.numocts = + facility->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(facility->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(facility->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); facility->reason.t = T_H225FacilityReason_startH245; @@ -1953,22 +1953,22 @@ int ooSendStartH245Facility(OOH323CallData *call) int ooSendStatus(OOH323CallData *call) { - int ret; + int ret; H225Status_UUIE *status; Q931Message *q931msg=NULL; /* OOCTXT *pctxt = &gH323ep.msgctxt; */ OOCTXT *pctxt = call->msgctxt; - OOTRACEDBGC3("Building StatusMsg (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building StatusMsg (%s, %s)\n", call->callType, call->callToken); ret = ooCreateQ931Message(pctxt, &q931msg, Q931StatusMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 Status " "message\n"); return OO_FAILED; } - + q931msg->callReference = call->callReference; q931msg->userInfo = (H225H323_UserInformation*)memAllocZ(pctxt, @@ -1978,12 +1978,12 @@ int ooSendStatus(OOH323CallData *call) OOTRACEERR1("ERROR:Memory - ooSendStatus - userInfo\n"); return OO_FAILED; } - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG(call->flags, OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG(call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_status; - + status = (H225Status_UUIE*)memAllocZ(pctxt, sizeof(H225Status_UUIE)); if(!status) @@ -1993,18 +1993,18 @@ int ooSendStatus(OOH323CallData *call) } q931msg->userInfo->h323_uu_pdu.h323_message_body.u.status = status; - status->callIdentifier.guid.numocts = + status->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(status->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(status->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - status->protocolIdentifier = gProtocolID; + status->protocolIdentifier = gProtocolID; ooQ931SetCauseIE(pctxt, q931msg, Q931StatusEnquiryResponse, 0, 0); ooQ931SetCallStateIE(pctxt, q931msg, 10); - OOTRACEDBGA3("Built Status (%s, %s)\n", call->callType, - call->callToken); + OOTRACEDBGA3("Built Status (%s, %s)\n", call->callType, + call->callToken); ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -2019,22 +2019,22 @@ int ooSendStatus(OOH323CallData *call) int ooSendStatusInquiry(OOH323CallData *call) { - int ret; + int ret; H225StatusInquiry_UUIE *statusInq; Q931Message *q931msg=NULL; /* OOCTXT *pctxt = &gH323ep.msgctxt; */ OOCTXT *pctxt = call->msgctxt; - OOTRACEDBGC3("Building StatusInquryMsg (%s, %s)\n", call->callType, + OOTRACEDBGC3("Building StatusInquryMsg (%s, %s)\n", call->callType, call->callToken); ret = ooCreateQ931Message(pctxt, &q931msg, Q931StatusEnquiryMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 Status " "message\n"); return OO_FAILED; } - + q931msg->callReference = call->callReference; q931msg->userInfo = (H225H323_UserInformation*)memAllocZ(pctxt, @@ -2044,12 +2044,12 @@ int ooSendStatusInquiry(OOH323CallData *call) OOTRACEERR1("ERROR:Memory - ooSendStatus - userInfo\n"); return OO_FAILED; } - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG(call->flags, OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG(call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_statusInquiry; - + statusInq = (H225StatusInquiry_UUIE*)memAllocZ(pctxt, sizeof(H225StatusInquiry_UUIE)); if(!statusInq) @@ -2059,15 +2059,15 @@ int ooSendStatusInquiry(OOH323CallData *call) } q931msg->userInfo->h323_uu_pdu.h323_message_body.u.statusInquiry = statusInq; - statusInq->callIdentifier.guid.numocts = + statusInq->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(statusInq->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(statusInq->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - statusInq->protocolIdentifier = gProtocolID; + statusInq->protocolIdentifier = gProtocolID; - OOTRACEDBGA3("Built StatusInquiry (%s, %s)\n", call->callType, - call->callToken); + OOTRACEDBGA3("Built StatusInquiry (%s, %s)\n", call->callType, + call->callToken); ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -2081,7 +2081,7 @@ int ooSendStatusInquiry(OOH323CallData *call) } int ooSendReleaseComplete(OOH323CallData *call) { - int ret; + int ret; Q931Message *q931msg=NULL; H225ReleaseComplete_UUIE *releaseComplete; enum Q931CauseValues cause = Q931ErrorInCauseIE; @@ -2093,7 +2093,7 @@ int ooSendReleaseComplete(OOH323CallData *call) call->callType, call->callToken); ret = ooCreateQ931Message(pctxt, &q931msg, Q931ReleaseCompleteMsg); if(ret != OO_OK) - { + { OOTRACEERR3("Error: In ooCreateQ931Message - H225 Release Complete " "message(%s, %s)\n", call->callType, call->callToken); if(call->callState < OO_CALL_CLEAR) @@ -2124,38 +2124,38 @@ int ooSendReleaseComplete(OOH323CallData *call) return OO_FAILED; } memset(releaseComplete, 0, sizeof(H225ReleaseComplete_UUIE)); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_releaseComplete; - + /* Get cause value and h225 reason code corresponding to OOCallClearReason*/ - ooQ931GetCauseAndReasonCodeFromCallClearReason(call->callEndReason, + ooQ931GetCauseAndReasonCodeFromCallClearReason(call->callEndReason, &cause, &h225ReasonCode); if (call->q931cause == 0) call->q931cause = cause; /* Set Cause IE */ ooQ931SetCauseIE(pctxt, q931msg, call->q931cause, 0, 0); - + /* Set H225 releaseComplete reasonCode */ releaseComplete->m.reasonPresent = TRUE; releaseComplete->reason.t = h225ReasonCode; /* Add user-user ie */ - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_releaseComplete; - - q931msg->userInfo->h323_uu_pdu.h323_message_body.u.releaseComplete = + + q931msg->userInfo->h323_uu_pdu.h323_message_body.u.releaseComplete = releaseComplete; releaseComplete->m.callIdentifierPresent = 1; releaseComplete->protocolIdentifier = gProtocolID; - releaseComplete->callIdentifier.guid.numocts = + releaseComplete->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(releaseComplete->callIdentifier.guid.data, + memcpy(releaseComplete->callIdentifier.guid.data, call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); OOTRACEDBGA3("Built Release Complete message (%s, %s)\n", call->callType, call->callToken); - /* Send H225 message */ + /* Send H225 message */ ret = ooSendH225Msg(call, q931msg); if(ret != OO_OK) { @@ -2193,11 +2193,11 @@ int ooAcceptCall(OOH323CallData *call) H225VendorIdentifier *vendor; Q931Message *q931msg=NULL; /* OOCTXT *pctxt = &gH323ep.msgctxt; */ - OOCTXT *pctxt = call->msgctxt; + OOCTXT *pctxt = call->msgctxt; ret = ooCreateQ931Message(pctxt, &q931msg, Q931ConnectMsg); if(ret != OO_OK) - { + { OOTRACEERR1("Error: In allocating memory for - H225 " "Connect message\n"); return OO_FAILED; @@ -2205,7 +2205,7 @@ int ooAcceptCall(OOH323CallData *call) q931msg->callReference = call->callReference; /* Set bearer capability */ - if(OO_OK != ooSetBearerCapabilityIE(pctxt, q931msg, Q931CCITTStd, + if(OO_OK != ooSetBearerCapabilityIE(pctxt, q931msg, Q931CCITTStd, // Q931TransferUnrestrictedDigital, Q931TransferPacketMode, // Q931TransferRatePacketMode, Q931UserInfoLayer1G722G725)) Q931TransferSpeech, Q931TransferCircuitMode, @@ -2223,16 +2223,16 @@ int ooAcceptCall(OOH323CallData *call) { OOTRACEERR1("ERROR:Memory - ooAcceptCall - userInfo\n"); return OO_FAILED; - } + } - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=TRUE; + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=TRUE; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG (call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG (call->flags, OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_connect; - + connect = (H225Connect_UUIE*) memAllocZ (pctxt, sizeof(H225Connect_UUIE)); @@ -2248,28 +2248,28 @@ int ooAcceptCall(OOH323CallData *call) connect->m.maintainConnectionPresent = 1; connect->multipleCalls = FALSE; connect->maintainConnection = FALSE; - - + + connect->conferenceID.numocts = 16; for (i = 0; i < 16; i++) connect->conferenceID.data[i] = i + 1; connect->m.callIdentifierPresent = 1; - connect->callIdentifier.guid.numocts = + connect->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(connect->callIdentifier.guid.data, call->callIdentifier.guid.data, + memcpy(connect->callIdentifier.guid.data, call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - + connect->conferenceID.numocts = call->confIdentifier.numocts; memcpy(connect->conferenceID.data, call->confIdentifier.data, call->confIdentifier.numocts); /* Populate alias addresses */ connect->m.connectedAddressPresent = TRUE; if(call->ourAliases) - ret = ooPopulateAliasList(pctxt, call->ourAliases, + ret = ooPopulateAliasList(pctxt, call->ourAliases, &connect->connectedAddress, 0); else - ret = ooPopulateAliasList(pctxt, gH323ep.aliases, + ret = ooPopulateAliasList(pctxt, gH323ep.aliases, &connect->connectedAddress, 0); if(OO_OK != ret) { @@ -2278,12 +2278,12 @@ int ooAcceptCall(OOH323CallData *call) return OO_FAILED; } connect->m.presentationIndicatorPresent = TRUE; - connect->presentationIndicator.t = + connect->presentationIndicator.t = T_H225PresentationIndicator_presentationAllowed; connect->m.screeningIndicatorPresent = TRUE; connect->screeningIndicator = userProvidedNotScreened; - connect->protocolIdentifier = gProtocolID; + connect->protocolIdentifier = gProtocolID; /* Pose as Terminal or Gateway */ if(gH323ep.isGateway) @@ -2291,32 +2291,32 @@ int ooAcceptCall(OOH323CallData *call) else connect->destinationInfo.m.terminalPresent = TRUE; - + connect->destinationInfo.m.vendorPresent = 1; vendor = &connect->destinationInfo.vendor; - + vendor->vendor.t35CountryCode = gH323ep.t35CountryCode; vendor->vendor.t35Extension = gH323ep.t35Extension; vendor->vendor.manufacturerCode = gH323ep.manufacturerCode; if(gH323ep.productID) { vendor->m.productIdPresent = 1; - vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), + vendor->productId.numocts = ASN1MIN(strlen(gH323ep.productID), sizeof(vendor->productId.data)); - strncpy((char *)vendor->productId.data, gH323ep.productID, + strncpy((char *)vendor->productId.data, gH323ep.productID, vendor->productId.numocts); } if(gH323ep.versionID) { vendor->m.versionIdPresent = 1; - vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), + vendor->versionId.numocts = ASN1MIN(strlen(gH323ep.versionID), sizeof(vendor->versionId.data)); - strncpy((char *)vendor->versionId.data, gH323ep.versionID, - vendor->versionId.numocts); + strncpy((char *)vendor->versionId.data, gH323ep.versionID, + vendor->versionId.numocts); } if (!call->fsSent) { - ret = ooSetFastStartResponse(call, q931msg, + ret = ooSetFastStartResponse(call, q931msg, &connect->fastStart.n, &connect->fastStart.elem); if(ret != ASN_OK) { return ret; } if(connect->fastStart.n > 0) { @@ -2345,7 +2345,7 @@ int ooAcceptCall(OOH323CallData *call) of fast-start. why? */ /* May 20110205 */ /* Send h245 listener addr any case if H245 connection isn't established */ - if (/* (!OO_TESTFLAG(call->flags, OO_M_FASTSTART) || + if (/* (!OO_TESTFLAG(call->flags, OO_M_FASTSTART) || call->remoteFastStartOLCs.count == 0) && */ !OO_TESTFLAG (call->flags, OO_M_TUNNELING) && ( (!call->h245listener && ooCreateH245Listener(call) == OO_OK) || @@ -2354,7 +2354,7 @@ int ooAcceptCall(OOH323CallData *call) connect->m.h245AddressPresent = TRUE; if (call->versionIP == 6) { connect->h245Address.t = T_H225TransportAddress_ip6Address; - + h245Ip6Addr = (H225TransportAddress_ip6Address*) memAllocZ (pctxt, sizeof(H225TransportAddress_ip6Address)); if(!h245Ip6Addr) @@ -2369,7 +2369,7 @@ int ooAcceptCall(OOH323CallData *call) connect->h245Address.u.ip6Address = h245Ip6Addr; } else { connect->h245Address.t = T_H225TransportAddress_ipAddress; - + h245IpAddr = (H225TransportAddress_ipAddress*) memAllocZ (pctxt, sizeof(H225TransportAddress_ipAddress)); if(!h245IpAddr) @@ -2405,7 +2405,7 @@ int ooAcceptCall(OOH323CallData *call) memReset(call->msgctxt); call->callState = OO_CALL_CONNECTED; - + if (call->rtdrCount > 0 && call->rtdrInterval > 0) { return ooSendRoundTripDelayRequest(call); } @@ -2433,7 +2433,7 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call) strcpy(fwdedCall->remoteIP, call->pCallFwdData->ip); } fwdedCall->remotePort = call->pCallFwdData->port; - + if(call->pCallFwdData->aliases) { alias = call->pCallFwdData->aliases; @@ -2465,7 +2465,7 @@ int ooH323HandleCallFwdRequest(OOH323CallData *call) for (i = 0; i < 16; i++) { fwdedCall->confIdentifier.data[i] = irand++; } - + if(gH323ep.gkClient && !OO_TESTFLAG(fwdedCall->flags, OO_M_DISABLEGK)) { @@ -2569,7 +2569,7 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts) ooCleanCall(call); return OO_FAILED; } - + /* Check whether we have ip address */ if(!ooUtilsIsStrEmpty(tmp)) { ip = tmp; @@ -2593,7 +2593,7 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts) for (i = 0; i < 16; i++) { call->confIdentifier.data[i] = irand++; } - + if(gH323ep.gkClient && !OO_TESTFLAG(call->flags, OO_M_DISABLEGK)) { @@ -2635,19 +2635,19 @@ int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts) int ooH323CallAdmitted(OOH323CallData *call) { int ret=0; - + if(!call) { /* Call not supplied. Must locate it in list */ OOTRACEERR1("ERROR: Invalid call parameter to ooH323CallAdmitted"); - return OO_FAILED; + return OO_FAILED; } if(!strcmp(call->callType, "outgoing")) { ret = ooCreateH225Connection(call); if(ret != OO_OK) { - OOTRACEERR3("ERROR:Failed to create H225 connection to %s:%d\n", + OOTRACEERR3("ERROR:Failed to create H225 connection to %s:%d\n", call->remoteIP, call->remotePort); if(call->callState< OO_CALL_CLEAR) { @@ -2660,7 +2660,7 @@ int ooH323CallAdmitted(OOH323CallData *call) if(gH323ep.h323Callbacks.onOutgoingCall) { /* Outgoing call callback function */ if (gH323ep.h323Callbacks.onOutgoingCall(call) != OO_OK) { - OOTRACEERR3("ERROR:Failed to setup media to (%s,%d)\n", + OOTRACEERR3("ERROR:Failed to setup media to (%s,%d)\n", call->callType, call->callToken); if(call->callState< OO_CALL_CLEAR) { @@ -2670,10 +2670,10 @@ int ooH323CallAdmitted(OOH323CallData *call) return OO_FAILED; } } - + ret = ooH323MakeCall_helper(call); - } - else { + } + else { /* incoming call */ if(gH323ep.h323Callbacks.onIncomingCall) { /* Incoming call callback function */ @@ -2690,7 +2690,7 @@ int ooH323CallAdmitted(OOH323CallData *call) } } } - + return OO_OK; } @@ -2711,7 +2711,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) /* pctxt = &gH323ep.msgctxt; */ pctxt = call->msgctxt; - + ret = ooCreateQ931Message(pctxt, &q931msg, Q931SetupMsg); if(ret != OO_OK) { @@ -2722,7 +2722,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) q931msg->callReference = call->callReference; /* Set bearer capability */ - if(OO_OK != ooSetBearerCapabilityIE(pctxt, q931msg, Q931CCITTStd, + if(OO_OK != ooSetBearerCapabilityIE(pctxt, q931msg, Q931CCITTStd, // Q931TransferUnrestrictedDigital, Q931TransferPacketMode, call->transfercap, Q931TransferCircuitMode, // Q931TransferRatePacketMode, Q931UserInfoLayer1G722G725)) @@ -2737,11 +2737,11 @@ int ooH323MakeCall_helper(OOH323CallData *call) if(call->callingPartyNumber && call->callingPartyNumber[0]) ooQ931SetCallingPartyNumberIE(pctxt, q931msg, (const char*)call->callingPartyNumber, 1, 0, 0, 0); - + /* Set called party number Q931 IE */ if(call->calledPartyNumber) - ooQ931SetCalledPartyNumberIE(pctxt, q931msg, + ooQ931SetCalledPartyNumberIE(pctxt, q931msg, (const char*)call->calledPartyNumber, 1, 0); else if(call->remoteAliases) { pAlias = call->remoteAliases; @@ -2752,17 +2752,17 @@ int ooH323MakeCall_helper(OOH323CallData *call) } if(pAlias) { - call->calledPartyNumber = (char*)memAlloc(call->pctxt, + call->calledPartyNumber = (char*)memAlloc(call->pctxt, strlen(pAlias->value)+1); if(!call->calledPartyNumber) { OOTRACEERR3("Error:Memory - ooH323MakeCall_helper - " - "calledPartyNumber(%s, %s)\n", call->callType, + "calledPartyNumber(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } strcpy(call->calledPartyNumber, pAlias->value); - ooQ931SetCalledPartyNumberIE(pctxt, q931msg, + ooQ931SetCalledPartyNumberIE(pctxt, q931msg, (const char*)call->calledPartyNumber, 1, 0); } @@ -2786,17 +2786,17 @@ int ooH323MakeCall_helper(OOH323CallData *call) } memset (setup, 0, sizeof(H225Setup_UUIE)); setup->protocolIdentifier = gProtocolID; - + /* Populate Alias Address.*/ if(call->ourAliases || gH323ep.aliases) - { + { setup->m.sourceAddressPresent = TRUE; if(call->ourAliases) - ret = ooPopulateAliasList(pctxt, call->ourAliases, + ret = ooPopulateAliasList(pctxt, call->ourAliases, &setup->sourceAddress, 0); else if(gH323ep.aliases) - ret = ooPopulateAliasList(pctxt, gH323ep.aliases, + ret = ooPopulateAliasList(pctxt, gH323ep.aliases, &setup->sourceAddress, 0); if(OO_OK != ret) { @@ -2807,7 +2807,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) } setup->m.presentationIndicatorPresent = TRUE; - setup->presentationIndicator.t = + setup->presentationIndicator.t = T_H225PresentationIndicator_presentationAllowed; setup->m.screeningIndicatorPresent = TRUE; setup->screeningIndicator = userProvidedNotScreened; @@ -2821,7 +2821,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) if(call->remoteAliases) { setup->m.destinationAddressPresent = TRUE; - ret = ooPopulateAliasList(pctxt, call->remoteAliases, + ret = ooPopulateAliasList(pctxt, call->remoteAliases, &setup->destinationAddress, 0); if(OO_OK != ret) { @@ -2842,31 +2842,31 @@ int ooH323MakeCall_helper(OOH323CallData *call) setup->sourceInfo.vendor.vendor.t35CountryCode = gH323ep.t35CountryCode; setup->sourceInfo.vendor.vendor.t35Extension = gH323ep.t35Extension; setup->sourceInfo.vendor.vendor.manufacturerCode= gH323ep.manufacturerCode; - + if(gH323ep.productID) { setup->sourceInfo.vendor.m.productIdPresent=TRUE; setup->sourceInfo.vendor.productId.numocts = ASN1MIN( - strlen(gH323ep.productID), + strlen(gH323ep.productID), sizeof(setup->sourceInfo.vendor.productId.data)); - strncpy((char*)setup->sourceInfo.vendor.productId.data, + strncpy((char*)setup->sourceInfo.vendor.productId.data, gH323ep.productID, setup->sourceInfo.vendor.productId.numocts); } else setup->sourceInfo.vendor.m.productIdPresent=FALSE; - + if(gH323ep.versionID) { setup->sourceInfo.vendor.m.versionIdPresent=TRUE; setup->sourceInfo.vendor.versionId.numocts = ASN1MIN( - strlen(gH323ep.versionID), + strlen(gH323ep.versionID), sizeof(setup->sourceInfo.vendor.versionId.data)); - strncpy((char*)setup->sourceInfo.vendor.versionId.data, + strncpy((char*)setup->sourceInfo.vendor.versionId.data, gH323ep.versionID, setup->sourceInfo.vendor.versionId.numocts); } else setup->sourceInfo.vendor.m.versionIdPresent=FALSE; - + setup->sourceInfo.mc = FALSE; setup->sourceInfo.undefinedNode = FALSE; @@ -2880,7 +2880,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) if(!destCallSignalIp6Address) { OOTRACEERR3("Error:Memory - ooH323MakeCall_helper - " - "destCallSignal6Address. (%s, %s)\n", call->callType, + "destCallSignal6Address. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -2897,7 +2897,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) if(!destCallSignalIpAddress) { OOTRACEERR3("Error:Memory - ooH323MakeCall_helper - " - "destCallSignalAddress. (%s, %s)\n", call->callType, + "destCallSignalAddress. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -2963,19 +2963,19 @@ int ooH323MakeCall_helper(OOH323CallData *call) for(k=0; k< call->capPrefs.index; k++) { OOTRACEDBGC5("Preffered capability at index %d is %s. (%s, %s)\n", - k, ooGetCapTypeText(call->capPrefs.order[k]), + k, ooGetCapTypeText(call->capPrefs.order[k]), call->callType, call->callToken); if(call->ourCaps) { epCap = call->ourCaps; OOTRACEDBGC3("Using call specific capabilities in faststart of " - "setup message. (%s, %s)\n", call->callType, + "setup message. (%s, %s)\n", call->callType, call->callToken); } else{ epCap = gH323ep.myCaps; OOTRACEDBGC3("Using end-point capabilities for faststart of setup" - "message. (%s, %s)\n", call->callType, + "message. (%s, %s)\n", call->callType, call->callToken); } @@ -2986,8 +2986,8 @@ int ooH323MakeCall_helper(OOH323CallData *call) if(!epCap) { OOTRACEWARN4("Warn:Preferred capability %s is abscent in " - "capability list. (%s, %s)\n", - ooGetCapTypeText(call->capPrefs.order[k]), + "capability list. (%s, %s)\n", + ooGetCapTypeText(call->capPrefs.order[k]), call->callType, call->callToken); continue; } @@ -2997,12 +2997,12 @@ int ooH323MakeCall_helper(OOH323CallData *call) if (epCap->capType == OO_CAP_TYPE_DATA) continue; - OOTRACEDBGC4("Building olcs with capability %s. (%s, %s)\n", - ooGetCapTypeText(epCap->cap), call->callType, + OOTRACEDBGC4("Building olcs with capability %s. (%s, %s)\n", + ooGetCapTypeText(epCap->cap), call->callType, call->callToken); if(epCap->dir & OORX) { - olc = (H245OpenLogicalChannel*)memAlloc(pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -3017,10 +3017,10 @@ int ooH323MakeCall_helper(OOH323CallData *call) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - olc->forwardLogicalChannelNumber = call->logicalChanNoCur++; + olc->forwardLogicalChannelNumber = call->logicalChanNoCur++; if(call->logicalChanNoCur > call->logicalChanNoMax) call->logicalChanNoCur = call->logicalChanNoBase; - + ooBuildFastStartOLC(call, olc, epCap, pctxt, OORX); /* Do not specify msg buffer let automatic allocation work */ setPERBuffer(pctxt, NULL, 0, aligned); @@ -3058,19 +3058,19 @@ int ooH323MakeCall_helper(OOH323CallData *call) return OO_FAILED; } finishPrint(); - removeEventHandler(pctxt); + removeEventHandler(pctxt); olc = NULL; i++; OOTRACEDBGC5("Added RX fs element %d with capability %s(%s, %s)\n", - i, ooGetCapTypeText(epCap->cap), call->callType, + i, ooGetCapTypeText(epCap->cap), call->callType, call->callToken); } if(epCap->dir & OOTX) { - olc = (H245OpenLogicalChannel*)memAlloc(pctxt, + olc = (H245OpenLogicalChannel*)memAlloc(pctxt, sizeof(H245OpenLogicalChannel)); if(!olc) { @@ -3085,10 +3085,10 @@ int ooH323MakeCall_helper(OOH323CallData *call) return OO_FAILED; } memset(olc, 0, sizeof(H245OpenLogicalChannel)); - olc->forwardLogicalChannelNumber = call->logicalChanNoCur++; + olc->forwardLogicalChannelNumber = call->logicalChanNoCur++; if(call->logicalChanNoCur > call->logicalChanNoMax) call->logicalChanNoCur = call->logicalChanNoBase; - + ooBuildFastStartOLC(call, olc, epCap, pctxt, OOTX); /* Do not specify msg buffer let automatic allocation work */ setPERBuffer(pctxt, NULL, 0, aligned); @@ -3125,13 +3125,13 @@ int ooH323MakeCall_helper(OOH323CallData *call) return OO_FAILED; } finishPrint(); - removeEventHandler(pctxt); + removeEventHandler(pctxt); olc = NULL; i++; OOTRACEDBGC5("Added TX fs element %d with capability %s(%s, %s)\n", - i, ooGetCapTypeText(epCap->cap), call->callType, + i, ooGetCapTypeText(epCap->cap), call->callType, call->callToken); } @@ -3139,7 +3139,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) OOTRACEDBGA4("Added %d fast start elements to SETUP message (%s, %s)\n", i, call->callType, call->callToken); setup->fastStart.n = i; - setup->fastStart.elem = pFS; + setup->fastStart.elem = pFS; } setup->conferenceID.numocts= call->confIdentifier.numocts; @@ -3149,14 +3149,14 @@ int ooH323MakeCall_helper(OOH323CallData *call) setup->conferenceGoal.t = T_H225Setup_UUIE_conferenceGoal_create; /* H.225 point to point call */ setup->callType.t = T_H225CallType_pointToPoint; - + /* Populate optional fields */ setup->m.callIdentifierPresent = TRUE; /*ooGenerateCallIdentifier(&setup->callIdentifier);*/ setup->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(setup->callIdentifier.guid.data, call->callIdentifier.guid.data, + memcpy(setup->callIdentifier.guid.data, call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); - + setup->m.mediaWaitForConnectPresent = TRUE; if(OO_TESTFLAG(call->flags, OO_M_MEDIAWAITFORCONN)) { setup->mediaWaitForConnect = TRUE; @@ -3167,24 +3167,24 @@ int ooH323MakeCall_helper(OOH323CallData *call) setup->m.canOverlapSendPresent = TRUE; setup->canOverlapSend = FALSE; - /* Populate the userInfo structure with the setup UUIE */ - - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + /* Populate the userInfo structure with the setup UUIE */ + + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_setup; q931msg->userInfo->h323_uu_pdu.h323_message_body.u.setup = setup; - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - - q931msg->userInfo->h323_uu_pdu.h245Tunneling = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + + q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG (call->flags, OO_M_TUNNELING); - /* For H.323 version 4 and higher, if fast connect, tunneling should be + /* For H.323 version 4 and higher, if fast connect, tunneling should be supported. why? */ - OOTRACEDBGA3("Built SETUP message (%s, %s)\n", call->callType, + OOTRACEDBGA3("Built SETUP message (%s, %s)\n", call->callType, call->callToken); - + /* H225 message callback */ if(gH323ep.h225Callbacks.onBuiltSetup) gH323ep.h225Callbacks.onBuiltSetup(call, q931msg); @@ -3204,7 +3204,7 @@ int ooH323MakeCall_helper(OOH323CallData *call) int ooQ931SendDTMFAsKeyPadIE(OOH323CallData *call, const char* data) { - int ret; + int ret; H225Information_UUIE *information=NULL; Q931Message *q931msg=NULL; /* OOCTXT *pctxt = &gH323ep.msgctxt; */ @@ -3212,7 +3212,7 @@ int ooQ931SendDTMFAsKeyPadIE(OOH323CallData *call, const char* data) ret = ooCreateQ931Message(pctxt, &q931msg, Q931InformationMsg); if(ret != OO_OK) - { + { OOTRACEERR3("Error: In allocating memory for - H225 Information message." "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; @@ -3230,13 +3230,13 @@ int ooQ931SendDTMFAsKeyPadIE(OOH323CallData *call, const char* data) memReset(call->msgctxt); return OO_FAILED; } - q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, - OO_M_TUNNELING); - q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG(call->flags, + OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_information; - - information = (H225Information_UUIE*)memAllocZ(pctxt, + + information = (H225Information_UUIE*)memAllocZ(pctxt, sizeof(H225Information_UUIE)); if(!information) { @@ -3246,21 +3246,21 @@ int ooQ931SendDTMFAsKeyPadIE(OOH323CallData *call, const char* data) memReset(call->msgctxt); return OO_FAILED; } - q931msg->userInfo->h323_uu_pdu.h323_message_body.u.information = - information; + q931msg->userInfo->h323_uu_pdu.h323_message_body.u.information = + information; information->m.callIdentifierPresent = 1; - information->callIdentifier.guid.numocts = + information->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(information->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(information->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); information->protocolIdentifier = gProtocolID; - + /*Add keypad IE*/ ret = ooQ931SetKeypadIE(pctxt, q931msg, data); if(ret != OO_OK) { - OOTRACEERR3("Error:Creating keypad IE for (%s, %s)\n", call->callType, + OOTRACEERR3("Error:Creating keypad IE for (%s, %s)\n", call->callType, call->callToken); /* memReset(&gH323ep.msgctxt); */ memReset(call->msgctxt); @@ -3297,9 +3297,9 @@ int ooH323ForwardCall(char* callToken, char *dest) OOTRACEERR2("ERROR: Invalid call token for forward - %s\n", callToken); return OO_FAILED; } - OOTRACEDBGA3("Building Facility message for call forward (%s, %s)\n", + OOTRACEDBGA3("Building Facility message for call forward (%s, %s)\n", call->callType, call->callToken); - call->pCallFwdData = (OOCallFwdData*)memAllocZ(call->pctxt, + call->pCallFwdData = (OOCallFwdData*)memAllocZ(call->pctxt, sizeof(OOCallFwdData)); if(!call->pCallFwdData) { @@ -3308,7 +3308,7 @@ int ooH323ForwardCall(char* callToken, char *dest) return OO_FAILED; } - ret = ooParseDestination(call, dest, ip, 2+8*4+7, + ret = ooParseDestination(call, dest, ip, 2+8*4+7, &call->pCallFwdData->aliases); if(ret != OO_OK) { @@ -3345,20 +3345,20 @@ int ooH323ForwardCall(char* callToken, char *dest) sizeof(H225H323_UserInformation)); if(!pQ931Msg->userInfo) { - OOTRACEERR3("ERROR:Memory - ooH323ForwardCall - userInfo(%s, %s)\n", + OOTRACEERR3("ERROR:Memory - ooH323ForwardCall - userInfo(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } memset (pQ931Msg->userInfo, 0, sizeof(H225H323_UserInformation)); - pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = - OO_TESTFLAG (call->flags, OO_M_TUNNELING); + pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG (call->flags, OO_M_TUNNELING); - pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = + pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_facility; - - facility = (H225Facility_UUIE*) + + facility = (H225Facility_UUIE*) memAllocZ (pctxt, sizeof(H225Facility_UUIE)); if(!facility) @@ -3369,18 +3369,18 @@ int ooH323ForwardCall(char* callToken, char *dest) } pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.u.facility = facility; - - facility->protocolIdentifier = gProtocolID; + + facility->protocolIdentifier = gProtocolID; facility->m.callIdentifierPresent = 1; - facility->callIdentifier.guid.numocts = + facility->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(facility->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(facility->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); facility->reason.t = T_H225FacilityReason_callForwarded; - + if(!ooUtilsIsStrEmpty(call->pCallFwdData->ip)) { facility->m.alternativeAddressPresent = TRUE; @@ -3394,7 +3394,7 @@ int ooH323ForwardCall(char* callToken, char *dest) "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - inet_pton(AF_INET6, call->pCallFwdData->ip, + inet_pton(AF_INET6, call->pCallFwdData->ip, fwdCallSignalIp6Address->ip.data); fwdCallSignalIp6Address->ip.numocts=16; @@ -3410,7 +3410,7 @@ int ooH323ForwardCall(char* callToken, char *dest) "(%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } - inet_pton(AF_INET, call->pCallFwdData->ip, + inet_pton(AF_INET, call->pCallFwdData->ip, fwdCallSignalIpAddress->ip.data); fwdCallSignalIpAddress->ip.numocts=4; @@ -3420,14 +3420,14 @@ int ooH323ForwardCall(char* callToken, char *dest) } if(call->pCallFwdData->aliases) - { + { facility->m.alternativeAliasAddressPresent = TRUE; - ret = ooPopulateAliasList(pctxt, call->pCallFwdData->aliases, + ret = ooPopulateAliasList(pctxt, call->pCallFwdData->aliases, &facility->alternativeAliasAddress, 0); if(ret != OO_OK) { OOTRACEERR3("Error:Failed to populate alternate aliases in " - "ooH323ForwardCall. (%s, %s)\n", call->callType, + "ooH323ForwardCall. (%s, %s)\n", call->callType, call->callToken); return OO_FAILED; } @@ -3452,7 +3452,7 @@ int ooH323HangCall(char * callToken, OOCallClearReason reason, int q931cause) call= ooFindCallByToken(callToken); if(!call) { - OOTRACEWARN2("WARN: Call hangup failed - Call %s not present\n", + OOTRACEWARN2("WARN: Call hangup failed - Call %s not present\n", callToken); return OO_FAILED; } @@ -3467,8 +3467,8 @@ int ooH323HangCall(char * callToken, OOCallClearReason reason, int q931cause) } int ooSetBearerCapabilityIE - (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CodingStandard codingStandard, - enum Q931InformationTransferCapability capability, + (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CodingStandard codingStandard, + enum Q931InformationTransferCapability capability, enum Q931TransferMode transferMode, enum Q931TransferRate transferRate, enum Q931UserInfoLayer1Protocol userInfoLayer1) { @@ -3481,7 +3481,7 @@ int ooSetBearerCapabilityIE pmsg->bearerCapabilityIE = NULL; } - pmsg->bearerCapabilityIE = (Q931InformationElement*) + pmsg->bearerCapabilityIE = (Q931InformationElement*) memAlloc(pctxt, sizeof(Q931InformationElement)+size-1); if(!pmsg->bearerCapabilityIE) { @@ -3495,7 +3495,7 @@ int ooSetBearerCapabilityIE pmsg->bearerCapabilityIE->data[0] = (ASN1OCTET)(0x80 | ((codingStandard&3) << 5) | (capability&31)); pmsg->bearerCapabilityIE->data[1] = (0x80 | ((transferMode & 3) << 5) | (transferRate & 31)); - + pmsg->bearerCapabilityIE->data[2] = (0x80 | (1<<5) | userInfoLayer1); return OO_OK; @@ -3507,7 +3507,7 @@ int ooQ931SetKeypadIE(OOCTXT* pctxt, Q931Message *pmsg, const char* data) /* OOCTXT *pctxt = &gH323ep.msgctxt; */ len = strlen(data); - pmsg->keypadIE = (Q931InformationElement*) + pmsg->keypadIE = (Q931InformationElement*) memAlloc(pctxt, sizeof(Q931InformationElement)+len-1); if(!pmsg->keypadIE) { @@ -3525,7 +3525,7 @@ int ooQ931SetKeypadIE(OOCTXT* pctxt, Q931Message *pmsg, const char* data) int ooQ931SetCallingPartyNumberIE - (OOCTXT* pctxt, Q931Message *pmsg, const char *number, unsigned plan, unsigned type, + (OOCTXT* pctxt, Q931Message *pmsg, const char *number, unsigned plan, unsigned type, unsigned presentation, unsigned screening) { unsigned len = 0; @@ -3538,7 +3538,7 @@ int ooQ931SetCallingPartyNumberIE } len = strlen(number); - pmsg->callingPartyNumberIE = (Q931InformationElement*) + pmsg->callingPartyNumberIE = (Q931InformationElement*) memAlloc(pctxt, sizeof(Q931InformationElement)+len+2-1); if(!pmsg->callingPartyNumberIE) { @@ -3568,7 +3568,7 @@ int ooQ931SetCalledPartyNumberIE } len = strlen(number); - pmsg->calledPartyNumberIE = (Q931InformationElement*) + pmsg->calledPartyNumberIE = (Q931InformationElement*) memAlloc(pctxt, sizeof(Q931InformationElement)+len+1-1); if(!pmsg->calledPartyNumberIE) { @@ -3592,7 +3592,7 @@ int ooQ931SetCallStateIE pmsg->callstateIE = NULL; } - pmsg->callstateIE = (Q931InformationElement*) + pmsg->callstateIE = (Q931InformationElement*) memAllocZ(pctxt, sizeof(Q931InformationElement)); if(!pmsg->callstateIE) { @@ -3602,12 +3602,12 @@ int ooQ931SetCallStateIE pmsg->callstateIE->discriminator = Q931CallStateIE; pmsg->callstateIE->length = 1; pmsg->callstateIE->data[0] = callstate; - + return OO_OK; } int ooQ931SetCauseIE - (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CauseValues cause, unsigned coding, + (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CauseValues cause, unsigned coding, unsigned location) { /* OOCTXT *pctxt = &gH323ep.msgctxt; */ @@ -3617,7 +3617,7 @@ int ooQ931SetCauseIE pmsg->causeIE = NULL; } - pmsg->causeIE = (Q931InformationElement*) + pmsg->causeIE = (Q931InformationElement*) memAlloc(pctxt, sizeof(Q931InformationElement)+1); if(!pmsg->causeIE) { @@ -3629,13 +3629,13 @@ int ooQ931SetCauseIE pmsg->causeIE->data[0] = (0x80 | ((coding & 0x03) <<5) | (location & 0x0F)); pmsg->causeIE->data[1] = (0x80 | cause); - + return OO_OK; } /* Build a Facility message and tunnel H.245 message through it */ -int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, +int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, int h245Len, int h245MsgType, int associatedChan) { Q931Message *pQ931Msg = NULL; @@ -3647,7 +3647,7 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, /* OOCTXT *pctxt = &gH323ep.msgctxt; */ OOCTXT *pctxt = call->msgctxt; - OOTRACEDBGA4("Building Facility message for tunneling %s (%s, %s)\n", + OOTRACEDBGA4("Building Facility message for tunneling %s (%s, %s)\n", ooGetMsgTypeText(h245MsgType), call->callType, call->callToken); ret = ooCreateQ931Message(pctxt, &pQ931Msg, Q931FacilityMsg); @@ -3671,14 +3671,14 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, return OO_FAILED; } memset (pQ931Msg->userInfo, 0, sizeof(H225H323_UserInformation)); - pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; - pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = + pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling = OO_TESTFLAG (call->flags, OO_M_TUNNELING); - pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = + pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t = T_H225H323_UU_PDU_h323_message_body_facility; - + facility = (H225Facility_UUIE*) memAllocZ (pctxt, sizeof(H225Facility_UUIE)); @@ -3693,13 +3693,13 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.u.facility = facility; /* Populate Facility UUIE */ - facility->protocolIdentifier = gProtocolID; + facility->protocolIdentifier = gProtocolID; facility->m.callIdentifierPresent = 1; - facility->callIdentifier.guid.numocts = + facility->callIdentifier.guid.numocts = call->callIdentifier.guid.numocts; - memcpy(facility->callIdentifier.guid.data, - call->callIdentifier.guid.data, + memcpy(facility->callIdentifier.guid.data, + call->callIdentifier.guid.data, call->callIdentifier.guid.numocts); facility->reason.t = T_H225FacilityReason_transportedInformation; @@ -3711,7 +3711,7 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, pH245Control = (H225H323_UU_PDU_h245Control*) &pH323UUPDU->h245Control; - elem = (ASN1DynOctStr*) memAlloc(pctxt, + elem = (ASN1DynOctStr*) memAlloc(pctxt, sizeof(ASN1DynOctStr)); if(!elem) { @@ -3726,7 +3726,7 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, pQ931Msg->tunneledMsgType = h245MsgType; pQ931Msg->logicalChannelNo = associatedChan; - + ret = ooSendH225Msg(call, pQ931Msg); if(ret != OO_OK) { @@ -3734,7 +3734,7 @@ int ooSendAsTunneledMessage(OOH323CallData *call, ASN1OCTET* msgbuf, "outbound queue.(%s, %s)\n", call->callType, call->callToken); } - /* Can't do memReset here because if we are sending H.245 message as a + /* Can't do memReset here because if we are sending H.245 message as a response to received tunneled h.245 message, we can't reset unless the \ main received H225 message processing is finished. Rule. No reset when tunneling @@ -3749,12 +3749,12 @@ int ooCallEstbTimerExpired(void *data) ooTimerCallback *cbData = (ooTimerCallback*) data; OOH323CallData *call = cbData->call; - OOTRACEINFO3("Call Establishment timer expired. (%s, %s)\n", - call->callType, call->callToken); + OOTRACEINFO3("Call Establishment timer expired. (%s, %s)\n", + call->callType, call->callToken); memFreePtr(call->pctxt, cbData); if(call->callState < OO_CALL_CLEAR){ call->callState = OO_CALL_CLEAR; - call->callEndReason = OO_REASON_LOCAL_CLEARED; + call->callEndReason = OO_REASON_LOCAL_CLEARED; } return OO_OK; @@ -3762,7 +3762,7 @@ int ooCallEstbTimerExpired(void *data) int ooQ931GetCauseAndReasonCodeFromCallClearReason - (OOCallClearReason clearReason, enum Q931CauseValues *cause, + (OOCallClearReason clearReason, enum Q931CauseValues *cause, unsigned *reasonCode) { switch(clearReason) @@ -3782,7 +3782,7 @@ int ooQ931GetCauseAndReasonCodeFromCallClearReason break; case OO_REASON_GK_NOCALLERUSER: *reasonCode = T_H225ReleaseCompleteReason_callerNotRegistered; - *cause = Q931SubscriberAbsent; + *cause = Q931SubscriberAbsent; break; case OO_REASON_GK_UNREACHABLE: *reasonCode = T_H225ReleaseCompleteReason_unreachableGatekeeper; @@ -3832,7 +3832,7 @@ int ooQ931GetCauseAndReasonCodeFromCallClearReason *cause = Q931NoRouteToDestination; break; case OO_REASON_NOUSER: - *reasonCode = T_H225ReleaseCompleteReason_undefinedReason; + *reasonCode = T_H225ReleaseCompleteReason_undefinedReason; *cause = Q931SubscriberAbsent; break; case OO_REASON_UNKNOWN: @@ -3956,10 +3956,10 @@ int ooParseDestination parsedIP[0] = '\0'; OOTRACEINFO2("Parsing destination %s\n", dest); - + /* Test for an IP address:Note that only supports dotted IPv4. IPv6 won't pass the test and so will numeric IP representation*/ - + sscanf(dest, "%d.%d.%d.%d:%d", &iEk, &iDon, &iTeen, &iChaar, &iPort); if((iEk > 0 && iEk <= 255) && (iDon >= 0 && iDon <= 255) && @@ -3977,7 +3977,7 @@ int ooParseDestination "ooParseDestination\n"); return OO_FAILED; } - + strcpy(parsedIP, buf); return OO_OK; } @@ -4084,13 +4084,13 @@ int ooParseDestination } } - + /* e-164 */ /* strspn(dest, "1234567890*#,") == strlen(dest)*/ /* Dialed digits test*/ for(i=0; *(alias+i) != '\0'; i++) { - if(!isdigit(alias[i]) && alias[i] != '#' && alias[i] != '*' && + if(!isdigit(alias[i]) && alias[i] != '#' && alias[i] != '*' && alias[i] != ',') break; } @@ -4198,13 +4198,13 @@ const char* ooGetQ931CauseValueText(int val) { switch(val) { - case Q931UnallocatedNumber: + case Q931UnallocatedNumber: return "Q931UnallocatedNumber"; case Q931NoRouteToNetwork: return "Q931NoRouteToNetwork"; case Q931NoRouteToDestination: return "Q931NoRouteToDestination"; - case Q931ChannelUnacceptable: + case Q931ChannelUnacceptable: return "Q931ChannelUnacceptable"; case Q931NormalCallClearing: return "Q931NormalCallClearing"; @@ -4255,4 +4255,3 @@ const char* ooGetQ931CauseValueText(int val) } return "Unsupported Cause Type"; } - diff --git a/addons/ooh323c/src/ooq931.h b/addons/ooh323c/src/ooq931.h index 8da3893284..31e53e9295 100644 --- a/addons/ooh323c/src/ooq931.h +++ b/addons/ooh323c/src/ooq931.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ooq931.h - * This file contains functions to support call signalling. + * @file ooq931.h + * This file contains functions to support call signalling. */ #ifndef _OOQ931HDR_H_ @@ -37,7 +37,7 @@ extern "C" { #endif /* MAKE_DLL */ #endif /* EXTERN */ -/** +/** * @defgroup q931 Q.931/H.2250 Message Handling * @{ */ @@ -48,11 +48,11 @@ extern "C" { #define OO_MAX_CALL_TOKEN 999999 /* Q.931 packet must be at least 5 bytes long */ -#define Q931_E_TOOSHORT (-1001) +#define Q931_E_TOOSHORT (-1001) /* callReference field must be 2 bytes long */ -#define Q931_E_INVCALLREF (-1002) +#define Q931_E_INVCALLREF (-1002) /* invalid length of message */ -#define Q931_E_INVLENGTH (-1003) +#define Q931_E_INVLENGTH (-1003) enum Q931MsgTypes { Q931NationalEscapeMsg = 0x00, @@ -217,8 +217,8 @@ enum Q931UserInfoLayer1Protocol{ /* Structure to build store outgoing encoded UUIE - The different fields in the structure have octet lengths - as specified in the spec. + The different fields in the structure have octet lengths + as specified in the spec. */ typedef struct Q931InformationElement { int discriminator; @@ -228,8 +228,8 @@ typedef struct Q931InformationElement { } Q931InformationElement; /** - * Q.931 message structure. Contains context for memory allocation, - * protocol discriminator, call reference, meesage type and list of + * Q.931 message structure. Contains context for memory allocation, + * protocol discriminator, call reference, meesage type and list of * user-user information elements (IEs). */ typedef struct Q931Message { @@ -240,7 +240,7 @@ typedef struct Q931Message { ASN1UINT tunneledMsgType; /* The H245 message this message is tunneling*/ ASN1INT logicalChannelNo; /* channel number associated with tunneled */ /* message, 0 if no channel */ - DList ies; + DList ies; Q931InformationElement *bearerCapabilityIE; Q931InformationElement *callingPartyNumberIE; Q931InformationElement *calledPartyNumberIE; @@ -266,13 +266,13 @@ struct OOH323CallData; /* * These are message callbacks which can be used by user applications - * to perform application specific things on receiving a particular + * to perform application specific things on receiving a particular * message or before sending a particular message. For ex. user application * can change values of some parameters of setup message before it is actually * sent out. */ /** - * This callback is triggered when an H.225 SETUP message is received by + * This callback is triggered when an H.225 SETUP message is received by * the application. * @param call The call the message is associated with. * @param pmsg Q.931 message structure. @@ -282,7 +282,7 @@ typedef int (*cb_OnReceivedSetup) (struct OOH323CallData *call, struct Q931Message *pmsg); /** - * This callback is triggered when an H.225 CONNECT message is received by + * This callback is triggered when an H.225 CONNECT message is received by * the application. * @param call The call the message is associated with. * @param pmsg Q.931 message structure. @@ -292,8 +292,8 @@ typedef int (*cb_OnReceivedConnect) (struct OOH323CallData *call, struct Q931Message *pmsg); /** - * This callback is triggered after an H.225 SETUP message has been - * constructed and is ready to be sent out. It provides the application + * This callback is triggered after an H.225 SETUP message has been + * constructed and is ready to be sent out. It provides the application * with an opportunity to add additional non-standard information. * @param call The call the message is associated with. * @param pmsg Q.931 message structure. @@ -303,8 +303,8 @@ typedef int (*cb_OnBuiltSetup) (struct OOH323CallData *call, struct Q931Message *pmsg); /** - * This callback is triggered after an H.225 CONNECT message has been - * constructed and is ready to be sent out. It provides the application + * This callback is triggered after an H.225 CONNECT message has been + * constructed and is ready to be sent out. It provides the application * with an opportunity to add additional non-standard information. * @param call The call the message is associated with. * @param pmsg Q.931 message structure. @@ -314,7 +314,7 @@ typedef int (*cb_OnBuiltConnect) (struct OOH323CallData *call, struct Q931Message *pmsg); /** - * This structure holds the various callback functions that are + * This structure holds the various callback functions that are * triggered when H.225 messages are received or constructed. * @see ooH323EpSetH225MsgCallbacks */ @@ -326,8 +326,8 @@ typedef struct OOH225MsgCallbacks { } OOH225MsgCallbacks; /** - * This function is invoked to decode a Q931 message. - * + * This function is invoked to decode a Q931 message. + * * @param call Handle to call which owns the message. * @param msg Pointer to the Q931 message * @param length Length of the encoded data @@ -335,18 +335,18 @@ typedef struct OOH225MsgCallbacks { * * @return Completion status - 0 on success, -1 on failure */ -EXTERN int ooQ931Decode +EXTERN int ooQ931Decode (struct OOH323CallData *call, Q931Message* msg, int length, ASN1OCTET *data, int docallbacks); /** * This function is used to decode the UUIE of the message from the list of * ies. It decodes the User-User ie and populates the userInfo field of the * message. - * @param q931Msg Pointer to the message whose User-User ie has to be - * decoded. + * @param q931Msg Pointer to the message whose User-User ie has to be + * decoded. * * @return OO_OK, on success. OO_FAILED, on failure. - */ + */ EXTERN int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg); /** @@ -360,20 +360,20 @@ EXTERN int ooDecodeUUIE(OOCTXT* pctxt, Q931Message *q931Msg); EXTERN int ooEncodeUUIE(OOCTXT* pctxt, Q931Message *q931msg); /** - * This function is invoked to retrieve an IE element from a Q931 message. - * + * This function is invoked to retrieve an IE element from a Q931 message. + * * @param q931msg Pointer to the Q931 message * @param ieCode IE code for the IE element to be retrieved * - * @return Pointer to a Q931InformationElement contating + * @return Pointer to a Q931InformationElement contating * the IE element. */ -EXTERN Q931InformationElement* ooQ931GetIE (const Q931Message* q931msg, +EXTERN Q931InformationElement* ooQ931GetIE (const Q931Message* q931msg, int ieCode); /** - * This function is invoked to print a Q931 message. - * + * This function is invoked to print a Q931 message. + * * @param q931msg Pointer to the Q931 message * * @return - none @@ -382,8 +382,8 @@ EXTERN void ooQ931Print (const Q931Message* q931msg); /** - * This function is invoked to create an outgoing Q931 message. - * + * This function is invoked to create an outgoing Q931 message. + * * @param msg Reference to the pointer of type Q931 message. * @param msgType Type of Q931 message to be created * @@ -392,7 +392,7 @@ EXTERN void ooQ931Print (const Q931Message* q931msg); EXTERN int ooCreateQ931Message(OOCTXT* pctxt, Q931Message **msg, int msgType); /** - * This function is invoked to generate a unique call reference number. + * This function is invoked to generate a unique call reference number. * * @return - call reference number */ @@ -409,8 +409,8 @@ EXTERN ASN1USINT ooGenerateCallReference(void); EXTERN int ooGenerateCallIdentifier(H225CallIdentifier *callid); /** - * This function is invoked to release the memory used up by a Q931 message - * + * This function is invoked to release the memory used up by a Q931 message + * * @param q931Msg Pointer to a Q931 message which has to be freed. * * @return Completion status - 0 on success, -1 on failure @@ -418,10 +418,10 @@ EXTERN int ooGenerateCallIdentifier(H225CallIdentifier *callid); EXTERN int ooFreeQ931Message(OOCTXT* pctxt, Q931Message *q931Msg); /** - * This function is invoked to retrive the outgoing message buffer for + * This function is invoked to retrive the outgoing message buffer for * Q931 message * - * @param call Pointer to call for which outgoing Q931 message has to be + * @param call Pointer to call for which outgoing Q931 message has to be * retrieved. * @param msgbuf Pointer to a buffer in which retrieved message will * be returned. @@ -436,11 +436,11 @@ EXTERN int ooGetOutgoingQ931Msgbuf (struct OOH323CallData *call, ASN1OCTET * msgbuf, int* len, int *msgType); /** - * This function is invoked to send a ReleaseComplete message for + * This function is invoked to send a ReleaseComplete message for * the currently active call. * - * @param call Pointer to the call for which ReleaseComplete message have - * to be sent. + * @param call Pointer to the call for which ReleaseComplete message have + * to be sent. * * @return Completion status - 0 on success, -1 on failure */ @@ -451,18 +451,18 @@ EXTERN int ooSendReleaseComplete(struct OOH323CallData *call); * received setup message. * * @param call Pointer to the call for which CallProceeding message have to - * be sent. + * be sent. * * @return Completion status - 0 on success, -1 on failure */ EXTERN int ooSendCallProceeding(struct OOH323CallData *call); /** - * This function is invoked to send alerting message in response to received - * setup message. + * This function is invoked to send alerting message in response to received + * setup message. * - * @param call Pointer to the call for which Alerting message have to be - * sent. + * @param call Pointer to the call for which Alerting message have to be + * sent. * * @return Completion status - 0 on success, -1 on failure */ @@ -477,8 +477,8 @@ EXTERN int ooSendStatusInquiry(struct OOH323CallData *call); /** * This function is invoked to send Facility message. * - * @param call Pointer to the call for which Facility message have to be - * sent. + * @param call Pointer to the call for which Facility message have to be + * sent. * * @return Completion status - 0 on success, -1 on failure */ @@ -497,11 +497,11 @@ EXTERN int ooQ931SendDTMFAsKeyPadIE (struct OOH323CallData *call, const char* data); /** - * This function is invoked to send a Connect message in response to received - * setup message. + * This function is invoked to send a Connect message in response to received + * setup message. * - * @param call Pointer to the call for which connect message has to be - * sent. + * @param call Pointer to the call for which connect message has to be + * sent. * * @return Completion status - 0 on success, -1 on failure */ @@ -509,7 +509,7 @@ EXTERN int ooSendConnect(struct OOH323CallData *call); /** * This function is used to send a SETUP message for outgoing call. It first - * creates an H.225 TCP connection with the remote end point and then sends + * creates an H.225 TCP connection with the remote end point and then sends * SETUP message over this connection. * @param dest Destination - IP:Port/alias. * @param callToken Unique token for the new call. @@ -541,7 +541,7 @@ EXTERN int ooH323HandleCallFwdRequest(struct OOH323CallData *call); /** * This function is used for forwarding/redirecting a call to third party. * @param callToken callToken for the call which has to be redirected. - * @param dest Address to which call has to be forwarded. Can be + * @param dest Address to which call has to be forwarded. Can be * IP:Port or alias. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -559,7 +559,7 @@ EXTERN int ooH323ForwardCall(char* callToken, char *dest); EXTERN int ooH323HangCall(char * callToken, OOCallClearReason reason, int q931); -/** +/** * Function to accept a call by sending connect. This function is used * as a helper function to ooSendConnect. * @param call Pointer to the call for which connect has to be sent @@ -602,7 +602,7 @@ int ooGenerateCallToken (char *callToken, size_t size); /** - * This function sends an encoded H.245 message buffer as a tunneled + * This function sends an encoded H.245 message buffer as a tunneled * H.245 Facility message. * @param call Pointer to the call for which H.245 message has to * be tunneled. @@ -617,28 +617,28 @@ int ooGenerateCallToken (char *callToken, size_t size); * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooSendAsTunneledMessage -(struct OOH323CallData *call, ASN1OCTET* msgbuf, - int h245Len, int h245MsgType, int associatedChan); - +(struct OOH323CallData *call, ASN1OCTET* msgbuf, + int h245Len, int h245MsgType, int associatedChan); + /** * This function is used to encode an H.225 message. * @param call Handle to the call. * @param pq931Msg Pointer to the message to be encoded. - * @param msgbuf Pointer to the buffer in which encoded message will + * @param msgbuf Pointer to the buffer in which encoded message will * be returned. * @param size Size of the buffer passed. * * @return OO_OK, on success. OO_FAILED, on failure. */ -int ooEncodeH225Message(struct OOH323CallData *call, Q931Message *pq931Msg, +int ooEncodeH225Message(struct OOH323CallData *call, Q931Message *pq931Msg, char *msgbuf, int size); /** - * This is a callback function which is called when there is no CONNECT + * This is a callback function which is called when there is no CONNECT * response from the remote endpoint after the SETUP has been sent and timeout * period has passed. - * @param data The callback data registered at the time of timer + * @param data The callback data registered at the time of timer * creation. * * @return OO_OK, on success. OO_FAILED, on failure. @@ -670,8 +670,8 @@ EXTERN int ooQ931SetKeypadIE(OOCTXT* pctxt, Q931Message *pmsg, const char* data) * @return OO_OK on success, OO_FAILED, on failure. */ EXTERN int ooSetBearerCapabilityIE - (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CodingStandard codingStandard, - enum Q931InformationTransferCapability capability, + (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CodingStandard codingStandard, + enum Q931InformationTransferCapability capability, enum Q931TransferMode transferMode, enum Q931TransferRate transferRate, enum Q931UserInfoLayer1Protocol userInfoLayer1); @@ -703,10 +703,10 @@ EXTERN int ooQ931SetCalledPartyNumberIE * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooQ931SetCallingPartyNumberIE - (OOCTXT* pctxt, Q931Message *pmsg, const char *number, unsigned plan, unsigned type, + (OOCTXT* pctxt, Q931Message *pmsg, const char *number, unsigned plan, unsigned type, unsigned presentation, unsigned screening); -/** +/** * This function is used to set a cause ie for a q931 message. * @param pmsg Valid Q931 Message * @param cause Q931 Cause Value @@ -716,15 +716,15 @@ EXTERN int ooQ931SetCallingPartyNumberIE * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooQ931SetCauseIE - (OOCTXT *pctxt, Q931Message *pmsg,enum Q931CauseValues cause, unsigned coding, + (OOCTXT *pctxt, Q931Message *pmsg,enum Q931CauseValues cause, unsigned coding, unsigned location); EXTERN int ooQ931SetCallStateIE (OOCTXT *pctxt, Q931Message *pmsg, unsigned char callstate); /** - * This function is used to convert a call clear reason to cause and - * reason code. It is used when local user is endoing the call and + * This function is used to convert a call clear reason to cause and + * reason code. It is used when local user is endoing the call and * sending releaseComplete. * @param clearReason Reason for ending call. * @param cause Pointer to Q931CauseVaules enum in which cause @@ -735,7 +735,7 @@ EXTERN int ooQ931SetCallStateIE * @return OO_OK, on success. OO_FAILED, on failure. */ EXTERN int ooQ931GetCauseAndReasonCodeFromCallClearReason - (OOCallClearReason clearReason, enum Q931CauseValues *cause, + (OOCallClearReason clearReason, enum Q931CauseValues *cause, unsigned *reasonCode); /** @@ -750,7 +750,7 @@ EXTERN OOCallClearReason ooGetCallClearReasonFromCauseAndReasonCode (enum Q931CauseValues cause, unsigned reasonCode); /** - * This function is used to retrieve the description text for a + * This function is used to retrieve the description text for a * message type. * * @param msgType Message type. @@ -775,8 +775,8 @@ EXTERN int ooSendStartH245Facility(struct OOH323CallData *call); EXTERN int ooSendFSUpdate(struct OOH323CallData *call); EXTERN int ooHandleFastStartChannels(struct OOH323CallData *pCall); -/** - * @} +/** + * @} */ #ifdef __cplusplus } diff --git a/addons/ooh323c/src/ootrace.c b/addons/ooh323c/src/ootrace.c index ba77e7fd1a..3e097faa5d 100644 --- a/addons/ooh323c/src/ootrace.c +++ b/addons/ooh323c/src/ootrace.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -47,7 +47,7 @@ void ooTrace(OOUINT32 traceLevel, const char * fmtspec, ...) { if(traceLevel > gs_traceLevel) return; va_start (arglist, fmtspec); /* memset(logMessage, 0, MAXLOGMSGLEN);*/ - vsprintf(logMessage, fmtspec, arglist); + vsprintf(logMessage, fmtspec, arglist); va_end(arglist); ooTraceLogMessage(logMessage); } @@ -59,18 +59,18 @@ void ooTraceLogMessage(const char * logMessage) static int lasttime=25; int printDate =0; static int printTime=1; - + #ifdef _WIN32 - + SYSTEMTIME systemTime; GetLocalTime(&systemTime); - GetTimeFormat(LOCALE_SYSTEM_DEFAULT,0, &systemTime, "HH':'mm':'ss", + GetTimeFormat(LOCALE_SYSTEM_DEFAULT,0, &systemTime, "HH':'mm':'ss", timeString, 100); GetTimeFormat(LOCALE_SYSTEM_DEFAULT,0, &systemTime, "H", currtime, 3); if(lasttime> atoi(currtime)) printDate=1; lasttime = atoi(currtime); - + #else struct tm *ptime; char dateString[10]; @@ -80,10 +80,10 @@ void ooTraceLogMessage(const char * logMessage) strftime(currtime, 3, "%H", ptime); if(lasttime>atoi(currtime)) printDate = 1; - lasttime = atoi(currtime); + lasttime = atoi(currtime); #endif - + #ifdef _WIN32 if(printDate) { @@ -92,25 +92,25 @@ void ooTraceLogMessage(const char * logMessage) systemTime.wMonth, systemTime.wDay, systemTime.wYear); } if(printTime) { - fprintf(gH323ep.fptraceFile, "%s:%03d %s", timeString, + fprintf(gH323ep.fptraceFile, "%s:%03d %s", timeString, systemTime.wMilliseconds, logMessage); } else fprintf(gH323ep.fptraceFile, "%s", logMessage); - + fflush(gH323ep.fptraceFile); #else if(printDate) { printDate = 0; strftime(dateString, 10, "%d", ptime); - fprintf(gH323ep.fptraceFile, "---------Date %s---------\n", + fprintf(gH323ep.fptraceFile, "---------Date %s---------\n", dateString); } if(printTime) { struct timeval systemTime; gettimeofday(&systemTime, NULL); - fprintf(gH323ep.fptraceFile, "%s:%03ld %s", timeString, + fprintf(gH323ep.fptraceFile, "%s:%03ld %s", timeString, (long) systemTime.tv_usec/1000, logMessage); } else @@ -118,7 +118,7 @@ void ooTraceLogMessage(const char * logMessage) fflush(gH323ep.fptraceFile); #endif - + if(strchr(logMessage, '\n')) printTime = 1; else @@ -131,4 +131,3 @@ int ooLogAsn1Error(int stat, const char * fname, int lno) OOTRACEERR4("Asn1Error: %d at %s:%d\n", stat, fname, lno); return stat; } - diff --git a/addons/ooh323c/src/ootrace.h b/addons/ooh323c/src/ootrace.h index 1f4e6c5705..72b2119139 100644 --- a/addons/ooh323c/src/ootrace.h +++ b/addons/ooh323c/src/ootrace.h @@ -1,21 +1,21 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - * @file ootrace.h + * @file ootrace.h * This file defines the trace functionality */ #include "ooCommon.h" @@ -67,7 +67,7 @@ #define OOTRACEINFO4(a,b,c,d) ooTrace(OOTRCLVLINFO,a,b,c,d) #define OOTRACEINFO5(a,b,c,d,e) ooTrace(OOTRCLVLINFO,a,b,c,d,e) #define OOTRACEINFO6(a,b,c,d,e,f) ooTrace(OOTRCLVLINFO,a,b,c,d,e, f) -#ifndef _COMPACT +#ifndef _COMPACT #define OOTRACEDBGA1(a) ooTrace(OOTRCLVLDBGA,a) #define OOTRACEDBGA2(a,b) ooTrace(OOTRCLVLDBGA,a,b) #define OOTRACEDBGA3(a,b,c) ooTrace(OOTRCLVLDBGA,a,b,c) @@ -83,13 +83,13 @@ #define OOTRACEDBGC4(a,b,c,d) ooTrace(OOTRCLVLDBGC,a,b,c,d) #define OOTRACEDBGC5(a,b,c,d,e) ooTrace(OOTRCLVLDBGC,a,b,c,d,e) #else -#define OOTRACEDBGA1(a) +#define OOTRACEDBGA1(a) #define OOTRACEDBGA2(a,b) #define OOTRACEDBGA3(a,b,c) #define OOTRACEDBGA4(a,b,c,d) #define OOTRACEDBGA5(a,b,c,d,e) #define OOTRACEDBGB1(a) -#define OOTRACEDBGB2(a,b) +#define OOTRACEDBGB2(a,b) #define OOTRACEDBGB3(a,b,c) #define OOTRACEDBGB4(a,b,c,d) #define OOTRACEDBGC1(a) @@ -113,11 +113,11 @@ extern "C" { /** * This function is used to set the trace level. - * @param traceLevel New trace level. Various values are: OOTRCLVLERR, + * @param traceLevel New trace level. Various values are: OOTRCLVLERR, * OOTRCLVLWARN, OOTRCLVLINFO, OOTRCLVLDBGA, OOTRCLVLDBGB, * OOTRCLVLDBGC * - * @return None + * @return None */ EXTERN void ooSetTraceThreshold(OOUINT32 traceLevel); @@ -126,7 +126,7 @@ EXTERN void ooSetTraceThreshold(OOUINT32 traceLevel); * * @param traceLevel Trace level for the message. * @param fmtspec Printf style format spec. - * @param ... Printf style variable list of arguments + * @param ... Printf style variable list of arguments * * @return - none */ diff --git a/addons/ooh323c/src/ootypes.h b/addons/ooh323c/src/ootypes.h index 9583e9e1ba..cc7cd7c36a 100644 --- a/addons/ooh323c/src/ootypes.h +++ b/addons/ooh323c/src/ootypes.h @@ -1,50 +1,50 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/*! \mainpage +/*! \mainpage *

ooH323c Stack Functions

* - * The Objective Open H.323 for C (ooH323c) protocol stack is an - * open source applications program interface (API) for building H.323 based - * applications. The stack implements Q.931/H.225 call signaling procedures, - * H.245 logical channel operations, and Registration, Admission, and Status + * The Objective Open H.323 for C (ooH323c) protocol stack is an + * open source applications program interface (API) for building H.323 based + * applications. The stack implements Q.931/H.225 call signaling procedures, + * H.245 logical channel operations, and Registration, Admission, and Status * (RAS) messaging for Gatekeeper communications. * * The categories of user functions provided are as follows: *
    - *
  • Stack command functions. These are high level functions used to - * initiate common H.323 telephony operations (for example, to make a + *
  • Stack command functions. These are high level functions used to + * initiate common H.323 telephony operations (for example, to make a * call).
    • - *
  • Gatekeeper functions. These are high level functions for + *
  • Gatekeeper functions. These are high level functions for * managing communications with a gatekeeper using RAS messages.
    • - *
  • H.323 endpoint management functions. These are function for + *
  • H.323 endpoint management functions. These are function for * used for managing the global H.323 endpoint.
    • - *
  • Call management functions. These are functions used to manage + *
  • Call management functions. These are functions used to manage * active calls within the stack.
    • - *
  • Capability management functions. These functions are used for + *
  • Capability management functions. These functions are used for * negotiating capabilities between two different terminals.
    • - *
  • H.225 and H.245 message handling functions. Functions for + *
  • H.225 and H.245 message handling functions. Functions for * creating and handling H.323 standard ASN.1 messages.
    • - *
  • Q.931 functions. Functions for the execution of various + *
  • Q.931 functions. Functions for the execution of various * standard Q.931 operations.
    • - *
  • TCP/IP and UDP socket communication functions. Low-level + *
  • TCP/IP and UDP socket communication functions. Low-level * functions for writing data to and receiving data from sockets.
    • *
- */ + */ /** - * @file ootypes.h + * @file ootypes.h * This file contains definitions of common constants and data structures. */ #ifndef _OOTYPES_H_ @@ -71,7 +71,7 @@ #endif /* MAKE_DLL */ #endif /* EXTERN */ -/** +/** * @defgroup ootypes Common type and constant definitions. * @{ */ @@ -86,7 +86,7 @@ */ typedef enum OOMasterSlaveState { OO_MasterSlave_Idle, - OO_MasterSlave_DetermineSent, + OO_MasterSlave_DetermineSent, OO_MasterSlave_AckReceived, OO_MasterSlave_Master, OO_MasterSlave_Slave @@ -97,25 +97,25 @@ typedef enum OOMSAckStatus { OO_msAck_remoteReceived } OOMSAckStatus; -/** - * States defined for the capability exchange procedure. +/** + * States defined for the capability exchange procedure. */ typedef enum { - OO_LocalTermCapExchange_Idle, - OO_LocalTermCapSetSent, - OO_LocalTermCapSetAckRecvd, - OO_RemoteTermCapExchange_Idle, - OO_RemoteTermCapSetRecvd, + OO_LocalTermCapExchange_Idle, + OO_LocalTermCapSetSent, + OO_LocalTermCapSetAckRecvd, + OO_RemoteTermCapExchange_Idle, + OO_RemoteTermCapSetRecvd, OO_RemoteTermCapSetAckSent } OOCapExchangeState; -/** +/** * Call clear reason codes. */ typedef enum OOCallClearReason { - OO_REASON_UNKNOWN=0, + OO_REASON_UNKNOWN=0, OO_REASON_INVALIDMESSAGE, - OO_REASON_TRANSPORTFAILURE, + OO_REASON_TRANSPORTFAILURE, OO_REASON_NOROUTE, OO_REASON_NOUSER, OO_REASON_NOBW, @@ -125,10 +125,10 @@ typedef enum OOCallClearReason { OO_REASON_GK_UNREACHABLE, OO_REASON_GK_CLEARED, OO_REASON_NOCOMMON_CAPABILITIES, - OO_REASON_REMOTE_FWDED, + OO_REASON_REMOTE_FWDED, OO_REASON_LOCAL_FWDED, - OO_REASON_REMOTE_CLEARED, - OO_REASON_LOCAL_CLEARED, + OO_REASON_REMOTE_CLEARED, + OO_REASON_LOCAL_CLEARED, OO_REASON_REMOTE_BUSY, OO_REASON_LOCAL_BUSY, OO_REASON_REMOTE_NOANSWER, @@ -241,8 +241,8 @@ typedef enum OOCallMode { /*TODO: Should add caller-id, callername etc. So that they can be changed per call basis*/ /** - * This structure defines options that can be set at the level of an - * individual call. They override options set in the H.323 endpoint + * This structure defines options that can be set at the level of an + * individual call. They override options set in the H.323 endpoint * structure. */ typedef struct ooCallOptions { @@ -252,7 +252,7 @@ typedef struct ooCallOptions { OOCallMode callMode; /*!< Type of channel to setup with FastStart */ int transfercap; /* q931 cap */ }ooCallOptions; - + struct OOH323CallData; @@ -266,4 +266,3 @@ typedef struct ooTimerCallback{ * @} */ #endif - diff --git a/addons/ooh323c/src/perutil.c b/addons/ooh323c/src/perutil.c index 75368279a1..9d6c4618aa 100644 --- a/addons/ooh323c/src/perutil.c +++ b/addons/ooh323c/src/perutil.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -23,7 +23,7 @@ ASN1BOOL isExtendableSize (Asn1SizeCnst* pSizeList); static ASN1BOOL isFixedSize (Asn1SizeCnst* pSizeList); -ASN1BOOL alignCharStr +ASN1BOOL alignCharStr (OOCTXT* pctxt, ASN1UINT len, ASN1UINT nbits, Asn1SizeCnst* pSize) { if (TRUE) { @@ -59,16 +59,16 @@ ASN1BOOL alignCharStr return FALSE; } -int bitAndOctetStringAlignmentTest (Asn1SizeCnst* pSizeList, - ASN1UINT itemCount, +int bitAndOctetStringAlignmentTest (Asn1SizeCnst* pSizeList, + ASN1UINT itemCount, ASN1BOOL bitStrFlag, ASN1BOOL* pAlignFlag) { ASN1UINT threshold = (bitStrFlag) ? 16 : 2; - if (pSizeList == 0 || itemCount > threshold) + if (pSizeList == 0 || itemCount > threshold) *pAlignFlag = TRUE; - else if (isFixedSize(pSizeList)) + else if (isFixedSize(pSizeList)) *pAlignFlag = FALSE; else { @@ -91,8 +91,8 @@ int bitAndOctetStringAlignmentTest (Asn1SizeCnst* pSizeList, return (ASN_OK); } -Asn1SizeCnst* checkSize (Asn1SizeCnst* pSizeList, - ASN1UINT value, +Asn1SizeCnst* checkSize (Asn1SizeCnst* pSizeList, + ASN1UINT value, ASN1BOOL* pExtendable) { Asn1SizeCnst* lpSize = pSizeList; @@ -132,7 +132,7 @@ int addSizeConstraint (OOCTXT* pctxt, Asn1SizeCnst* pSize) lpSize = pSize; while (lpSize) { if (pctxt->pSizeConstraint->lower <= lpSize->lower || - pctxt->pSizeConstraint->upper >= lpSize->upper) + pctxt->pSizeConstraint->upper >= lpSize->upper) { /* Set the extension flag to the value of the size */ /* constraint structure that the item falls within.. */ @@ -196,32 +196,32 @@ int checkSizeConstraint(OOCTXT* pctxt, int size) } ASN1UINT getUIntBitCount (ASN1UINT value) -{ +{ /* Binary search - decision tree (5 tests, rarely 6) */ return ((value < 1<<15) ? ((value < 1<<7) ? ((value < 1<<3) ? - ((value < 1<<1) ? ((value < 1<<0) ? 0 : 1) : + ((value < 1<<1) ? ((value < 1<<0) ? 0 : 1) : ((value < 1<<2) ? 2 : 3)) : - ((value < 1<<5) ? ((value < 1<<4) ? 4 : 5) : + ((value < 1<<5) ? ((value < 1<<4) ? 4 : 5) : ((value < 1<<6) ? 6 : 7))) : ((value < 1<<11) ? - ((value < 1<<9) ? ((value < 1<<8) ? 8 : 9) : + ((value < 1<<9) ? ((value < 1<<8) ? 8 : 9) : ((value < 1<<10) ? 10 : 11)) : - ((value < 1<<13) ? ((value < 1<<12) ? 12 : 13) : + ((value < 1<<13) ? ((value < 1<<12) ? 12 : 13) : ((value < 1<<14) ? 14 : 15)))) : ((value < 1<<23) ? ((value < 1<<19) ? - ((value < 1<<17) ? ((value < 1<<16) ? 16 : 17) : + ((value < 1<<17) ? ((value < 1<<16) ? 16 : 17) : ((value < 1<<18) ? 18 : 19)) : - ((value < 1<<21) ? ((value < 1<<20) ? 20 : 21) : + ((value < 1<<21) ? ((value < 1<<20) ? 20 : 21) : ((value < 1<<22) ? 22 : 23))) : ((value < 1<<27) ? - ((value < 1<<25) ? ((value < 1<<24) ? 24 : 25) : + ((value < 1<<25) ? ((value < 1<<24) ? 24 : 25) : ((value < 1<<26) ? 26 : 27)) : - ((value < 1<<29) ? ((value < 1<<28) ? 28 : 29) : - ((value < 1<<30) ? 30 : + ((value < 1<<29) ? ((value < 1<<28) ? 28 : 29) : + ((value < 1<<30) ? 30 : ((value < 1UL<<31) ? 31 : 32)))))); } @@ -257,7 +257,7 @@ static ASN1BOOL isFixedSize (Asn1SizeCnst* pSizeList) return FALSE; } -void set16BitCharSet +void set16BitCharSet (OOCTXT* pctxt, Asn116BitCharSet* pCharSet, Asn116BitCharSet* pAlphabet) { /* Permitted alphabet range can either be specified as a range of */ @@ -267,7 +267,7 @@ void set16BitCharSet int nocts = pAlphabet->charSet.nchars * 2; pCharSet->charSet.nchars = pAlphabet->charSet.nchars; - pCharSet->charSet.data = + pCharSet->charSet.data = (ASN116BITCHAR*) ASN1MALLOC (pctxt, nocts); if (pCharSet->charSet.data != NULL) @@ -286,4 +286,3 @@ void set16BitCharSet pCharSet->alignedBits <<= 1; } - diff --git a/addons/ooh323c/src/printHandler.c b/addons/ooh323c/src/printHandler.c index 953f17f31e..b94c446eef 100644 --- a/addons/ooh323c/src/printHandler.c +++ b/addons/ooh323c/src/printHandler.c @@ -1,20 +1,20 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/* This is an implementation of a simple print handler. It outputs - the fields of an encoded PER message to stdout in a structured output +/* This is an implementation of a simple print handler. It outputs + the fields of an encoded PER message to stdout in a structured output format.. */ #include "asterisk.h" @@ -36,10 +36,10 @@ AST_MUTEX_DEFINE_STATIC(printlock); static const char* pVarName; static int gIndentSpaces; -static const char* bitStrToString +static const char* bitStrToString (ASN1UINT numbits, const ASN1OCTET* data, char* buffer, size_t bufsiz); -static const char* octStrToString +static const char* octStrToString (ASN1UINT numocts, const ASN1OCTET* data, char* buffer, size_t bufsiz); void printCharStr32BitValue (ASN1UINT nchars, ASN132BITCHAR* data); @@ -232,7 +232,7 @@ void printOpenTypeValue (ASN1UINT numocts, const ASN1OCTET* data) OOTRACEDBGB1 ("< encoded data >\n"); } -static const char* bitStrToString +static const char* bitStrToString (ASN1UINT numbits, const ASN1OCTET* data, char* buffer, size_t bufsiz) { size_t i; @@ -258,7 +258,7 @@ static const char* bitStrToString return buffer; } -static const char* octStrToString +static const char* octStrToString (ASN1UINT numocts, const ASN1OCTET* data, char* buffer, size_t bufsiz) { size_t i; diff --git a/addons/ooh323c/src/printHandler.h b/addons/ooh323c/src/printHandler.h index 73f225b1f0..4c6d4e18f1 100644 --- a/addons/ooh323c/src/printHandler.h +++ b/addons/ooh323c/src/printHandler.h @@ -1,22 +1,22 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ /** - @file printHandler.h - This is an implementation of a simple print handler. It outputs - the fields of an encoded PER message to stdout in a structured output + @file printHandler.h + This is an implementation of a simple print handler. It outputs + the fields of an encoded PER message to stdout in a structured output format.. */ diff --git a/addons/ooh323c/src/rtctype.c b/addons/ooh323c/src/rtctype.c index 8dfe4e3fa9..60f7d898b8 100644 --- a/addons/ooh323c/src/rtctype.c +++ b/addons/ooh323c/src/rtctype.c @@ -1,15 +1,15 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/ooh323c/src/rtctype.h b/addons/ooh323c/src/rtctype.h index ebb0a59b45..4ab96807cd 100644 --- a/addons/ooh323c/src/rtctype.h +++ b/addons/ooh323c/src/rtctype.h @@ -1,21 +1,21 @@ /* * Copyright (C) 1997-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ -/** - * @file rtctype.h +/** + * @file rtctype.h */ #ifndef _RTCTYPE_H_ #define _RTCTYPE_H_ @@ -83,4 +83,3 @@ extern EXTERN const ASN1OCTET rtCtypeTable[256]; #endif #endif /* _RTCTYPE_H_ */ - diff --git a/addons/ooh323cDriver.c b/addons/ooh323cDriver.c index 3096d1e076..3ec8fe1d3d 100644 --- a/addons/ooh323cDriver.c +++ b/addons/ooh323cDriver.c @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ @@ -116,7 +116,7 @@ void* ooh323c_call_thread(void* dummy) } while (mycthread->call != NULL && res >= 0); - + ast_mutex_destroy(&mycthread->lock); close(mycthread->thePipe[0]); @@ -240,10 +240,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g711 ulaw capability to H323 endpoint\n"); } - ret= ooH323EpAddG711Capability(OO_G711ULAW64K, gtxframes, grxframes, + ret= ooH323EpAddG711Capability(OO_G711ULAW64K, gtxframes, grxframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } if(ast_format_cmp(format, ast_format_alaw) == AST_FORMAT_CMP_EQUAL) @@ -251,10 +251,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g711 alaw capability to H323 endpoint\n"); } - ret= ooH323EpAddG711Capability(OO_G711ALAW64K, gtxframes, grxframes, + ret= ooH323EpAddG711Capability(OO_G711ALAW64K, gtxframes, grxframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -263,27 +263,27 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g729A capability to H323 endpoint\n"); } - ret = ooH323EpAddG729Capability(OO_G729A, 2, 24, + ret = ooH323EpAddG729Capability(OO_G729A, 2, 24, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); if (gH323Debug) { ast_verb(0, "\tAdding g729 capability to H323 endpoint\n"); } - ret |= ooH323EpAddG729Capability(OO_G729, 2, 24, + ret |= ooH323EpAddG729Capability(OO_G729, 2, 24, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); if (gH323Debug) { ast_verb(0, "\tAdding g729b capability to H323 endpoint\n"); } - ret |= ooH323EpAddG729Capability(OO_G729B, 2, 24, + ret |= ooH323EpAddG729Capability(OO_G729B, 2, 24, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -292,10 +292,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g7231 capability to H323 endpoint\n"); } - ret = ooH323EpAddG7231Capability(OO_G7231, 1, 1, FALSE, + ret = ooH323EpAddG7231Capability(OO_G7231, 1, 1, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -305,10 +305,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g726 capability to H323 endpoint\n"); } - ret = ooH323EpAddG726Capability(OO_G726, gtxframes, grxframes, FALSE, + ret = ooH323EpAddG726Capability(OO_G726, gtxframes, grxframes, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -318,10 +318,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding g726aal2 capability to H323 endpoint\n"); } - ret = ooH323EpAddG726Capability(OO_G726AAL2, gtxframes, grxframes, FALSE, + ret = ooH323EpAddG726Capability(OO_G726AAL2, gtxframes, grxframes, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -331,10 +331,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding h263 capability to H323 endpoint\n"); } - ret = ooH323EpAddH263VideoCapability(OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, + ret = ooH323EpAddH263VideoCapability(OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -344,10 +344,10 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding gsm capability to H323 endpoint\n"); } - ret = ooH323EpAddGSMCapability(OO_GSMFULLRATE, 4, FALSE, FALSE, + ret = ooH323EpAddGSMCapability(OO_GSMFULLRATE, 4, FALSE, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -357,17 +357,17 @@ int ooh323c_set_capability if (gH323Debug) { ast_verb(0, "\tAdding speex capability to H323 endpoint\n"); } - ret = ooH323EpAddSpeexCapability(OO_SPEEX, 4, 4, FALSE, + ret = ooH323EpAddSpeexCapability(OO_SPEEX, 4, 4, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } - ao2_ref(format, -1); + ao2_ref(format, -1); } - + if(dtmf & H323_DTMF_CISCO) ret |= ooH323EpEnableDTMFCISCO(0); if(dtmf & H323_DTMF_RFC2833) @@ -386,7 +386,7 @@ int ooh323c_set_capability_for_call { int ret = 0, x, txframes; if (gH323Debug) { - ast_verb(0, "\tAdding capabilities to call(%s, %s)\n", call->callType, + ast_verb(0, "\tAdding capabilities to call(%s, %s)\n", call->callType, call->callToken); } if(dtmf & H323_DTMF_CISCO || 1) @@ -399,7 +399,7 @@ int ooh323c_set_capability_for_call ret |= ooCallEnableDTMFH245Signal(call); if (t38support) - ooCapabilityAddT38Capability(call, OO_T38, OORXANDTX, + ooCapabilityAddT38Capability(call, OO_T38, OORXANDTX, &ooh323c_start_receive_datachannel, &ooh323c_start_transmit_datachannel, &ooh323c_stop_receive_datachannel, @@ -412,15 +412,15 @@ int ooh323c_set_capability_for_call if(ast_format_cmp(format, ast_format_ulaw) == AST_FORMAT_CMP_EQUAL) { if (gH323Debug) { - ast_verb(0, "\tAdding g711 ulaw capability to call(%s, %s)\n", + ast_verb(0, "\tAdding g711 ulaw capability to call(%s, %s)\n", call->callType, call->callToken); } txframes = ast_format_cap_get_format_framing(cap, format); - ret= ooCallAddG711Capability(call, OO_G711ULAW64K, txframes, - txframes, OORXANDTX, + ret= ooCallAddG711Capability(call, OO_G711ULAW64K, txframes, + txframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } if(ast_format_cmp(format, ast_format_alaw) == AST_FORMAT_CMP_EQUAL) @@ -430,11 +430,11 @@ int ooh323c_set_capability_for_call call->callType, call->callToken); } txframes = ast_format_cap_get_format_framing(cap, format); - ret= ooCallAddG711Capability(call, OO_G711ALAW64K, txframes, - txframes, OORXANDTX, + ret= ooCallAddG711Capability(call, OO_G711ALAW64K, txframes, + txframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -448,7 +448,7 @@ int ooh323c_set_capability_for_call ret = ooCallAddG726Capability(call, OO_G726, txframes, grxframes, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -463,23 +463,23 @@ int ooh323c_set_capability_for_call ret = ooCallAddG726Capability(call, OO_G726AAL2, txframes, grxframes, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } if(ast_format_cmp(format, ast_format_g729) == AST_FORMAT_CMP_EQUAL) { - + txframes = (ast_format_cap_get_format_framing(cap, format))/10; if (gH323Debug) { ast_verb(0, "\tAdding g729A capability to call(%s, %s)\n", call->callType, call->callToken); } - ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes, + ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); if (g729onlyA) continue; @@ -487,19 +487,19 @@ int ooh323c_set_capability_for_call ast_verb(0, "\tAdding g729 capability to call(%s, %s)\n", call->callType, call->callToken); } - ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes, + ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); if (gH323Debug) { ast_verb(0, "\tAdding g729B capability to call(%s, %s)\n", call->callType, call->callToken); } - ret|= ooCallAddG729Capability(call, OO_G729B, txframes, txframes, + ret|= ooCallAddG729Capability(call, OO_G729B, txframes, txframes, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -510,10 +510,10 @@ int ooh323c_set_capability_for_call ast_verb(0, "\tAdding g7231 capability to call (%s, %s)\n", call->callType, call->callToken); } - ret = ooCallAddG7231Capability(call, OO_G7231, 1, 1, FALSE, + ret = ooCallAddG7231Capability(call, OO_G7231, 1, 1, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -524,10 +524,10 @@ int ooh323c_set_capability_for_call ast_verb(0, "\tAdding h263 capability to call (%s, %s)\n", call->callType, call->callToken); } - ret = ooCallAddH263VideoCapability(call, OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, + ret = ooCallAddH263VideoCapability(call, OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -535,26 +535,26 @@ int ooh323c_set_capability_for_call if(ast_format_cmp(format, ast_format_gsm) == AST_FORMAT_CMP_EQUAL) { if (gH323Debug) { - ast_verb(0, "\tAdding gsm capability to call(%s, %s)\n", + ast_verb(0, "\tAdding gsm capability to call(%s, %s)\n", call->callType, call->callToken); } - ret = ooCallAddGSMCapability(call, OO_GSMFULLRATE, 4, FALSE, FALSE, + ret = ooCallAddGSMCapability(call, OO_GSMFULLRATE, 4, FALSE, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } if(ast_format_cmp(format, ast_format_speex) == AST_FORMAT_CMP_EQUAL) { if (gH323Debug) { - ast_verb(0, "\tAdding Speex capability to call(%s, %s)\n", + ast_verb(0, "\tAdding Speex capability to call(%s, %s)\n", call->callType, call->callToken); } - ret = ooCallAddSpeexCapability(call, OO_SPEEX, 4, 4, FALSE, + ret = ooCallAddSpeexCapability(call, OO_SPEEX, 4, 4, FALSE, OORXANDTX, &ooh323c_start_receive_channel, &ooh323c_start_transmit_channel, - &ooh323c_stop_receive_channel, + &ooh323c_stop_receive_channel, &ooh323c_stop_transmit_channel); } @@ -569,7 +569,7 @@ int ooh323c_set_aliases(ooAliases * aliases) while(cur) { switch(cur->type) - { + { case T_H225AliasAddress_dialedDigits: ooH323EpAddAliasDialedDigits(cur->value); break; @@ -589,7 +589,7 @@ int ooh323c_set_aliases(ooAliases * aliases) } return 1; } - + int ooh323c_start_receive_channel(ooCallData *call, ooLogicalChannel *pChannel) { struct ast_format *tmpfmt = NULL; @@ -694,5 +694,3 @@ struct ast_format *convertH323CapToAsteriskCap(int cap) return NULL; } - - diff --git a/addons/ooh323cDriver.h b/addons/ooh323cDriver.h index 98198019ad..333f01f333 100644 --- a/addons/ooh323cDriver.h +++ b/addons/ooh323cDriver.h @@ -1,15 +1,15 @@ /* * Copyright (C) 2004-2005 by Objective Systems, Inc. * - * This software is furnished under an open source license and may be - * used and copied only in accordance with the terms of this license. - * The text of the license may generally be found in the root - * directory of this installation in the COPYING file. It + * This software is furnished under an open source license and may be + * used and copied only in accordance with the terms of this license. + * The text of the license may generally be found in the root + * directory of this installation in the COPYING file. It * can also be viewed online at the following URL: * * http://www.obj-sys.com/open/license.html * - * Any redistributions of this file including modified versions must + * Any redistributions of this file including modified versions must * maintain this copyright notice. * *****************************************************************************/ diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c index b080d118b8..43ca5fcf7a 100644 --- a/addons/res_config_mysql.c +++ b/addons/res_config_mysql.c @@ -447,7 +447,7 @@ static struct ast_config *realtime_multi_mysql(const char *database, const char release_database(dbh); return NULL; } - + if (!(cfg = ast_config_new())) { /* If I can't alloc memory at this point, why bother doing anything else? */ ast_log(LOG_WARNING, "Out of memory!\n"); @@ -749,7 +749,7 @@ static int update2_mysql(const char *database, const char *tablename, const stru return (int)numrows; } - + static int store_mysql(const char *database, const char *table, const struct ast_variable *rt_fields) { struct mysql_conn *dbh; @@ -873,7 +873,7 @@ static int destroy_mysql(const char *database, const char *table, const char *ke return (int)numrows; } - + static struct ast_config *config_mysql(const char *database, const char *table, const char *file, struct ast_config *cfg, struct ast_flags config_flags, const char *unused, const char *who_asked) { struct mysql_conn *dbh; @@ -1561,4 +1561,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MySQL RealTime Config .reload = reload, .load_pri = AST_MODPRI_REALTIME_DRIVER, ); - diff --git a/agi/Makefile b/agi/Makefile index 8a2186001a..c3129868b6 100644 --- a/agi/Makefile +++ b/agi/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for AGI-related stuff # # Copyright (C) 1999-2006, Digium diff --git a/agi/eagi-sphinx-test.c b/agi/eagi-sphinx-test.c index 359360286f..c7f6997c2d 100644 --- a/agi/eagi-sphinx-test.c +++ b/agi/eagi-sphinx-test.c @@ -101,7 +101,7 @@ static int read_environment(void) /* Load into normal environment */ setenv(buf, val, 1); - + } /* Never reached */ return 0; @@ -163,7 +163,7 @@ static char *wait_result(void) } } } - + } static char *run_command(char *command) diff --git a/agi/eagi-test.c b/agi/eagi-test.c index 7f24d1f23d..28d38fc5b9 100644 --- a/agi/eagi-test.c +++ b/agi/eagi-test.c @@ -50,7 +50,7 @@ static int read_environment(void) /* Load into normal environment */ setenv(buf, val, 1); - + } /* Never reached */ return 0; @@ -101,7 +101,7 @@ static char *wait_result(void) } } } - + } static char *run_command(char *command) diff --git a/agi/jukebox.agi b/agi/jukebox.agi index 7bd9c10f97..0d05b45ee7 100755 --- a/agi/jukebox.agi +++ b/agi/jukebox.agi @@ -265,12 +265,12 @@ MYCONTINUE: my $cmdr = `ln -s $mp3 $link`; chomp($cmdr); print "Failed to create symlink to mp3: $cmdr\n" if $cmdr ne ''; - + print "EXEC MP3Player \"$link\"\n"; my $result = ; &check_result($result); `rm $link`; - + if (!$MENUAFTERSONG) { print "EXEC Playback \"$FESTIVALCACHE/jukebox_thankyou\"\n"; my $result = ; &check_result($result); diff --git a/apps/Makefile b/apps/Makefile index d7f755ff15..a53bbe2b8b 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for PBX applications # # Copyright (C) 1999-2006, Digium, Inc. diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 04aadb3553..0659029956 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -29,7 +29,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page adsi.conf adsi.conf * \verbinclude adsi.conf.sample */ @@ -933,7 +933,7 @@ static const struct adsi_key_cmd kcmds[] = { }; static const struct adsi_key_cmd opcmds[] = { - + /* 1 - Branch on event -- handled specially */ { "SHOWKEYS", 2, showkeys }, /* Display Control */ @@ -1573,7 +1573,7 @@ static int adsi_prog(struct ast_channel *chan, const char *script) static int adsi_exec(struct ast_channel *chan, const char *data) { int res = 0; - + if (ast_strlen_zero(data)) data = "asterisk.adsi"; @@ -1598,8 +1598,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/apps/app_amd.c b/apps/app_amd.c index 25649d4b62..e10f2cc011 100644 --- a/apps/app_amd.c +++ b/apps/app_amd.c @@ -32,7 +32,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page amd.conf amd.conf * \verbinclude amd.conf.sample */ @@ -314,7 +314,7 @@ static void isAnsweringMachine(struct ast_channel *chan, const char *data) if (dspsilence > 0) { silenceDuration = dspsilence; - + if (silenceDuration >= betweenWordsSilence) { if (currentState != STATE_IN_SILENCE ) { ast_verb(3, "AMD: Channel [%s]. Changed state to STATE_IN_SILENCE\n", ast_channel_name(chan)); @@ -336,7 +336,7 @@ static void isAnsweringMachine(struct ast_channel *chan, const char *data) res = 1; break; } - + if (silenceDuration >= afterGreetingSilence && inGreeting == 1) { ast_verb(3, "AMD: Channel [%s]. HUMAN: silenceDuration:%d afterGreetingSilence:%d\n", ast_channel_name(chan), silenceDuration, afterGreetingSilence); @@ -346,7 +346,7 @@ static void isAnsweringMachine(struct ast_channel *chan, const char *data) res = 1; break; } - + } else { consecutiveVoiceDuration += framelength; voiceDuration += framelength; @@ -395,12 +395,12 @@ static void isAnsweringMachine(struct ast_channel *chan, const char *data) inInitialSilence = 0; inGreeting = 1; } - + } } ast_frfree(f); } - + if (!res) { /* It took too long to get a frame back. Giving up. */ ast_verb(3, "AMD: Channel [%s]. Too long...\n", ast_channel_name(chan)); @@ -505,8 +505,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c index e0ad4a0891..3ec04b72f9 100644 --- a/apps/app_authenticate.c +++ b/apps/app_authenticate.c @@ -101,7 +101,7 @@ static const char app[] = "Authenticate"; This application asks the caller to enter a given password in order to continue dialplan execution. - If the password begins with the / character, + If the password begins with the / character, it is interpreted as a file which contains a list of valid passwords, listed 1 password per line in the file. When using a database key, the value associated with the key can be anything. Users have three attempts to authenticate before the channel is hung up. @@ -156,7 +156,7 @@ static int auth_exec(struct ast_channel *chan, const char *data) } else { prompt = "agent-pass"; } - + /* Start asking for password */ for (retries = 0; retries < 3; retries++) { if ((res = ast_app_getdata(chan, prompt, passwd, maxdigits, 0)) < 0) diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index af4b616f5b..70325b3fa0 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -91,7 +91,7 @@ static const char app[] = "ChanIsAvail"; The cause code returned when requesting the channel - + @@ -171,7 +171,7 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); if ((inuse <= 1) && (tempchan = ast_request(tech, ast_channel_nativeformats(chan), NULL, chan, number, &status))) { ast_str_append(&tmp_availchan, 0, "%s%s", ast_str_strlen(tmp_availchan) ? "&" : "", ast_channel_name(tempchan)); - + snprintf(tmp, sizeof(tmp), "%s/%s", tech, number); ast_str_append(&tmp_availorig, 0, "%s%s", ast_str_strlen(tmp_availorig) ? "&" : "", tmp); @@ -210,4 +210,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Check channel availability"); - diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 95ebace633..2cc1af6e93 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -99,7 +99,7 @@ @@ -137,7 +137,7 @@ selected channel name. @@ -154,7 +154,7 @@ - + - This application is used to listen to the audio from an Asterisk channel. This includes the audio + This application is used to listen to the audio from an Asterisk channel. This includes the audio coming in and out of the channel being spied on. If the chanprefix parameter is specified, only channels beginning with this string will be spied upon. While spying, the following actions may be performed: @@ -248,7 +248,7 @@ - both grp and SPYGROUP can contain + both grp and SPYGROUP can contain either a single group or a colon-delimited list of groups, such as sales:support:accounting. @@ -286,7 +286,7 @@ selected channel name. @@ -299,7 +299,7 @@ - + - This application is used to listen to the audio from an Asterisk channel. This includes + This application is used to listen to the audio from an Asterisk channel. This includes the audio coming in and out of the channel being spied on. Only channels created by outgoing calls for the - specified extension will be selected for spying. If the optional context is not supplied, + specified extension will be selected for spying. If the optional context is not supplied, the current channel's context will be used. While spying, the following actions may be performed: - Dialing # cycles the volume level. @@ -1039,7 +1039,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags, num_mygroups = ast_app_separate_args(dup_mygroup, ':', mygroups, ARRAY_LEN(mygroups)); - /* Before dahdi scan was part of chanspy, it would use the "GROUP" variable + /* Before dahdi scan was part of chanspy, it would use the "GROUP" variable * rather than "SPYGROUP", this check is done to preserve expected behavior */ ast_autochan_channel_lock(autochan); if (ast_test_flag(flags, OPTION_DAHDI_SCAN)) { diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c index cc557deea7..d63d90aef1 100644 --- a/apps/app_controlplayback.c +++ b/apps/app_controlplayback.c @@ -219,7 +219,7 @@ static int controlplayback_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n"); return -1; } - + tmp = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, tmp); diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index 10c2962c69..03b34a22fd 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -21,7 +21,7 @@ * \brief Execute an ISDN RAS * * \author Mark Spencer - * + * * \ingroup applications */ @@ -131,7 +131,7 @@ static void run_ras(struct ast_channel *chan, char *args) int signalled = 0; struct dahdi_bufferinfo savebi; int x; - + res = ioctl(ast_channel_fd(chan, 0), DAHDI_GET_BUFINFO, &savebi); if(res) { ast_log(LOG_WARNING, "Unable to check buffer policy on channel %s\n", ast_channel_name(chan)); @@ -161,7 +161,7 @@ static void run_ras(struct ast_channel *chan, char *args) if (WIFEXITED(status)) { ast_verb(3, "RAS on %s terminated with status %d\n", ast_channel_name(chan), WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - ast_verb(3, "RAS on %s terminated with signal %d\n", + ast_verb(3, "RAS on %s terminated with signal %d\n", ast_channel_name(chan), WTERMSIG(status)); } else { ast_verb(3, "RAS on %s terminated weirdly.\n", ast_channel_name(chan)); @@ -187,11 +187,11 @@ static int dahdiras_exec(struct ast_channel *chan, const char *data) char *args; struct dahdi_params dahdip; - if (!data) + if (!data) data = ""; args = ast_strdupa(data); - + /* Answer the channel if it's not up */ if (ast_channel_state(chan) != AST_STATE_UP) ast_answer(chan); @@ -216,7 +216,7 @@ static int dahdiras_exec(struct ast_channel *chan, const char *data) return res; } -static int unload_module(void) +static int unload_module(void) { return ast_unregister_application(app); } @@ -227,5 +227,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "DAHDI ISDN Remote Access Server"); - - diff --git a/apps/app_dial.c b/apps/app_dial.c index 8c51f3f1a4..257ff472aa 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -405,7 +405,7 @@ Only one of the f, l, or b - options may be specified. If more than one is specified, then Directory will act as + options may be specified. If more than one is specified, then Directory will act as if b was specified. The number of characters for the user to type defaults to 3. @@ -364,7 +364,7 @@ static int select_item_seq(struct ast_channel *chan, struct directory_item **ite if (!res) res = ast_waitfordigit(chan, 3000); ast_stopstream(chan); - + if (res == '0') { /* operator selected */ goto_exten(chan, dialcontext, "o"); pbx_builtin_setvar_helper(chan, "DIRECTORY_RESULT", "OPERATOR"); @@ -932,7 +932,7 @@ static int directory_exec(struct ast_channel *chan, const char *data) res = ast_stream_and_wait(chan, digits, AST_DIGIT_ANY); } if (!res) { - res = ast_stream_and_wait(chan, + res = ast_stream_and_wait(chan, which == FIRST ? "dir-first" : which == LAST ? "dir-last" : "dir-firstlast", AST_DIGIT_ANY); diff --git a/apps/app_echo.c b/apps/app_echo.c index e50173af8b..b70ab365b8 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -42,7 +42,7 @@ - Echos back any media or DTMF frames read from the calling + Echos back any media or DTMF frames read from the calling channel back to itself. This will not echo CONTROL, MODEM, or NULL frames. Note: If '#' detected application exits. This application does not automatically answer and should be diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c index 84267a5ea4..8e78279f70 100644 --- a/apps/app_externalivr.c +++ b/apps/app_externalivr.c @@ -149,7 +149,7 @@ struct gen_state { int sample_queue; }; -static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, +static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, struct ast_iostream *eivr_events, struct ast_iostream *eivr_commands, struct ast_iostream *eivr_errors, @@ -309,7 +309,7 @@ static void ast_eivr_getvariable(struct ast_channel *chan, char *data, char *out char *inbuf, *variable; const char *value; int j; - struct ast_str *newstring = ast_str_alloca(outbuflen); + struct ast_str *newstring = ast_str_alloca(outbuflen); outbuf[0] = '\0'; @@ -322,7 +322,7 @@ static void ast_eivr_getvariable(struct ast_channel *chan, char *data, char *out } break; } - + ast_channel_lock(chan); if (!(value = pbx_builtin_getvar_helper(chan, variable))) { value = ""; @@ -414,7 +414,7 @@ static int app_exec(struct ast_channel *chan, const char *data) char *buf; int j; - char *s, **app_args, *e; + char *s, **app_args, *e; struct ast_str *comma_delim_args = ast_str_alloca(100); AST_DECLARE_APP_ARGS(eivr_args, @@ -476,7 +476,7 @@ static int app_exec(struct ast_channel *chan, const char *data) if (ast_test_flag(&flags, run_dead)) { ast_verb(4, "run_dead is set\n"); } - + if (!(ast_test_flag(&flags, noanswer))) { ast_verb(3, "Answering channel and starting generator\n"); if (ast_channel_state(chan) != AST_STATE_UP) { @@ -545,18 +545,18 @@ static int app_exec(struct ast_channel *chan, const char *data) ast_chan_log(LOG_ERROR, chan, "Could not create pipe for child errors: %s\n", strerror(errno)); goto exit; } - + pid = ast_safe_fork(0); if (pid < 0) { ast_log(LOG_ERROR, "Failed to fork(): %s\n", strerror(errno)); goto exit; } - + if (!pid) { /* child process */ if (ast_opt_high_priority) ast_set_priority(0); - + dup2(child_stdin[0], STDIN_FILENO); dup2(child_stdout[1], STDOUT_FILENO); dup2(child_stderr[1], STDERR_FILENO); @@ -621,7 +621,7 @@ static int app_exec(struct ast_channel *chan, const char *data) return res; } -static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, +static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, struct ast_iostream *eivr_events, struct ast_iostream *eivr_commands, struct ast_iostream *eivr_errors, @@ -658,14 +658,14 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, break; } } - + ready_fd = 0; ms = 100; errno = 0; exception = 0; - + rchan = ast_waitfor_nandfds(&chan, 1, waitfds, (eivr_errors) ? 2 : 1, &exception, &ready_fd, &ms); - + if (ast_channel_state(chan) == AST_STATE_UP && !AST_LIST_EMPTY(&u->finishlist)) { AST_LIST_LOCK(&u->finishlist); while ((entry = AST_LIST_REMOVE_HEAD(&u->finishlist, list))) { @@ -674,7 +674,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, } AST_LIST_UNLOCK(&u->finishlist); } - + if (ast_channel_state(chan) == AST_STATE_UP && !(ast_check_hangup(chan)) && rchan) { /* the channel has something */ f = ast_read(chan); @@ -717,7 +717,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, ast_chan_log(LOG_ERROR, chan, "Child process went away\n"); break; } - + r = ast_iostream_gets(eivr_commands, input, sizeof(input)); if (r <= 0) { if (r == 0) { @@ -874,7 +874,7 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, ast_chan_log(LOG_ERROR, chan, "Child process went away\n"); break; } - + r = ast_iostream_gets(eivr_errors, input, sizeof(input)); if (r > 0) { ast_chan_log(LOG_NOTICE, chan, "stderr: %s\n", ast_strip(input)); @@ -882,15 +882,15 @@ static int eivr_comm(struct ast_channel *chan, struct ivr_localuser *u, ast_chan_log(LOG_ERROR, chan, "Child process went away\n"); break; } - } else if ((ready_fd < 0) && ms) { + } else if ((ready_fd < 0) && ms) { if (errno == 0 || errno == EINTR) continue; - + ast_chan_log(LOG_ERROR, chan, "Wait failed (%s)\n", strerror(errno)); break; } } - + return res; } @@ -905,4 +905,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "External IVR Interface Application"); - diff --git a/apps/app_fax.c b/apps/app_fax.c index b7c39454f9..540e8e35c8 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -2,7 +2,7 @@ * Asterisk -- An open source telephony toolkit. * * Simple fax applications - * + * * 2007-2008, Dmitry Andrianov * * Code based on original implementation by Steve Underwood @@ -100,12 +100,12 @@ Filename of TIFF file save incoming fax - Makes the application behave as the calling machine + Makes the application behave as the calling machine (Default behavior is as answering machine) - Receives a FAX from the channel into the given filename + Receives a FAX from the channel into the given filename overwriting the file if it already exists. File created will be in TIFF format. @@ -282,7 +282,7 @@ static int set_logging(logging_state_t *state) int level = SPAN_LOG_WARNING + option_debug; span_log_set_message_handler(state, span_message); - span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); + span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level); return 0; } @@ -328,7 +328,7 @@ static int fax_generator_generate(struct ast_channel *chan, void *data, int len, fax_state_t *fax = (fax_state_t*) data; uint8_t buffer[AST_FRIENDLY_OFFSET + MAX_SAMPLES * sizeof(uint16_t)]; int16_t *buf = (int16_t *) (buffer + AST_FRIENDLY_OFFSET); - + struct ast_frame outf = { .frametype = AST_FRAME_VOICE, .subclass.format = ast_format_slin, @@ -339,7 +339,7 @@ static int fax_generator_generate(struct ast_channel *chan, void *data, int len, ast_log(LOG_WARNING, "Only generating %d samples, where %d requested\n", MAX_SAMPLES, samples); samples = MAX_SAMPLES; } - + if ((len = fax_tx(fax, buf, samples)) > 0) { outf.samples = len; AST_FRAME_SET_BUFFER(&outf, buffer, AST_FRIENDLY_OFFSET, len * sizeof(int16_t)); @@ -779,14 +779,14 @@ static int transmit(fax_session *s) /* Clear all channel variables which to be set by the application. Pre-set status to error so in case of any problems we can just leave */ - pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "FAILED"); - pbx_builtin_setvar_helper(s->chan, "FAXERROR", "Channel problems"); + pbx_builtin_setvar_helper(s->chan, "FAXSTATUS", "FAILED"); + pbx_builtin_setvar_helper(s->chan, "FAXERROR", "Channel problems"); pbx_builtin_setvar_helper(s->chan, "FAXMODE", NULL); pbx_builtin_setvar_helper(s->chan, "REMOTESTATIONID", NULL); pbx_builtin_setvar_helper(s->chan, "FAXPAGES", "0"); pbx_builtin_setvar_helper(s->chan, "FAXRESOLUTION", NULL); - pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", NULL); + pbx_builtin_setvar_helper(s->chan, "FAXBITRATE", NULL); if (ast_channel_state(s->chan) != AST_STATE_UP) { /* Shouldn't need this, but checking to see if channel is already answered @@ -800,8 +800,8 @@ static int transmit(fax_session *s) s->t38state = ast_channel_get_t38_state(s->chan); if (s->t38state != T38_STATE_NEGOTIATED) { - /* T38 is not negotiated on the channel yet. First start regular transmission. If it switches to T38, follow */ - pbx_builtin_setvar_helper(s->chan, "FAXMODE", "audio"); + /* T38 is not negotiated on the channel yet. First start regular transmission. If it switches to T38, follow */ + pbx_builtin_setvar_helper(s->chan, "FAXMODE", "audio"); res = transmit_audio(s); if (res > 0) { /* transmit_audio reports switchover to T38. Update t38state */ @@ -813,7 +813,7 @@ static int transmit(fax_session *s) } if (s->t38state == T38_STATE_NEGOTIATED) { - pbx_builtin_setvar_helper(s->chan, "FAXMODE", "T38"); + pbx_builtin_setvar_helper(s->chan, "FAXMODE", "T38"); res = transmit_t38(s); } @@ -857,7 +857,7 @@ static int sndfax_exec(struct ast_channel *chan, const char *data) parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); - + session.caller_mode = TRUE; if (args.options) { @@ -926,7 +926,7 @@ static int rcvfax_exec(struct ast_channel *chan, const char *data) parse = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, parse); - + session.caller_mode = FALSE; if (args.options) { @@ -973,8 +973,8 @@ static int unload_module(void) { int res; - res = ast_unregister_application(app_sndfax_name); - res |= ast_unregister_application(app_rcvfax_name); + res = ast_unregister_application(app_sndfax_name); + res |= ast_unregister_application(app_rcvfax_name); return res; } @@ -998,5 +998,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Simple FAX Application", .load = load_module, .unload = unload_module, ); - - diff --git a/apps/app_festival.c b/apps/app_festival.c index 715437e7e3..d682b1cfe5 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -23,7 +23,7 @@ * \author Christos Ricudis * * \extref The Festival Speech Synthesis System - http://www.cstr.ed.ac.uk/projects/festival/ - * + * * \ingroup applications */ @@ -31,7 +31,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page festival.conf festival.conf * \verbinclude festival.conf.sample */ @@ -196,7 +196,7 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in ast_answer(chan); ast_stopstream(chan); ast_indicate(chan, -1); - + owriteformat = ao2_bump(ast_channel_writeformat(chan)); res = ast_set_write_format(chan, ast_format_slin); if (res < 0) { @@ -210,7 +210,7 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in myf.f.offset = AST_FRIENDLY_OFFSET; myf.f.src = __PRETTY_FUNCTION__; myf.f.data.ptr = myf.frdata; - + res = send_waveform_to_fd(waveform, length, fds[1]); if (res >= 0) { /* Order is important -- there's almost always going to be mp3... we want to prioritize the @@ -306,8 +306,8 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) int strln; int fdesc = -1; char buffer[16384]; - int seekpos = 0; - char *data; + int seekpos = 0; + char *data; struct ast_config *cfg; char *newfestivalcommand; struct ast_flags config_flags = { 0 }; @@ -379,13 +379,13 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) newfestivalcommand[j] = '\0'; festivalcommand = newfestivalcommand; } - + if (args.interrupt && !strcasecmp(args.interrupt, "any")) args.interrupt = AST_DIGIT_ANY; ast_debug(1, "Text passed to festival server : %s\n", args.text); /* Connect to local festival server */ - + fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (fd < 0) { @@ -425,7 +425,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) MD5Final(MD5Res, &md5ctx); MD5Hex[0] = '\0'; - /* Convert to HEX and look if there is any matching file in the cache + /* Convert to HEX and look if there is any matching file in the cache directory */ for (i = 0; i < 16; i++) { snprintf(koko, sizeof(koko), "%X", (unsigned)MD5Res[i]); @@ -462,7 +462,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno)); } bigstring[strln] = 0; - if (strcmp(bigstring, args.text) == 0) { + if (strcmp(bigstring, args.text) == 0) { readcache = 1; } else { ast_log(LOG_WARNING, "Strings do not match\n"); @@ -485,7 +485,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) fflush(fs); fclose(fs); } - + /* Write to cache and then pass it down */ if (writecache == 1) { ast_debug(1, "Writing result to cache...\n"); @@ -499,7 +499,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) fd = open(cachefile, O_RDWR); lseek(fd, seekpos, SEEK_SET); } - + ast_debug(1, "Passing data to channel...\n"); /* Read back info from server */ @@ -556,8 +556,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) @@ -576,4 +576,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Simple Festival Interface"); - diff --git a/apps/app_flash.c b/apps/app_flash.c index f92b68d068..d55993e06d 100644 --- a/apps/app_flash.c +++ b/apps/app_flash.c @@ -21,10 +21,10 @@ * \brief App to flash a DAHDI trunk * * \author Mark Spencer - * + * * \ingroup applications */ - + /*** MODULEINFO dahdi core @@ -81,7 +81,7 @@ static int flash_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "%s is not a DAHDI channel\n", ast_channel_name(chan)); return -1; } - + memset(&dahdip, 0, sizeof(dahdip)); res = ioctl(ast_channel_fd(chan, 0), DAHDI_GET_PARAMS, &dahdip); if (!res) { @@ -116,4 +116,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Flash channel application"); - diff --git a/apps/app_followme.c b/apps/app_followme.c index 578118ad38..7b47f4dbb8 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -2,7 +2,7 @@ * Asterisk -- An open source telephony toolkit. * * A full-featured Find-Me/Follow-Me Application - * + * * Copyright (C) 2005-2006, BJ Weschke All Rights Reserved. * * BJ Weschke @@ -30,7 +30,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page followme.conf followme.conf * \verbinclude followme.conf.sample */ @@ -338,15 +338,15 @@ static void init_profile(struct call_followme *f, int activate) } } - - + + /*! \brief Set parameter in profile from configuration file */ static void profile_set_param(struct call_followme *f, const char *param, const char *val, int linenum, int failunknown) { - if (!strcasecmp(param, "musicclass") || !strcasecmp(param, "musiconhold") || !strcasecmp(param, "music")) + if (!strcasecmp(param, "musicclass") || !strcasecmp(param, "musiconhold") || !strcasecmp(param, "music")) ast_copy_string(f->moh, val, sizeof(f->moh)); - else if (!strcasecmp(param, "context")) + else if (!strcasecmp(param, "context")) ast_copy_string(f->context, val, sizeof(f->context)); else if (!strcasecmp(param, "enable_callee_prompt")) f->enable_callee_prompt = ast_true(val); @@ -356,15 +356,15 @@ static void profile_set_param(struct call_followme *f, const char *param, const ast_copy_string(f->nextindp, val, sizeof(f->nextindp)); else if (!strcasecmp(param, "call-from-prompt") || !strcasecmp(param, "call_from_prompt")) ast_copy_string(f->callfromprompt, val, sizeof(f->callfromprompt)); - else if (!strcasecmp(param, "followme-norecording-prompt") || !strcasecmp(param, "norecording_prompt")) + else if (!strcasecmp(param, "followme-norecording-prompt") || !strcasecmp(param, "norecording_prompt")) ast_copy_string(f->norecordingprompt, val, sizeof(f->norecordingprompt)); - else if (!strcasecmp(param, "followme-options-prompt") || !strcasecmp(param, "options_prompt")) + else if (!strcasecmp(param, "followme-options-prompt") || !strcasecmp(param, "options_prompt")) ast_copy_string(f->optionsprompt, val, sizeof(f->optionsprompt)); else if (!strcasecmp(param, "followme-pls-hold-prompt") || !strcasecmp(param, "pls_hold_prompt")) ast_copy_string(f->plsholdprompt, val, sizeof(f->plsholdprompt)); - else if (!strcasecmp(param, "followme-status-prompt") || !strcasecmp(param, "status_prompt")) + else if (!strcasecmp(param, "followme-status-prompt") || !strcasecmp(param, "status_prompt")) ast_copy_string(f->statusprompt, val, sizeof(f->statusprompt)); - else if (!strcasecmp(param, "followme-sorry-prompt") || !strcasecmp(param, "sorry_prompt")) + else if (!strcasecmp(param, "followme-sorry-prompt") || !strcasecmp(param, "sorry_prompt")) ast_copy_string(f->sorryprompt, val, sizeof(f->sorryprompt)); else if (failunknown) { if (linenum >= 0) @@ -537,7 +537,7 @@ static int reload_followme(int reload) numorder = atoi(tmp); if (numorder < 0) numorder = 0; - } else + } else numorder = 0; } else { timeout = 25; @@ -546,7 +546,7 @@ static int reload_followme(int reload) if (!numorder) { idx = 1; - AST_LIST_TRAVERSE(&f->numbers, nm, entry) + AST_LIST_TRAVERSE(&f->numbers, nm, entry) idx++; numorder = idx; } @@ -561,7 +561,7 @@ static int reload_followme(int reload) var = var->next; } /* End while(var) loop */ - if (!new) + if (!new) ast_mutex_unlock(&f->lock); else AST_RWLIST_INSERT_HEAD(&followmes, f, entry); @@ -599,7 +599,7 @@ static void clear_caller(struct findme_user *tmpuser) tmpuser->ochan = NULL; } -static void clear_unanswered_calls(struct findme_user_listptr *findme_user_list) +static void clear_unanswered_calls(struct findme_user_listptr *findme_user_list) { struct findme_user *tmpuser; @@ -641,7 +641,7 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us char *callfromname; char *pressbuttonname; - /* ------------ wait_for_winner_channel start --------------- */ + /* ------------ wait_for_winner_channel start --------------- */ callfromname = ast_strdupa(tpargs->callfromprompt); pressbuttonname = ast_strdupa(tpargs->optionsprompt); @@ -650,7 +650,7 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us for (;;) { to = 1000; - pos = 1; + pos = 1; livechannels = 0; watchers[0] = caller; @@ -802,7 +802,7 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us ast_channel_publish_dial(caller, winner, NULL, "ANSWER"); publish_dial_end_event(caller, findme_user_list, winner, "CANCEL"); tmpuser->answered = 1; - /* If call has been answered, then the eventual hangup is likely to be normal hangup */ + /* If call has been answered, then the eventual hangup is likely to be normal hangup */ ast_channel_hangupcause_set(winner, AST_CAUSE_NORMAL_CLEARING); ast_channel_hangupcause_set(caller, AST_CAUSE_NORMAL_CLEARING); if (tpargs->enable_callee_prompt) { @@ -952,7 +952,7 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us f->subclass.integer, ast_channel_name(winner)); break; } - } + } if (!tpargs->enable_callee_prompt && tmpuser) { ast_debug(1, "Taking call with no prompt\n"); ast_frfree(f); @@ -1408,7 +1408,7 @@ static int app_exec(struct ast_channel *chan, const char *data) ast_copy_string(targs->plsholdprompt, f->plsholdprompt, sizeof(targs->plsholdprompt)); ast_copy_string(targs->statusprompt, f->statusprompt, sizeof(targs->statusprompt)); ast_copy_string(targs->sorryprompt, f->sorryprompt, sizeof(targs->sorryprompt)); - /* Copy the numbers we're going to use into another list in case the master list should get modified + /* Copy the numbers we're going to use into another list in case the master list should get modified (and locked) while we're trying to do a follow-me */ AST_LIST_HEAD_INIT_NOLOCK(&targs->cnumbers); AST_LIST_TRAVERSE(&f->numbers, nm, entry) { @@ -1608,8 +1608,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c index 5946c5009b..73963f3e16 100644 --- a/apps/app_forkcdr.c +++ b/apps/app_forkcdr.c @@ -22,7 +22,7 @@ * \author Anthony Minessale anthmct@yahoo.com * * \note Development of this app Sponsored/Funded by TAAN Softworks Corp - * + * * \ingroup applications */ diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index da0d3e67f2..e0b9f12393 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -21,7 +21,7 @@ * \brief Get ADSI CPE ID * * \author Mark Spencer - * + * * \ingroup applications */ @@ -104,7 +104,7 @@ static int cpeid_exec(struct ast_channel *chan, const char *idata) cpeid[0], cpeid[1], cpeid[2], cpeid[3]); else strcpy(data[1], "CPEID Unknown"); - if (gotgeometry) + if (gotgeometry) snprintf(data[2], 80, "Geom: %dx%d, %d buttons", width, height, buttons); else strcpy(data[2], "Geometry unknown"); diff --git a/apps/app_ices.c b/apps/app_ices.c index 1194384d4e..3be90c29b9 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -21,7 +21,7 @@ * \brief Stream to an icecast server via ICES (see contrib/asterisk-ices.xml) * * \author Mark Spencer - * + * * ICES - http://www.icecast.org/ices.php * * \ingroup applications @@ -30,7 +30,7 @@ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include @@ -77,7 +77,7 @@ static int icesencode(char *filename, int fd) int res; res = ast_safe_fork(0); - if (res < 0) + if (res < 0) ast_log(LOG_WARNING, "Fork failed\n"); if (res) { return res; @@ -88,8 +88,8 @@ static int icesencode(char *filename, int fd) dup2(fd, STDIN_FILENO); ast_close_fds_above_n(STDERR_FILENO); - /* Most commonly installed in /usr/local/bin - * But many places has it in /usr/bin + /* Most commonly installed in /usr/local/bin + * But many places has it in /usr/bin * As a last-ditch effort, try to use PATH */ execl(path_LOCAL "ices2", "ices", filename, SENTINEL); @@ -122,18 +122,18 @@ static int ices_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n"); return -1; } - + if (pipe(fds)) { ast_log(LOG_WARNING, "Unable to create pipe\n"); return -1; } ast_fd_set_flags(fds[1], O_NONBLOCK); - + ast_stopstream(chan); if (ast_channel_state(chan) != AST_STATE_UP) res = ast_answer(chan); - + if (res) { close(fds[0]); close(fds[1]); @@ -154,10 +154,10 @@ static int ices_exec(struct ast_channel *chan, const char *data) ast_copy_string(filename, (char *) data, sizeof(filename)); else snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_CONFIG_DIR, (char *)data); - /* Placeholder for options */ + /* Placeholder for options */ c = strchr(filename, '|'); if (c) - *c = '\0'; + *c = '\0'; res = icesencode(filename, fds[0]); if (res >= 0) { pid = res; @@ -212,4 +212,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices"); - diff --git a/apps/app_image.c b/apps/app_image.c index b817309c71..b9087b766d 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -21,14 +21,14 @@ * \brief App to transmit an image * * \author Mark Spencer - * + * * \ingroup applications */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include "asterisk/pbx.h" @@ -90,7 +90,7 @@ static int sendimage_exec(struct ast_channel *chan, const char *data) } else { pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "FAILURE"); } - + return 0; } @@ -105,4 +105,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Image Transmission Application"); - diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c index 38134e2474..78aeca67f0 100644 --- a/apps/app_ivrdemo.c +++ b/apps/app_ivrdemo.c @@ -21,7 +21,7 @@ * \brief IVR Demo application * * \author Mark Spencer - * + * * \ingroup applications */ @@ -62,7 +62,7 @@ static int ivr_demo_func(struct ast_channel *chan, void *data) return 0; } -AST_IVR_DECLARE_MENU(ivr_submenu, "IVR Demo Sub Menu", 0, +AST_IVR_DECLARE_MENU(ivr_submenu, "IVR Demo Sub Menu", 0, { { "s", AST_ACTION_BACKGROUND, "demo-abouttotry" }, { "s", AST_ACTION_WAITOPTION }, @@ -77,7 +77,7 @@ AST_IVR_DECLARE_MENU(ivr_submenu, "IVR Demo Sub Menu", 0, { NULL } }); -AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0, +AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0, { { "s", AST_ACTION_BACKGROUND, "demo-congrats" }, { "g", AST_ACTION_BACKGROUND, "demo-instruct" }, @@ -96,12 +96,12 @@ static int skel_exec(struct ast_channel *chan, const char *data) { int res=0; char *tmp; - + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "skel requires an argument (filename)\n"); return -1; } - + tmp = ast_strdupa(data); /* Do our thing here */ @@ -110,7 +110,7 @@ static int skel_exec(struct ast_channel *chan, const char *data) res = ast_answer(chan); if (!res) res = ast_ivr_menu_run(chan, &ivr_demo, tmp); - + return res; } @@ -125,4 +125,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "IVR Demo Application"); - diff --git a/apps/app_jack.c b/apps/app_jack.c index bd96434033..160997249a 100644 --- a/apps/app_jack.c +++ b/apps/app_jack.c @@ -1050,4 +1050,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "JACK Interface"); - diff --git a/apps/app_macro.c b/apps/app_macro.c index c6f051ea09..de9b15c208 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -21,7 +21,7 @@ * \brief Dial plan macro Implementation * * \author Mark Spencer - * + * * \ingroup applications */ @@ -282,16 +282,16 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive if ((s = pbx_builtin_getvar_helper(chan, "MACRO_RECURSION"))) { sscanf(s, "%30d", &maxdepth); } - + /* Count how many levels deep the rabbit hole goes */ if ((s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH"))) { sscanf(s, "%30d", &depth); } - + /* Used for detecting whether to return when a Macro is called from another Macro after hangup */ if (strcmp(ast_channel_exten(chan), "h") == 0) pbx_builtin_setvar_helper(chan, "MACRO_IN_HANGUP", "1"); - + if ((inhangupc = pbx_builtin_getvar_helper(chan, "MACRO_IN_HANGUP"))) { sscanf(inhangupc, "%30d", &inhangup); } @@ -379,7 +379,7 @@ static int _macro_exec(struct ast_channel *chan, const char *data, int exclusive save_macro_priority = ast_strdup(pbx_builtin_getvar_helper(chan, "MACRO_PRIORITY")); snprintf(pc, sizeof(pc), "%d", oldpriority); pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", pc); - + save_macro_offset = ast_strdup(pbx_builtin_getvar_helper(chan, "MACRO_OFFSET")); pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL); @@ -620,7 +620,7 @@ static int macroexclusive_exec(struct ast_channel *chan, const char *data) return _macro_exec(chan, data, 1); } -static int macroif_exec(struct ast_channel *chan, const char *data) +static int macroif_exec(struct ast_channel *chan, const char *data) { char *expr = NULL, *label_a = NULL, *label_b = NULL; int res = 0; @@ -636,14 +636,14 @@ static int macroif_exec(struct ast_channel *chan, const char *data) } if (pbx_checkcondition(expr)) res = macro_exec(chan, label_a); - else if (label_b) + else if (label_b) res = macro_exec(chan, label_b); } else ast_log(LOG_WARNING, "Invalid Syntax.\n"); return res; } - + static int macro_exit_exec(struct ast_channel *chan, const char *data) { return MACRO_EXIT_RESULT; diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 5567fe0366..634eac8203 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -25,7 +25,7 @@ * * \author Mark Spencer * \author (SLA) Russell Bryant - * + * * \ingroup applications */ @@ -33,7 +33,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page meetme.conf meetme.conf * \verbinclude meetme.conf.sample */ @@ -695,7 +695,7 @@ enum { CONFFLAG_TALKER = (1 << 4), /*! If set there will be no enter or leave sounds */ CONFFLAG_QUIET = (1 << 5), - /*! If set, when user joins the conference, they will be told the number + /*! If set, when user joins the conference, they will be told the number * of users that are already in */ CONFFLAG_ANNOUNCEUSERCOUNT = (1 << 6), /*! Set to run AGI Script in Background */ @@ -723,10 +723,10 @@ enum { CONFFLAG_ALWAYSPROMPT = (1 << 20), /*! If set, treat talking users as muted users */ CONFFLAG_OPTIMIZETALKER = (1 << 21), - /*! If set, won't speak the extra prompt when the first person + /*! If set, won't speak the extra prompt when the first person * enters the conference */ CONFFLAG_NOONLYPERSON = (1 << 22), - /*! If set, user will be asked to record name on entry of conference + /*! If set, user will be asked to record name on entry of conference * without review */ CONFFLAG_INTROUSERNOREVIEW = (1 << 23), /*! If set, the user will be initially self-muted */ @@ -741,7 +741,7 @@ enum { CONFFLAG_DURATION_LIMIT = (1 << 30), }; -/* These flags are defined separately because we ran out of bits that an enum can be used to represent. +/* These flags are defined separately because we ran out of bits that an enum can be used to represent. If you add new flags, be sure to do it in the same way that these are. */ /*! Do not write any audio to this channel until the state is up. */ #define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31) @@ -942,9 +942,9 @@ struct sla_trunk_ref; struct sla_station { AST_RWLIST_ENTRY(sla_station) entry; AST_DECLARE_STRING_FIELDS( - AST_STRING_FIELD(name); - AST_STRING_FIELD(device); - AST_STRING_FIELD(autocontext); + AST_STRING_FIELD(name); + AST_STRING_FIELD(device); + AST_STRING_FIELD(autocontext); ); AST_LIST_HEAD_NOLOCK(, sla_trunk_ref) trunks; struct ast_dial *dial; @@ -982,7 +982,7 @@ struct sla_trunk { AST_DECLARE_STRING_FIELDS( AST_STRING_FIELD(name); AST_STRING_FIELD(device); - AST_STRING_FIELD(autocontext); + AST_STRING_FIELD(autocontext); ); AST_LIST_HEAD_NOLOCK(, sla_station_ref) stations; /*! Number of stations that use this trunk */ @@ -1051,7 +1051,7 @@ struct sla_event { AST_LIST_ENTRY(sla_event) entry; }; -/*! \brief A station that failed to be dialed +/*! \brief A station that failed to be dialed * \note Only used by the SLA thread. */ struct sla_failed_station { struct sla_station *station; @@ -1105,7 +1105,7 @@ static struct { * when in a conference */ static int audio_buffers; -/*! \brief Map 'volume' levels from -5 through +5 into decibel (dB) +/*! \brief Map 'volume' levels from -5 through +5 into decibel (dB) * settings for channel drivers. * * \note these are not a straight linear-to-dB @@ -1401,7 +1401,7 @@ static const char *istalking(int x) return "(talking)"; else if (x < 0) return "(unmonitored)"; - else + else return "(not talking)"; } @@ -1460,7 +1460,7 @@ static void tweak_volume(struct volume *vol, enum volume_action action) { switch (action) { case VOL_UP: - switch (vol->desired) { + switch (vol->desired) { case 5: break; case 0: @@ -1560,7 +1560,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu AST_LIST_UNLOCK(&confs); - if (!res) + if (!res) ast_autoservice_stop(chan); } @@ -1615,7 +1615,7 @@ static struct ast_conference *build_conf(const char *confno, const char *pin, AST_LIST_LOCK(&confs); AST_LIST_TRAVERSE(&confs, cnf, list) { - if (!strcmp(confno, cnf->confno)) + if (!strcmp(confno, cnf->confno)) break; } @@ -1705,7 +1705,7 @@ static struct ast_conference *build_conf(const char *confno, const char *pin, /* Reserve conference number in map */ if ((sscanf(cnf->confno, "%30d", &confno_int) == 1) && (confno_int >= 0 && confno_int < 1024)) conf_map[confno_int] = 1; - + cnfout: ao2_cleanup(cap_slin); if (cnf) @@ -1961,7 +1961,7 @@ static char *meetme_show_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_ar ast_test_flag64(&user->userflags, CONFFLAG_MONITOR) ? "(Listen only)" : "", user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : user->adminflags & ADMINFLAG_SELFMUTED ? "(Muted)" : "", user->adminflags & ADMINFLAG_T_REQUEST ? "(Request to Talk)" : "", - istalking(user->talking), hr, min, sec); + istalking(user->talking), hr, min, sec); } else { ast_cli(a->fd, "%d!%s!%s!%s!%s!%s!%s!%s!%d!%02d:%02d:%02d\n", user->user_no, @@ -2006,13 +2006,13 @@ static char *meetme_cmd_helper(struct ast_cli_args *a) /* Unlock */ ast_str_append(&cmdline, 0, ",l"); } - } else if (strcasestr(a->argv[1], "mute")) { + } else if (strcasestr(a->argv[1], "mute")) { if (strcasecmp(a->argv[1], "mute") == 0) { /* Mute */ if (strcasecmp(a->argv[3], "all") == 0) { ast_str_append(&cmdline, 0, ",N"); } else { - ast_str_append(&cmdline, 0, ",M,%s", a->argv[3]); + ast_str_append(&cmdline, 0, ",M,%s", a->argv[3]); } } else { /* Unmute */ @@ -2164,8 +2164,8 @@ static char *sla_show_trunks(struct ast_cli_entry *e, int cmd, struct ast_cli_ar "=== ==> BargeAllowed: %s\n" "=== ==> HoldAccess: %s\n" "=== ==> Stations ...\n", - trunk->name, trunk->device, - S_OR(trunk->autocontext, "(none)"), + trunk->name, trunk->device, + S_OR(trunk->autocontext, "(none)"), ring_timeout, trunk->barge_disabled ? "No" : "Yes", sla_hold_str(trunk->hold_access)); @@ -2214,7 +2214,7 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_ return NULL; } - ast_cli(a->fd, "\n" + ast_cli(a->fd, "\n" "=============================================================\n" "=== Configured SLA Stations =================================\n" "=============================================================\n" @@ -2228,11 +2228,11 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_ ao2_lock(station); if (station->ring_timeout) { - snprintf(ring_timeout, sizeof(ring_timeout), + snprintf(ring_timeout, sizeof(ring_timeout), "%u", station->ring_timeout); } if (station->ring_delay) { - snprintf(ring_delay, sizeof(ring_delay), + snprintf(ring_delay, sizeof(ring_delay), "%u", station->ring_delay); } ast_cli(a->fd, "=== ---------------------------------------------------------\n" @@ -2244,7 +2244,7 @@ static char *sla_show_stations(struct ast_cli_entry *e, int cmd, struct ast_cli_ "=== ==> HoldAccess: %s\n" "=== ==> Trunks ...\n", station->name, station->device, - S_OR(station->autocontext, "(none)"), + S_OR(station->autocontext, "(none)"), ring_timeout, ring_delay, sla_hold_str(station->hold_access)); AST_LIST_TRAVERSE(&station->trunks, trunk_ref, entry) { @@ -2356,7 +2356,7 @@ static int conf_free(struct ast_conference *conf) ast_cond_signal(&conf->announcelist_addition); ast_mutex_unlock(&conf->announcelistlock); pthread_join(conf->announcethread, NULL); - + while ((item = AST_LIST_REMOVE_HEAD(&conf->announcelist, entry))) { /* If it's a voicemail greeting file we don't want to remove it */ if (!item->vmrec){ @@ -2410,7 +2410,7 @@ static void conf_queue_dtmf(const struct ast_conference *conf, ao2_iterator_destroy(&user_iter); } -static void sla_queue_event_full(enum sla_event_type type, +static void sla_queue_event_full(enum sla_event_type type, struct sla_trunk_ref *trunk_ref, struct sla_station *station, int lock) { struct sla_event *event; @@ -3323,7 +3323,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc else exitkeys = ast_strdupa("#"); /* Default */ } - + if (ast_test_flag64(confflags, CONFFLAG_RECORDCONF)) { if (!conf->recordingfilename) { const char *var; @@ -3375,29 +3375,29 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc ast_mutex_unlock(&conf->announcethreadlock); time(&user->jointime); - + user->timelimit = timelimit; user->play_warning = play_warning; user->warning_freq = warning_freq; user->warning_sound = warning_sound; - user->end_sound = end_sound; - + user->end_sound = end_sound; + if (calldurationlimit > 0) { time(&user->kicktime); user->kicktime = user->kicktime + calldurationlimit; } - + if (ast_tvzero(user->start_time)) user->start_time = ast_tvnow(); time_left_ms = user->timelimit; - + if (user->timelimit) { nexteventts = ast_tvadd(user->start_time, ast_samp2tv(user->timelimit, 1000)); nexteventts = ast_tvsub(nexteventts, ast_samp2tv(user->play_warning, 1000)); } if (conf->locked && (!ast_test_flag64(confflags, CONFFLAG_ADMIN))) { - /* Sorry, but this conference is locked! */ + /* Sorry, but this conference is locked! */ if (!ast_streamfile(chan, "conf-locked", ast_channel_language(chan))) ast_waitstream(chan, ""); goto outrun; @@ -3407,7 +3407,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc if (rt_schedule && conf->maxusers) { if (conf->users >= conf->maxusers) { - /* Sorry, but this confernce has reached the participant limit! */ + /* Sorry, but this confernce has reached the participant limit! */ ast_mutex_unlock(&conf->playlock); if (!ast_streamfile(chan, "conf-full", ast_channel_language(chan))) ast_waitstream(chan, ""); @@ -3536,7 +3536,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc if (ast_test_flag64(confflags, CONFFLAG_ANNOUNCEUSERCOUNT) && conf->users > 1) { int keepplaying = 1; - if (conf->users == 2) { + if (conf->users == 2) { if (!ast_streamfile(chan, "conf-onlyone", ast_channel_language(chan))) { res = ast_waitstream(chan, AST_DIGIT_ANY); ast_stopstream(chan); @@ -3545,7 +3545,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc else if (res == -1) goto outrun; } - } else { + } else { if (!ast_streamfile(chan, "conf-thereare", ast_channel_language(chan))) { res = ast_waitstream(chan, AST_DIGIT_ANY); ast_stopstream(chan); @@ -3566,7 +3566,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc ast_stopstream(chan); if (res > 0) keepplaying = 0; - else if (res == -1) + else if (res == -1) goto outrun; } } @@ -3727,7 +3727,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc agifile = ast_strdupa(agifiledefault); } ast_channel_unlock(chan); - + if (user->dahdichannel) { /* Set CONFMUTE mode on DAHDI channel to mute DTMF tones */ x = 1; @@ -3832,11 +3832,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } break; } - + to = -1; if (user->timelimit) { int minutes = 0, seconds = 0, remain = 0; - + to = ast_tvdiff_ms(nexteventts, now); if (to < 0) { to = 0; @@ -3845,9 +3845,9 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc if (time_left_ms < to) { to = time_left_ms; } - + if (time_left_ms <= 0) { - if (user->end_sound) { + if (user->end_sound) { res = ast_streamfile(chan, user->end_sound, ast_channel_language(chan)); res = ast_waitstream(chan, ""); } @@ -3858,10 +3858,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } break; } - + if (!to) { - if (time_left_ms >= 5000) { - + if (time_left_ms >= 5000) { + remain = (time_left_ms + 500) / 1000; if (remain / 60 >= 1) { minutes = remain / 60; @@ -3869,11 +3869,11 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } else { seconds = remain; } - + /* force the time left to round up if appropriate */ if (user->warning_sound && user->play_warning) { if (!strcmp(user->warning_sound, "timeleft")) { - + res = ast_streamfile(chan, "vm-youhave", ast_channel_language(chan)); res = ast_waitstream(chan, ""); if (minutes) { @@ -3994,7 +3994,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc ast_moh_stop(chan); musiconhold = 0; } - if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && + if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && !ast_test_flag64(confflags, CONFFLAG_MARKEDUSER)) { if (!ast_streamfile(chan, "conf-placeintoconf", ast_channel_language(chan))) { ast_waitstream(chan, ""); @@ -4010,7 +4010,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc if (!musiconhold) { conf_start_moh(chan, optargs[OPT_ARG_MOH_CLASS]); musiconhold = 1; - } + } } else { if (musiconhold) { ast_moh_stop(chan); @@ -4018,7 +4018,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc } } } - + /* Leave if the last marked user left */ if (currentmarked == 0 && lastmarked != 0 && ast_test_flag64(confflags, CONFFLAG_MARKEDEXIT)) { if (ast_test_flag64(confflags, CONFFLAG_KICK_CONTINUE)) { @@ -4068,7 +4068,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc meetme_stasis_generate_msg(conf, chan, user, meetme_mute_type(), status_blob); } - if ((user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && + if ((user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && (user->adminflags & ADMINFLAG_T_REQUEST) && !(talkreq_manager)) { RAII_VAR(struct ast_json *, status_blob, status_to_json(1), ast_json_unref); @@ -4076,7 +4076,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc meetme_stasis_generate_msg(conf, chan, user, meetme_talk_request_type(), status_blob); } - if (!(user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && + if (!(user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED)) && !(user->adminflags & ADMINFLAG_T_REQUEST) && (talkreq_manager)) { RAII_VAR(struct ast_json *, status_blob, status_to_json(0), ast_json_unref); talkreq_manager = 0; @@ -4092,7 +4092,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc /* If I have been kicked, exit the conference */ if (user->adminflags & ADMINFLAG_KICKME) { /* You have been kicked. */ - if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && + if (!ast_test_flag64(confflags, CONFFLAG_QUIET) && !ast_streamfile(chan, "conf-kicked", ast_channel_language(chan))) { ast_waitstream(chan, ""); } @@ -4386,12 +4386,12 @@ bailoutandtrynormal: if (musiconhold) { ast_moh_stop(chan); } - + if (using_pseudo) { close(fd); } else { /* Take out of conference */ - dahdic.chan = 0; + dahdic.chan = 0; dahdic.confno = 0; dahdic.confmode = 0; if (ioctl(fd, DAHDI_SETCONF, &dahdic)) { @@ -4433,7 +4433,7 @@ bailoutandtrynormal: if (dsp) { ast_dsp_free(dsp); } - + if (user->user_no) { /* Only cleanup users who really joined! */ now = ast_tvnow(); @@ -4458,7 +4458,7 @@ bailoutandtrynormal: } } /* Remove ourselves from the container */ - ao2_unlink(conf->usercontainer, user); + ao2_unlink(conf->usercontainer, user); /* Change any states */ if (!conf->users) { @@ -4769,7 +4769,7 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, ast_log(LOG_WARNING, "No DAHDI channel available for conference, user introduction disabled (is chan_dahdi loaded?)\n"); ast_clear_flag64(confflags, CONFFLAG_INTROUSER | CONFFLAG_INTROUSERNOREVIEW | CONFFLAG_INTROUSER_VMREC); } - + if (confflags && !cnf->chan && ast_test_flag64(confflags, CONFFLAG_RECORDCONF)) { ast_log(LOG_WARNING, "No DAHDI channel available for conference, conference recording disabled (is chan_dahdi loaded?)\n"); @@ -4787,7 +4787,7 @@ static int count_exec(struct ast_channel *chan, const char *data) struct ast_conference *conf; int count; char *localdata; - char val[80] = "0"; + char val[80] = "0"; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(confno); AST_APP_ARG(varname); @@ -4797,11 +4797,11 @@ static int count_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "MeetMeCount requires an argument (conference number)\n"); return -1; } - + localdata = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, localdata); - + conf = find_conf(chan, args.confno, 0, 0, NULL, 0, 1, NULL); if (conf) { @@ -4853,13 +4853,13 @@ static int conf_exec(struct ast_channel *chan, const char *data) } else { notdata = data; } - + if (ast_channel_state(chan) != AST_STATE_UP) ast_answer(chan); info = ast_strdupa(notdata); - AST_STANDARD_APP_ARGS(args, info); + AST_STANDARD_APP_ARGS(args, info); if (args.confno) { ast_copy_string(confno, args.confno, sizeof(confno)); @@ -4867,7 +4867,7 @@ static int conf_exec(struct ast_channel *chan, const char *data) allowretry = 1; } } - + if (args.pin) ast_copy_string(the_pin, args.pin, sizeof(the_pin)); @@ -5015,12 +5015,12 @@ static int conf_exec(struct ast_channel *chan, const char *data) } if (!ast_strlen_zero(confno)) { /* Check the validity of the conference */ - cnf = find_conf(chan, confno, 1, dynamic, the_pin, + cnf = find_conf(chan, confno, 1, dynamic, the_pin, sizeof(the_pin), 1, &confflags); if (!cnf) { int too_early = 0; - cnf = find_conf_realtime(chan, confno, 1, dynamic, + cnf = find_conf_realtime(chan, confno, 1, dynamic, the_pin, sizeof(the_pin), 1, &confflags, &too_early, optargs); if (rt_schedule && too_early) allowretry = 0; @@ -5128,7 +5128,7 @@ static int conf_exec(struct ast_channel *chan, const char *data) /* No pin required */ allowretry = 0; - /* For RealTime conferences without a pin + /* For RealTime conferences without a pin * should still support loading options */ if (!ast_strlen_zero(cnf->useropts)) { @@ -5147,7 +5147,7 @@ static int conf_exec(struct ast_channel *chan, const char *data) if (cnf) dispose_conf(cnf); - + return res; } @@ -5211,7 +5211,7 @@ static int user_chan_cb(void *obj, void *args, int flags) return 0; } -/*! \brief The MeetMeadmin application +/*! \brief The MeetMeadmin application MeetMeAdmin(confno, command, caller) */ static int admin_exec(struct ast_channel *chan, const char *data) { @@ -5282,10 +5282,10 @@ static int admin_exec(struct ast_channel *chan, const char *data) { } switch (*args.command) { - case 76: /* L: Lock */ + case 76: /* L: Lock */ cnf->locked = 1; break; - case 108: /* l: Unlock */ + case 108: /* l: Unlock */ cnf->locked = 0; break; case 75: /* K: kick all users */ @@ -5312,19 +5312,19 @@ static int admin_exec(struct ast_channel *chan, const char *data) { } break; } - case 77: /* M: Mute */ + case 77: /* M: Mute */ user->adminflags |= ADMINFLAG_MUTED; break; case 78: /* N: Mute all (non-admin) users */ ao2_callback(cnf->usercontainer, OBJ_NODATA, user_set_muted_cb, &cnf); - break; - case 109: /* m: Unmute */ + break; + case 109: /* m: Unmute */ user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED | ADMINFLAG_T_REQUEST); break; case 110: /* n: Unmute all users */ ao2_callback(cnf->usercontainer, OBJ_NODATA, user_set_unmuted_cb, NULL); break; - case 107: /* k: Kick user */ + case 107: /* k: Kick user */ user->adminflags |= ADMINFLAG_KICKME; break; case 118: /* v: Lower all users listen volume */ @@ -5377,7 +5377,7 @@ usernotfound: return 0; } -/*! \brief The MeetMeChannelAdmin application +/*! \brief The MeetMeChannelAdmin application MeetMeChannelAdmin(channel, command) */ static int channel_admin_exec(struct ast_channel *chan, const char *data) { char *params; @@ -5392,7 +5392,7 @@ static int channel_admin_exec(struct ast_channel *chan, const char *data) { ast_log(LOG_WARNING, "MeetMeChannelAdmin requires two arguments!\n"); return -1; } - + params = ast_strdupa(data); AST_STANDARD_APP_ARGS(args, params); @@ -5412,22 +5412,22 @@ static int channel_admin_exec(struct ast_channel *chan, const char *data) { break; } } - + if (!user) { ast_log(LOG_NOTICE, "Specified user (%s) not found\n", args.channel); AST_LIST_UNLOCK(&confs); return 0; } - + /* perform the specified action */ switch (*args.command) { - case 77: /* M: Mute */ + case 77: /* M: Mute */ user->adminflags |= ADMINFLAG_MUTED; break; - case 109: /* m: Unmute */ + case 109: /* m: Unmute */ user->adminflags &= ~ADMINFLAG_MUTED; break; - case 107: /* k: Kick user */ + case 107: /* k: Kick user */ user->adminflags |= ADMINFLAG_KICKME; break; default: /* unknown command */ @@ -5436,7 +5436,7 @@ static int channel_admin_exec(struct ast_channel *chan, const char *data) { } ao2_ref(user, -1); AST_LIST_UNLOCK(&confs); - + return 0; } @@ -5635,7 +5635,7 @@ static int action_meetmelistrooms(struct mansession *s, const struct message *m) markedusers, hr, min, sec, cnf->isdynamic ? "Dynamic" : "Static", - cnf->locked ? "Yes" : "No"); + cnf->locked ? "Yes" : "No"); } AST_LIST_UNLOCK(&confs); @@ -5703,7 +5703,7 @@ static void *recordthread(void *args) s = ast_writefile(filename_buffer, cnf->recordingformat, NULL, flags, 0, AST_FILE_MODE); oldrecordingfilename = filename_buffer; } - + f = ast_read(cnf->lchan); if (!f) { res = -1; @@ -5734,7 +5734,7 @@ static void *recordthread(void *args) cnf->recording = MEETME_RECORD_OFF; if (s) ast_closestream(s); - + pthread_exit(0); } @@ -5819,25 +5819,25 @@ static void load_config_meetme(int reload) if ((sscanf(val, "%30d", &fuzzystart) != 1)) { ast_log(LOG_WARNING, "fuzzystart must be a number, not '%s'\n", val); fuzzystart = 0; - } + } } if ((val = ast_variable_retrieve(cfg, "general", "earlyalert"))) { if ((sscanf(val, "%30d", &earlyalert) != 1)) { ast_log(LOG_WARNING, "earlyalert must be a number, not '%s'\n", val); earlyalert = 0; - } + } } if ((val = ast_variable_retrieve(cfg, "general", "endalert"))) { if ((sscanf(val, "%30d", &endalert) != 1)) { ast_log(LOG_WARNING, "endalert must be a number, not '%s'\n", val); endalert = 0; - } + } } if ((val = ast_variable_retrieve(cfg, "general", "extendby"))) { if ((sscanf(val, "%30d", &extendby) != 1)) { ast_log(LOG_WARNING, "extendby must be a number, not '%s'\n", val); extendby = 0; - } + } } ast_config_destroy(cfg); @@ -5908,12 +5908,12 @@ static struct sla_trunk_ref *sla_find_trunk_ref_byname(const struct sla_station if (strcasecmp(trunk_ref->trunk->name, name)) continue; - if ( (trunk_ref->trunk->barge_disabled + if ( (trunk_ref->trunk->barge_disabled && trunk_ref->state == SLA_TRUNK_STATE_UP) || - (trunk_ref->trunk->hold_stations + (trunk_ref->trunk->hold_stations && trunk_ref->trunk->hold_access == SLA_HOLD_PRIVATE && trunk_ref->state != SLA_TRUNK_STATE_ONHOLD_BYME) || - sla_check_station_hold_access(trunk_ref->trunk, station) ) + sla_check_station_hold_access(trunk_ref->trunk, station) ) { trunk_ref = NULL; } @@ -6018,7 +6018,7 @@ static enum ast_device_state sla_state_to_devstate(enum sla_trunk_state state) return AST_DEVICE_UNKNOWN; } -static void sla_change_trunk_state(const struct sla_trunk *trunk, enum sla_trunk_state state, +static void sla_change_trunk_state(const struct sla_trunk *trunk, enum sla_trunk_state state, enum sla_which_trunk_refs inactive_only, const struct sla_trunk_ref *exclude) { struct sla_station *station; @@ -6077,7 +6077,7 @@ static void *run_station(void *data) ast_atomic_fetchadd_int((int *) &trunk_ref->trunk->active_stations, 1); ast_str_set(&conf_name, 0, "SLA_%s", trunk_ref->trunk->name); - ast_set_flag64(&conf_flags, + ast_set_flag64(&conf_flags, CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_PASS_DTMF | CONFFLAG_SLA_STATION); answer_trunk_chan(trunk_ref->chan); conf = build_conf(ast_str_buffer(conf_name), "", "", 0, 0, 1, trunk_ref->chan, NULL); @@ -6185,7 +6185,7 @@ static int sla_check_timed_out_station(const struct sla_ringing_trunk *ringing_t * \return a pointer to the selected ringing trunk, or NULL if none found * \note Assumes that sla.lock is locked */ -static struct sla_ringing_trunk *sla_choose_ringing_trunk(struct sla_station *station, +static struct sla_ringing_trunk *sla_choose_ringing_trunk(struct sla_station *station, struct sla_trunk_ref **trunk_ref, int rm) { struct sla_trunk_ref *s_trunk_ref; @@ -6213,7 +6213,7 @@ static struct sla_ringing_trunk *sla_choose_ringing_trunk(struct sla_station *st break; } AST_LIST_TRAVERSE_SAFE_END; - + if (ringing_trunk) break; } @@ -6303,8 +6303,8 @@ static void sla_handle_dial_state_event(void) AST_LIST_TRAVERSE_SAFE_END; } -/*! \brief Check to see if this station is already ringing - * \note Assumes sla.lock is locked +/*! \brief Check to see if this station is already ringing + * \note Assumes sla.lock is locked */ static int sla_check_ringing_station(const struct sla_station *station) { @@ -6374,13 +6374,13 @@ static int sla_ring_station(struct sla_ringing_trunk *ringing_trunk, struct sla_ } res = ast_dial_run(dial, ringing_trunk->trunk->chan, 1); - + /* Restore saved caller ID */ if (caller_is_saved) { ast_party_caller_free(ast_channel_caller(ringing_trunk->trunk->chan)); ast_channel_caller_set(ringing_trunk->trunk->chan, &caller); } - + if (res != AST_DIAL_RESULT_TRYING) { struct sla_failed_station *failed_station; ast_dial_destroy(dial); @@ -6436,7 +6436,7 @@ static struct sla_trunk_ref *sla_find_trunk_ref(const struct sla_station *statio * \param ringing_trunk the trunk. If NULL, the highest priority ringing trunk will be used * \return the number of ms left before the delay is complete, or INT_MAX if there is no delay */ -static int sla_check_station_delay(struct sla_station *station, +static int sla_check_station_delay(struct sla_station *station, struct sla_ringing_trunk *ringing_trunk) { RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL, ao2_cleanup); @@ -6554,7 +6554,7 @@ static void sla_handle_hold_event(struct sla_event *event) event->trunk_ref->state = SLA_TRUNK_STATE_ONHOLD_BYME; ast_devstate_changed(AST_DEVICE_ONHOLD, AST_DEVSTATE_CACHABLE, "SLA:%s_%s", event->station->name, event->trunk_ref->trunk->name); - sla_change_trunk_state(event->trunk_ref->trunk, SLA_TRUNK_STATE_ONHOLD, + sla_change_trunk_state(event->trunk_ref->trunk, SLA_TRUNK_STATE_ONHOLD, INACTIVE_TRUNK_REFS, event->trunk_ref); if (event->trunk_ref->trunk->active_stations == 1) { @@ -6712,7 +6712,7 @@ static int sla_calc_station_delays(unsigned int *timeout) continue; /* If there is no time left, then the station needs to start ringing. - * Return non-zero so that an event will be queued up an event to + * Return non-zero so that an event will be queued up an event to * make that happen. */ if (time_left <= 0) { res = 1; @@ -6950,8 +6950,8 @@ static void *dial_trunk(void *data) } snprintf(conf_name, sizeof(conf_name), "SLA_%s", trunk_ref->trunk->name); - ast_set_flag64(&conf_flags, - CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_MARKEDUSER | + ast_set_flag64(&conf_flags, + CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_MARKEDUSER | CONFFLAG_PASS_DTMF | CONFFLAG_SLA_TRUNK); conf = build_conf(conf_name, "", "", 1, 1, 1, trunk_ref->trunk->chan, NULL); @@ -7141,7 +7141,7 @@ static int sla_station_exec(struct ast_channel *chan, const char *data) trunk_ref->trunk->hold_stations = 0; sla_change_trunk_state(trunk_ref->trunk, SLA_TRUNK_STATE_IDLE, ALL_TRUNK_REFS, NULL); } - + pbx_builtin_setvar_helper(chan, "SLASTATION_STATUS", "SUCCESS"); return 0; @@ -7274,7 +7274,7 @@ static int sla_trunk_exec(struct ast_channel *chan, const char *data) pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "FAILURE"); return 0; } - ast_set_flag64(&conf_flags, + ast_set_flag64(&conf_flags, CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_MARKEDUSER | CONFFLAG_PASS_DTMF | CONFFLAG_NO_AUDIO_UNTIL_UP); if (ast_test_flag(&opt_flags, SLA_TRUNK_OPT_MOH)) { @@ -7383,9 +7383,9 @@ static void sla_station_destructor(void *obj) char hint[AST_MAX_APP]; snprintf(exten, sizeof(exten), "%s_%s", station->name, trunk_ref->trunk->name); snprintf(hint, sizeof(hint), "SLA:%s", exten); - ast_context_remove_extension(station->autocontext, exten, + ast_context_remove_extension(station->autocontext, exten, 1, sla_registrar); - ast_context_remove_extension(station->autocontext, hint, + ast_context_remove_extension(station->autocontext, hint, PRIORITY_HINT, sla_registrar); } } @@ -7735,7 +7735,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat) char hint[AST_MAX_APP]; snprintf(exten, sizeof(exten), "%s_%s", station->name, trunk_ref->trunk->name); snprintf(hint, sizeof(hint), "SLA:%s", exten); - /* Extension for this line button + /* Extension for this line button * exten => station1_line1,1,SLAStation(station1_line1) */ if (ast_add_extension(station->autocontext, 0 /* don't replace */, exten, 1, NULL, NULL, slastation_app, ast_strdup(exten), ast_free_ptr, sla_registrar)) { @@ -7743,7 +7743,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat) "for trunk '%s'!\n", station->name); return -1; } - /* Hint for this line button + /* Hint for this line button * exten => station1_line1,hint,SLA:station1_line1 */ if (ast_add_extension(station->autocontext, 0 /* don't replace */, exten, PRIORITY_HINT, NULL, NULL, hint, NULL, NULL, sla_registrar)) { @@ -7985,7 +7985,7 @@ static int acf_meetme_info(struct ast_channel *chan, const char *cmd, char *data ast_log(LOG_NOTICE, "Error: invalid keyword: '%s'\n", args.keyword); snprintf(buf, len, "0"); } else if (result == -2) { - ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); + ast_log(LOG_NOTICE, "Error: conference (%s) not found\n", args.confno); snprintf(buf, len, "0"); } @@ -8008,7 +8008,7 @@ static int load_config(int reload) static int unload_module(void) { int res = 0; - + ast_cli_unregister_multiple(cli_meetme, ARRAY_LEN(cli_meetme)); res = ast_manager_unregister("MeetmeMute"); res |= ast_manager_unregister("MeetmeUnmute"); @@ -8023,9 +8023,9 @@ static int unload_module(void) ast_devstate_prov_del("Meetme"); ast_devstate_prov_del("SLA"); - + sla_destroy(); - + res |= ast_custom_function_unregister(&meetme_info_acf); ast_unload_realtime("meetme"); @@ -8040,8 +8040,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) @@ -8086,4 +8086,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bri .reload = reload, .load_pri = AST_MODPRI_DEVSTATE_PROVIDER, ); - diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 3f076538cd..64513fe899 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -21,7 +21,7 @@ * \brief Digital Milliwatt Test * * \author Mark Spencer - * + * * \ingroup applications */ diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 159584e0bd..e9fa2118c6 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -24,7 +24,7 @@ * * A voicemail system in small building blocks, working together * based on the Comedian Mail voicemail system (app_voicemail.c). - * + * * \par See also * \arg \ref Config_minivm_examples * \arg \ref App_minivm @@ -32,10 +32,10 @@ * \ingroup applications * * \page App_minivm Asterisk Mini-voicemail - A minimal voicemail system - * + * * This is a minimal voicemail system, building blocks for something * else. It is built for multi-language systems. - * The current version is focused on accounts where voicemail is + * The current version is focused on accounts where voicemail is * forwarded to users in e-mail. It's work in progress, with loosed ends hanging * around from the old voicemail system and it's configuration. * @@ -64,19 +64,19 @@ * - General configuration in minivm.conf * - Users in realtime or configuration file * - Or configured on the command line with just the e-mail address - * + * * Voicemail accounts are identified by userid and domain * * Language codes are like setlocale - langcode_countrycode * \note Don't use language codes like the rest of Asterisk, two letter countrycode. Use - * language_country like setlocale(). - * + * language_country like setlocale(). + * * Examples: * - Swedish, Sweden sv_se * - Swedish, Finland sv_fi * - English, USA en_us * - English, GB en_gb - * + * * \par See also * \arg \ref Config_minivm * \arg \ref Config_minivm_examples @@ -777,7 +777,7 @@ static int message_template_build(const char *name, struct ast_variable *var) } else if (!strcasecmp(var->name, "charset")) { ast_copy_string(template->charset, var->value, sizeof(template->charset)); } else if (!strcasecmp(var->name, "templatefile")) { - if (template->body) + if (template->body) ast_free(template->body); template->body = message_template_parse_filebody(var->value); if (!template->body) { @@ -785,7 +785,7 @@ static int message_template_build(const char *name, struct ast_variable *var) error++; } } else if (!strcasecmp(var->name, "messagebody")) { - if (template->body) + if (template->body) ast_free(template->body); template->body = message_template_parse_emailbody(var->value); if (!template->body) { @@ -1002,7 +1002,7 @@ static void prep_email_sub_vars(struct ast_channel *channel, const struct minivm { char callerid[256]; struct ast_variable *var; - + if (!channel) { ast_log(LOG_ERROR, "No allocated channel, giving up...\n"); return; @@ -1029,7 +1029,7 @@ static void prep_email_sub_vars(struct ast_channel *channel, const struct minivm * \brief Set default values for Mini-Voicemail users */ static void populate_defaults(struct minivm_account *vmu) { - ast_copy_flags(vmu, (&globalflags), AST_FLAGS_ALL); + ast_copy_flags(vmu, (&globalflags), AST_FLAGS_ALL); ast_copy_string(vmu->attachfmt, default_vmformat, sizeof(vmu->attachfmt)); vmu->volgain = global_volgain; } @@ -1055,7 +1055,7 @@ static void vmaccounts_destroy_list(void) { struct minivm_account *this; AST_LIST_LOCK(&minivm_accounts); - while ((this = AST_LIST_REMOVE_HEAD(&minivm_accounts, list))) + while ((this = AST_LIST_REMOVE_HEAD(&minivm_accounts, list))) ast_free(this); AST_LIST_UNLOCK(&minivm_accounts); } @@ -1092,7 +1092,7 @@ static struct minivm_account *find_account(const char *domain, const char *usern if (createtemp && !vmu) { /* Create a temporary user, send e-mail and be gone */ vmu = mvm_user_alloc(); - ast_set2_flag(vmu, TRUE, MVM_ALLOCED); + ast_set2_flag(vmu, TRUE, MVM_ALLOCED); if (vmu) { ast_copy_string(vmu->username, username, sizeof(vmu->username)); ast_copy_string(vmu->domain, domain, sizeof(vmu->domain)); @@ -1117,7 +1117,7 @@ static struct minivm_account *find_user_realtime(const char *domain, const char if (!retval) return NULL; - if (username) + if (username) ast_copy_string(retval->username, username, sizeof(retval->username)); populate_defaults(retval); @@ -1260,7 +1260,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu if (type == MVM_MESSAGE_EMAIL) { if (vmu && !ast_strlen_zero(vmu->email)) { - ast_copy_string(email, vmu->email, sizeof(email)); + ast_copy_string(email, vmu->email, sizeof(email)); } else if (!ast_strlen_zero(vmu->username) && !ast_strlen_zero(vmu->domain)) snprintf(email, sizeof(email), "%s@%s", vmu->username, vmu->domain); } else if (type == MVM_MESSAGE_PAGE) { @@ -1331,7 +1331,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu struct minivm_zone *z; AST_LIST_LOCK(&minivm_zones); AST_LIST_TRAVERSE(&minivm_zones, z, list) { - if (strcmp(z->name, vmu->zonetag)) + if (strcmp(z->name, vmu->zonetag)) continue; the_zone = z; } @@ -1390,7 +1390,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu } else { fprintf(p, "From: %s <%s>\n", ast_str_quote(&str2, 0, ast_str_buffer(str1)), who); } - } + } fprintf(p, "Message-ID: \n", (unsigned int)ast_random(), vmu->username, (int)getpid(), who); @@ -1456,7 +1456,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu } else { fprintf(p, "Dear %s:\n\n\tJust wanted to let you know you were just left a %s long message \n" "in mailbox %s from %s, on %s so you might\n" - "want to check it when you get a chance. Thanks!\n\n\t\t\t\t--Asterisk\n\n", vmu->fullname, + "want to check it when you get a chance. Thanks!\n\n\t\t\t\t--Asterisk\n\n", vmu->fullname, dur, vmu->username, (cidname ? cidname : (cidnum ? cidnum : "an unknown caller")), date); ast_debug(3, "Using default message body (no template)\n-----\n"); } @@ -1530,7 +1530,7 @@ static int make_dir(char *dest, int len, const char *domain, const char *usernam * \param dest String. base directory. * \param len Int. Length base directory string. * \param domain String. Ignored if is null or empty string. - * \param username String. Ignored if is null or empty string. + * \param username String. Ignored if is null or empty string. * \param folder String. Ignored if is null or empty string. * \return 0 on failure, 1 on success. */ @@ -1580,10 +1580,10 @@ static int invent_message(struct ast_channel *chan, char *domain, char *username if (ast_fileexists(fn, NULL, NULL) > 0) { res = ast_streamfile(chan, fn, ast_channel_language(chan)); - if (res) + if (res) return -1; res = ast_waitstream(chan, ecodes); - if (res) + if (res) return res; } else { int numericusername = 1; @@ -1679,11 +1679,11 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re case '3': message_exists = 0; /* Record */ - if (recorded == 1) + if (recorded == 1) ast_verb(3, "Re-recording the message\n"); else ast_verb(3, "Recording the message\n"); - if (recorded && outsidecaller) + if (recorded && outsidecaller) cmd = ast_play_and_wait(chan, "beep"); recorded = 1; /* After an attempt has been made to record message, we have to take care of INTRO and beep for incoming messages, but not for greetings */ @@ -1905,7 +1905,7 @@ notify_cleanup: return res; } - + /*!\internal * \brief Record voicemail message, store into file prepared for sending e-mail */ static int leave_voicemail(struct ast_channel *chan, char *username, struct leave_vm_options *options) @@ -2014,17 +2014,17 @@ static int leave_voicemail(struct ast_channel *chan, char *username, struct leav "%s:%s:%s:%s:%d:%s:%s:%s:%s:%d:%s:%s\n", username, ast_channel_context(chan), - ast_channel_macrocontext(chan), + ast_channel_macrocontext(chan), ast_channel_exten(chan), ast_channel_priority(chan), ast_channel_name(chan), callerid, - date, + date, timebuf, duration, duration < global_vmminmessage ? "IGNORED" : "OK", vmu->accountcode - ); + ); fprintf(txt, "%s", logbuf); if (minivmlogfile) { ast_mutex_lock(&minivmloglock); @@ -2039,7 +2039,7 @@ static int leave_voicemail(struct ast_channel *chan, char *username, struct leav unlink(tmptxtfile); pbx_builtin_setvar_helper(chan, "MVM_RECORD_STATUS", "FAILED"); return 0; - } + } fclose(txt); /* Close log file */ if (ast_fileexists(tmptxtfile, NULL, NULL) <= 0) { ast_debug(1, "The recorded media file is gone, so we should remove the .txt file too!\n"); @@ -2163,7 +2163,7 @@ static int minivm_notify_exec(struct ast_channel *chan, const char *data) if (domain) { *domain = '\0'; domain++; - } + } if (ast_strlen_zero(domain) || ast_strlen_zero(username)) { ast_log(LOG_ERROR, "Need username@domain as argument. Sorry. Argument 0 %s\n", argv[0]); return -1; @@ -2183,7 +2183,7 @@ static int minivm_notify_exec(struct ast_channel *chan, const char *data) ast_channel_unlock(chan); /* Notify of new message to e-mail and pager */ if (!ast_strlen_zero(filename)) { - ast_channel_lock(chan); + ast_channel_lock(chan); if ((format = pbx_builtin_getvar_helper(chan, "MVM_FORMAT"))) { format = ast_strdupa(format); } @@ -2244,10 +2244,10 @@ static int minivm_record_exec(struct ast_channel *chan, const char *data) if (sscanf(opts[OPT_ARG_RECORDGAIN], "%30d", &gain) != 1) { ast_log(LOG_WARNING, "Invalid value '%s' provided for record gain option\n", opts[OPT_ARG_RECORDGAIN]); return -1; - } else + } else leave_options.record_gain = (signed char) gain; } - } + } /* Now run the appliation and good luck to you! */ res = leave_voicemail(chan, argv[0], &leave_options); @@ -2305,7 +2305,7 @@ static int minivm_greet_exec(struct ast_channel *chan, const char *data) if (domain) { *domain = '\0'; domain++; - } + } if (ast_strlen_zero(domain) || ast_strlen_zero(username)) { ast_log(LOG_ERROR, "Need username@domain as argument. Sorry. Argument: %s\n", argv[0]); return -1; @@ -2383,7 +2383,7 @@ static int minivm_greet_exec(struct ast_channel *chan, const char *data) res = 0; /* Reset */ /* Play the beginning intro if desired */ if (!ast_strlen_zero(prefile)) { - if (ast_streamfile(chan, prefile, ast_channel_language(chan)) > -1) + if (ast_streamfile(chan, prefile, ast_channel_language(chan)) > -1) res = ast_waitstream(chan, ecodes); } else { ast_debug(2, "%s doesn't exist, doing what we can\n", prefile); @@ -2470,7 +2470,7 @@ static int minivm_delete_exec(struct ast_channel *chan, const char *data) if (ast_strlen_zero(filename)) { ast_log(LOG_ERROR, "No filename given in application arguments or channel variable MVM_FILENAME\n"); return res; - } + } /* Go ahead and delete audio files from system, they're not needed any more */ /* We should look for both audio and text files here */ @@ -2542,7 +2542,7 @@ static int minivm_accmess_exec(struct ast_channel *chan, const char *data) if (domain) { *domain = '\0'; domain++; - } + } if (ast_strlen_zero(domain) || ast_strlen_zero(username)) { ast_log(LOG_ERROR, "Need username@domain as argument. Sorry. Argument 0 %s\n", argv[0]); pbx_builtin_setvar_helper(chan, "MVM_ACCMESS_STATUS", "FAILED"); @@ -2559,7 +2559,7 @@ static int minivm_accmess_exec(struct ast_channel *chan, const char *data) /* Answer channel if it's not already answered */ if (ast_channel_state(chan) != AST_STATE_UP) ast_answer(chan); - + /* Here's where the action is */ if (ast_test_flag(&flags, OPT_BUSY_GREETING)) { message = "busy"; @@ -2617,7 +2617,7 @@ static int create_vmaccount(char *name, struct ast_variable *var, int realtime) vmu = ast_calloc(1, sizeof(*vmu)); if (!vmu) return 0; - + ast_copy_string(vmu->domain, domain, sizeof(vmu->domain)); ast_copy_string(vmu->username, username, sizeof(vmu->username)); @@ -2672,7 +2672,7 @@ static int create_vmaccount(char *name, struct ast_variable *var, int realtime) var = var->next; } ast_debug(3, "...Linking account %s\n", name); - + AST_LIST_LOCK(&minivm_accounts); AST_LIST_INSERT_TAIL(&minivm_accounts, vmu, list); AST_LIST_UNLOCK(&minivm_accounts); @@ -2695,9 +2695,9 @@ static void timezone_destroy_list(void) struct minivm_zone *this; AST_LIST_LOCK(&minivm_zones); - while ((this = AST_LIST_REMOVE_HEAD(&minivm_zones, list))) + while ((this = AST_LIST_REMOVE_HEAD(&minivm_zones, list))) free_zone(this); - + AST_LIST_UNLOCK(&minivm_zones); } @@ -2719,7 +2719,7 @@ static int timezone_add(const char *zonename, const char *config) ast_free(newzone); return 0; } - + ast_copy_string(newzone->name, zonename, sizeof(newzone->name)); ast_copy_string(newzone->timezone, timezone_str, sizeof(newzone->timezone)); ast_copy_string(newzone->msg_format, msg_format, sizeof(newzone->msg_format)); @@ -2745,9 +2745,9 @@ static char *message_template_parse_filebody(const char *filename) { if (ast_strlen_zero(filename)) return NULL; - if (*filename == '/') + if (*filename == '/') ast_copy_string(filenamebuf, filename, sizeof(filenamebuf)); - else + else snprintf(filenamebuf, sizeof(filenamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, filename); if (!(fi = fopen(filenamebuf, "r"))) { @@ -2797,7 +2797,7 @@ static char *message_template_parse_emailbody(const char *configuration) } tmpread = tmpwrite + len; } - return emailbody; + return emailbody; } /*! \brief Apply general configuration options */ @@ -2849,9 +2849,9 @@ static int apply_general_options(struct ast_variable *var) } else if (!strcmp(var->name, "format")) { ast_copy_string(default_vmformat, var->value, sizeof(default_vmformat)); } else if (!strcmp(var->name, "review")) { - ast_set2_flag((&globalflags), ast_true(var->value), MVM_REVIEW); + ast_set2_flag((&globalflags), ast_true(var->value), MVM_REVIEW); } else if (!strcmp(var->name, "operator")) { - ast_set2_flag((&globalflags), ast_true(var->value), MVM_OPERATOR); + ast_set2_flag((&globalflags), ast_true(var->value), MVM_OPERATOR); } var = var->next; } @@ -2895,8 +2895,8 @@ static int load_config(int reload) global_maxsilence = 0; global_saydurationminfo = 2; ast_copy_string(default_vmformat, "wav", sizeof(default_vmformat)); - ast_set2_flag((&globalflags), FALSE, MVM_REVIEW); - ast_set2_flag((&globalflags), FALSE, MVM_OPERATOR); + ast_set2_flag((&globalflags), FALSE, MVM_REVIEW); + ast_set2_flag((&globalflags), FALSE, MVM_OPERATOR); /* Reset statistics */ memset(&global_stats, 0, sizeof(global_stats)); global_stats.reset = ast_tvnow(); @@ -2948,7 +2948,7 @@ static int load_config(int reload) template = message_template_find("email-default"); /* Load date format config for voicemail mail */ - if ((chanvar = ast_variable_retrieve(cfg, "general", "emaildateformat"))) + if ((chanvar = ast_variable_retrieve(cfg, "general", "emaildateformat"))) ast_copy_string(template->dateformat, chanvar, sizeof(template->dateformat)); if ((chanvar = ast_variable_retrieve(cfg, "general", "emailfromstring"))) ast_copy_string(template->fromaddress, chanvar, sizeof(template->fromaddress)); @@ -2956,9 +2956,9 @@ static int load_config(int reload) ast_copy_string(template->serveremail, chanvar, sizeof(template->serveremail)); if ((chanvar = ast_variable_retrieve(cfg, "general", "emailcharset"))) ast_copy_string(template->charset, chanvar, sizeof(template->charset)); - if ((chanvar = ast_variable_retrieve(cfg, "general", "emailsubject"))) + if ((chanvar = ast_variable_retrieve(cfg, "general", "emailsubject"))) ast_copy_string(template->subject, chanvar, sizeof(template->subject)); - if ((chanvar = ast_variable_retrieve(cfg, "general", "emailbody"))) + if ((chanvar = ast_variable_retrieve(cfg, "general", "emailbody"))) template->body = message_template_parse_emailbody(chanvar); template->attachment = TRUE; @@ -2972,7 +2972,7 @@ static int load_config(int reload) ast_copy_string(template->charset, chanvar, sizeof(template->charset)); if ((chanvar = ast_variable_retrieve(cfg, "general", "pagersubject"))) ast_copy_string(template->subject, chanvar,sizeof(template->subject)); - if ((chanvar = ast_variable_retrieve(cfg, "general", "pagerbody"))) + if ((chanvar = ast_variable_retrieve(cfg, "general", "pagerbody"))) template->body = message_template_parse_emailbody(chanvar); template->attachment = FALSE; @@ -3028,7 +3028,7 @@ static char *handle_minivm_list_templates(struct ast_cli_entry *e, int cmd, stru ast_cli(a->fd, HVLT_OUTPUT_FORMAT, "Template name", "Charset", "Locale", "Attach media", "Subject"); ast_cli(a->fd, HVLT_OUTPUT_FORMAT, "-------------", "-------", "------", "------------", "-------"); AST_LIST_TRAVERSE(&message_templates, this, list) { - ast_cli(a->fd, HVLT_OUTPUT_FORMAT, this->name, + ast_cli(a->fd, HVLT_OUTPUT_FORMAT, this->name, S_OR(this->charset, "-"), S_OR(this->locale, "-"), this->attachment ? "Yes" : "No", @@ -3186,7 +3186,7 @@ static char *handle_minivm_show_stats(struct ast_cli_entry *e, int cmd, struct a char buf[BUFSIZ]; switch (cmd) { - + case CLI_INIT: e->command = "minivm show stats"; e->usage = @@ -3247,25 +3247,25 @@ static int minivm_account_func_read(struct ast_channel *chan, const char *cmd, c if (!strcasecmp(colname, "hasaccount")) { ast_copy_string(buf, (ast_test_flag(vmu, MVM_ALLOCED) ? "0" : "1"), len); - } else if (!strcasecmp(colname, "fullname")) { + } else if (!strcasecmp(colname, "fullname")) { ast_copy_string(buf, vmu->fullname, len); - } else if (!strcasecmp(colname, "email")) { + } else if (!strcasecmp(colname, "email")) { if (!ast_strlen_zero(vmu->email)) ast_copy_string(buf, vmu->email, len); else snprintf(buf, len, "%s@%s", vmu->username, vmu->domain); - } else if (!strcasecmp(colname, "pager")) { + } else if (!strcasecmp(colname, "pager")) { ast_copy_string(buf, vmu->pager, len); - } else if (!strcasecmp(colname, "etemplate")) { + } else if (!strcasecmp(colname, "etemplate")) { if (!ast_strlen_zero(vmu->etemplate)) ast_copy_string(buf, vmu->etemplate, len); else ast_copy_string(buf, "email-default", len); - } else if (!strcasecmp(colname, "language")) { + } else if (!strcasecmp(colname, "language")) { ast_copy_string(buf, vmu->language, len); - } else if (!strcasecmp(colname, "timezone")) { + } else if (!strcasecmp(colname, "timezone")) { ast_copy_string(buf, vmu->zonetag, len); - } else if (!strcasecmp(colname, "ptemplate")) { + } else if (!strcasecmp(colname, "ptemplate")) { if (!ast_strlen_zero(vmu->ptemplate)) ast_copy_string(buf, vmu->ptemplate, len); else @@ -3307,11 +3307,11 @@ static int vm_lock_path(const char *path) } } -/*! \brief Access counter file, lock directory, read and possibly write it again changed +/*! \brief Access counter file, lock directory, read and possibly write it again changed \param directory Directory to crate file in - \param countername filename + \param countername filename \param value If set to zero, we only read the variable - \param operand 0 to read, 1 to set new value, 2 to change + \param operand 0 to read, 1 to set new value, 2 to change \return -1 on error, otherwise counter value */ static int access_counter_file(char *directory, char *countername, int value, int operand) @@ -3351,7 +3351,7 @@ static int access_counter_file(char *directory, char *countername, int value, in counter = 0; break; } - + /* Now, write the new value to the file */ counterfile = fopen(filename, "w"); if (!counterfile) { @@ -3380,7 +3380,7 @@ static int minivm_counter_func_read(struct ast_channel *chan, const char *cmd, c if ((countername = strchr(username, ':'))) { *countername = '\0'; countername++; - } + } if ((domain = strchr(username, '@'))) { *domain = '\0'; @@ -3436,11 +3436,11 @@ static int minivm_counter_func_write(struct ast_channel *chan, const char *cmd, if ((countername = strchr(username, ':'))) { *countername = '\0'; countername++; - } + } if ((operand = strchr(countername, ':'))) { *operand = '\0'; operand++; - } + } if ((domain = strchr(username, '@'))) { *domain = '\0'; @@ -3494,7 +3494,7 @@ static int minivm_counter_func_write(struct ast_channel *chan, const char *cmd, static struct ast_cli_entry cli_minivm[] = { AST_CLI_DEFINE(handle_minivm_show_users, "List defined mini-voicemail boxes"), AST_CLI_DEFINE(handle_minivm_show_zones, "List zone message formats"), - AST_CLI_DEFINE(handle_minivm_list_templates, "List message templates"), + AST_CLI_DEFINE(handle_minivm_list_templates, "List message templates"), AST_CLI_DEFINE(handle_minivm_reload, "Reload Mini-voicemail configuration"), AST_CLI_DEFINE(handle_minivm_show_stats, "Show some mini-voicemail statistics"), AST_CLI_DEFINE(handle_minivm_show_settings, "Show mini-voicemail general settings"), @@ -3548,7 +3548,7 @@ static int reload(void) /*! \brief Reload cofiguration */ static char *handle_minivm_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - + switch (cmd) { case CLI_INIT: e->command = "minivm reload"; @@ -3559,7 +3559,7 @@ static char *handle_minivm_reload(struct ast_cli_entry *e, int cmd, struct ast_c case CLI_GENERATE: return NULL; } - + reload(); ast_cli(a->fd, "\n-- Mini voicemail re-configured \n"); return CLI_SUCCESS; @@ -3569,7 +3569,7 @@ static char *handle_minivm_reload(struct ast_cli_entry *e, int cmd, struct ast_c static int unload_module(void) { int res; - + res = ast_unregister_application(app_minivm_record); res |= ast_unregister_application(app_minivm_greet); res |= ast_unregister_application(app_minivm_notify); diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c index 048cf970f3..0a9c2087ed 100644 --- a/apps/app_morsecode.c +++ b/apps/app_morsecode.c @@ -65,7 +65,7 @@ SayPhonetic - ***/ + ***/ static const char app_morsecode[] = "Morsecode"; static const char * const morsecode[] = { @@ -185,4 +185,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Morse code"); - diff --git a/apps/app_mp3.c b/apps/app_mp3.c index 678f76d727..e48cf09a0c 100644 --- a/apps/app_mp3.c +++ b/apps/app_mp3.c @@ -24,14 +24,14 @@ * * \note Add feature to play local M3U playlist file * Vincent Li - * + * * \ingroup applications */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include @@ -81,7 +81,7 @@ static int mp3play(const char *filename, unsigned int sampling_rate, int fd) char sampling_rate_str[8]; res = ast_safe_fork(0); - if (res < 0) + if (res < 0) ast_log(LOG_WARNING, "Fork failed\n"); if (res) { return res; @@ -148,7 +148,7 @@ static int timed_read(int fd, void *data, int datalen, int timeout) return -1; } return read(fd, data, datalen); - + } static int mp3_exec(struct ast_channel *chan, const char *data) @@ -181,7 +181,7 @@ static int mp3_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "Unable to create pipe\n"); return -1; } - + ast_stopstream(chan); native_format = ast_format_cap_get_format(ast_channel_nativeformats(chan), 0); @@ -203,7 +203,7 @@ static int mp3_exec(struct ast_channel *chan, const char *data) myf.f.delivery.tv_sec = 0; myf.f.delivery.tv_usec = 0; myf.f.data.ptr = myf.frdata; - + res = mp3play(data, sampling_rate, fds[1]); if (!strncasecmp(data, "http://", 7)) { timeout = 10000; @@ -253,20 +253,20 @@ static int mp3_exec(struct ast_channel *chan, const char *data) break; } ast_frfree(f); - } + } } } } close(fds[0]); close(fds[1]); - + if (pid > -1) kill(pid, SIGKILL); if (!res && owriteformat) ast_set_write_format(chan, owriteformat); ast_frfree(&myf.f); - + return res; } @@ -281,4 +281,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Silly MP3 Application"); - diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index 5f3bf0b92f..692093f0ff 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -21,14 +21,14 @@ * \brief Silly application to play an NBScat file -- uses nbscat8k * * \author Mark Spencer - * + * * \ingroup applications */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include @@ -105,7 +105,7 @@ static int timed_read(int fd, void *data, int datalen) return -1; } return read(fd, data, datalen); - + } static int NBScat_exec(struct ast_channel *chan, const char *data) @@ -127,7 +127,7 @@ static int NBScat_exec(struct ast_channel *chan, const char *data) ast_log(LOG_WARNING, "Unable to create socketpair\n"); return -1; } - + ast_stopstream(chan); owriteformat = ao2_bump(ast_channel_writeformat(chan)); @@ -146,7 +146,7 @@ static int NBScat_exec(struct ast_channel *chan, const char *data) myf.f.delivery.tv_sec = 0; myf.f.delivery.tv_usec = 0; myf.f.data.ptr = myf.frdata; - + res = NBScatplay(fds[1]); /* Wait 1000 ms first */ next = ast_tvnow(); @@ -193,14 +193,14 @@ static int NBScat_exec(struct ast_channel *chan, const char *data) break; } ast_frfree(f); - } + } } } } close(fds[0]); close(fds[1]); ast_frfree(&myf.f); - + if (pid > -1) kill(pid, SIGKILL); if (!res && owriteformat) @@ -221,4 +221,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Silly NBS Stream Application"); - diff --git a/apps/app_page.c b/apps/app_page.c index b522110749..5339b22a3e 100644 --- a/apps/app_page.c +++ b/apps/app_page.c @@ -441,4 +441,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Page Multiple Phones"); - diff --git a/apps/app_playback.c b/apps/app_playback.c index 7c895e3623..5303bb47d4 100644 --- a/apps/app_playback.c +++ b/apps/app_playback.c @@ -21,7 +21,7 @@ * \brief Trivial application to playback a sound file * * \author Mark Spencer - * + * * \ingroup applications */ @@ -163,7 +163,7 @@ static int s_streamwait3(const say_args_t *a, const char *fn) ast_waitstream_full(a->chan, a->ints, a->audiofd, a->ctrlfd) : ast_waitstream(a->chan, a->ints); ast_stopstream(a->chan); - return res; + return res; } /*! \brief @@ -174,7 +174,7 @@ static int do_say(say_args_t *a, const char *s, const char *options, int depth) { struct ast_variable *v; char *lang, *x, *rule = NULL; - int ret = 0; + int ret = 0; struct varshead head = { .first = NULL, .last = NULL }; struct ast_var_t *n; @@ -274,7 +274,7 @@ static int do_say(say_args_t *a, const char *s, const char *options, int depth) strcpy(fn2 + l, data); ret = do_say(a, fn2, options, depth); } - + if (ret) { break; } @@ -372,9 +372,9 @@ static int say_init_mode(const char *mode) { ast_say_enumeration_full = say_enumeration_full; #if 0 - /*! \todo XXX + /*! \todo XXX These functions doesn't exist. - say.conf.sample indicates this is working... + say.conf.sample indicates this is working... */ ast_say_digits_full = say_digits_full; ast_say_digit_str_full = say_digit_str_full; @@ -392,7 +392,7 @@ static int say_init_mode(const char *mode) { ast_log(LOG_WARNING, "unrecognized mode %s\n", mode); return -1; } - + return 0; } @@ -403,7 +403,7 @@ static char *__say_cli_init(struct ast_cli_entry *e, int cmd, struct ast_cli_arg switch (cmd) { case CLI_INIT: e->command = "say load [new|old]"; - e->usage = + e->usage = "Usage: say load [new|old]\n" " say load\n" " Report status of current say mode\n" @@ -447,7 +447,7 @@ static int playback_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(filenames); AST_APP_ARG(options); ); - + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Playback requires an argument (filename)\n"); return -1; @@ -463,7 +463,7 @@ static int playback_exec(struct ast_channel *chan, const char *data) option_say = 1; if (strcasestr(args.options, "noanswer")) option_noanswer = 1; - } + } if (ast_channel_state(chan) != AST_STATE_UP) { if (option_skip) { /* At the user's option, skip if the line is not up */ @@ -528,7 +528,7 @@ static int reload(void) } } } - + /*! \todo * XXX here we should sort rules according to the same order * we have in pbx.c so we have the same matching behaviour. @@ -547,7 +547,7 @@ static int unload_module(void) if (say_cfg) ast_config_destroy(say_cfg); - return res; + return res; } static int load_module(void) diff --git a/apps/app_queue.c b/apps/app_queue.c index af8b3b88bb..c62828cfd8 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4781,7 +4781,7 @@ static void record_abandoned(struct queue_ent *qe) if (callabandonedinsl) { qe->parent->callsabandonedinsl++; } - + qe->parent->callsabandoned++; ao2_unlock(qe->parent); @@ -11347,4 +11347,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing", .load_pri = AST_MODPRI_DEVSTATE_CONSUMER, .nonoptreq = "res_monitor", ); - diff --git a/apps/app_read.c b/apps/app_read.c index d1e14ed806..f9193571d7 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -21,14 +21,14 @@ * \brief Trivial application to read a variable * * \author Mark Spencer - * + * * \ingroup applications */ /*** MODULEINFO core ***/ - + #include "asterisk.h" #include "asterisk/file.h" @@ -144,13 +144,13 @@ static int read_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(attempts); AST_APP_ARG(timeout); ); - + pbx_builtin_setvar_helper(chan, "READSTATUS", status); if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "Read requires an argument (variable)\n"); return 0; } - + argcopy = ast_strdupa(data); AST_STANDARD_APP_ARGS(arglist, argcopy); @@ -158,7 +158,7 @@ static int read_exec(struct ast_channel *chan, const char *data) if (!ast_strlen_zero(arglist.options)) { ast_app_parse_options(read_app_options, &flags, NULL, arglist.options); } - + if (!ast_strlen_zero(arglist.attempts)) { tries = atoi(arglist.attempts); if (tries <= 0) diff --git a/apps/app_readexten.c b/apps/app_readexten.c index c406a93cba..c8c9f4863e 100644 --- a/apps/app_readexten.c +++ b/apps/app_readexten.c @@ -20,14 +20,14 @@ * \brief Trivial application to read an extension into a variable * * \author David Chappell - * + * * \ingroup applications */ /*** MODULEINFO core ***/ - + #include "asterisk.h" #include "asterisk/file.h" diff --git a/apps/app_record.c b/apps/app_record.c index b9014fed73..c4de98169e 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -28,7 +28,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" #include "asterisk/file.h" @@ -228,7 +228,7 @@ static int record_exec(struct ast_channel *chan, const char *data) struct ast_filestream *s = NULL; struct ast_frame *f = NULL; - + struct ast_dsp *sildet = NULL; /* silence detector dsp */ int totalsilence = 0; int dspsilence = 0; @@ -380,7 +380,7 @@ static int record_exec(struct ast_channel *chan, const char *data) return -1; } ast_dsp_set_threshold(sildet, ast_dsp_get_threshold_from_settings(THRESHOLD_SILENCE)); - } + } if (create_destination_directory(tmp)) { ast_log(LOG_WARNING, "Could not create directory for file %s\n", args.filename); diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c index 195a50a062..09a873af85 100644 --- a/apps/app_saycounted.c +++ b/apps/app_saycounted.c @@ -204,4 +204,3 @@ static int unload_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Decline words according to channel language"); - diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index b60c71e513..a63353e163 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -21,7 +21,7 @@ * \brief SayUnixTime application * * \author Tilghman Lesher - * + * * \ingroup applications */ @@ -66,7 +66,7 @@ - Uses some of the sound files stored in /var/lib/asterisk/sounds to construct a phrase + Uses some of the sound files stored in /var/lib/asterisk/sounds to construct a phrase saying the specified date and/or time in the specified format. @@ -173,20 +173,20 @@ static int sayunixtime_exec(struct ast_channel *chan, const char *data) static int unload_module(void) { int res; - + res = ast_unregister_application(app_sayunixtime); res |= ast_unregister_application(app_datetime); - + return res; } static int load_module(void) { int res; - + res = ast_register_application_xml(app_sayunixtime, sayunixtime_exec); res |= ast_register_application_xml(app_datetime, sayunixtime_exec); - + return res; } diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index 5ed426eee3..178b13ff03 100644 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -160,7 +160,7 @@ static int manager_play_dtmf(struct mansession *s, const struct message *m) chan = ast_channel_unref(chan); return 0; } - + if (!ast_strlen_zero(duration) && (sscanf(duration, "%30u", &duration_ms) != 1)) { astman_send_error(s, m, "Could not convert Duration parameter"); chan = ast_channel_unref(chan); diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c index 4417dec5c3..a8fe96daeb 100644 --- a/apps/app_sendtext.c +++ b/apps/app_sendtext.c @@ -21,7 +21,7 @@ * \brief App to transmit a text message * * \author Mark Spencer - * + * * \note Requires support of sending text messages from channel driver * * \ingroup applications @@ -30,7 +30,7 @@ /*** MODULEINFO core ***/ - + #include "asterisk.h" #include "asterisk/file.h" diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index 3a2225b6c8..faa221808d 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -21,7 +21,7 @@ * \brief App to set callerid presentation * * \author Mark Spencer - * + * * \ingroup applications */ @@ -108,7 +108,7 @@ static int setcallerid_pres_exec(struct ast_channel *chan, const char *data) (char *) data); return 0; } - + /* Set the combined caller id presentation. */ ast_channel_caller(chan)->id.name.presentation = pres; ast_channel_caller(chan)->id.number.presentation = pres; @@ -126,4 +126,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Set CallerID Presentation Application"); - diff --git a/apps/app_skel.c b/apps/app_skel.c index e85598a5fa..e58f6252f6 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -33,7 +33,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page app_skel.conf app_skel.conf * \verbinclude app_skel.conf.sample */ @@ -716,8 +716,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/apps/app_sms.c b/apps/app_sms.c index d053ecbe6a..88985fbc50 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -17,7 +17,7 @@ /*! \file * * \brief SMS application - ETSI ES 201 912 protocol 1 implementation - * + * * \par Development notes * \note The ETSI standards are available free of charge from ETSI at * http://pda.etsi.org/pda/queryform.asp @@ -26,7 +26,7 @@ * ES 201 912 SMS for PSTN/ISDN * TS 123 040 Technical realization of SMS * - * + * * \ingroup applications * * \author Adrian Kennard (for the original protocol 1 code) @@ -411,7 +411,7 @@ static int packsms7(unsigned char *o, int udhl, unsigned char *udh, int udl, uns for (v = 0; v < 128 && escapes[v] != u; v++); if (v < 128) { /* escaped sequence, esc + v */ /* store the low (8-b) bits in o[p], the remaining bits in o[p+1] */ - o[p] |= (27 << b); /* the low bits go into o[p] */ + o[p] |= (27 << b); /* the low bits go into o[p] */ b += 7; if (b >= 8) { b -= 8; @@ -474,13 +474,13 @@ static int packsms8(unsigned char *o, int udhl, unsigned char *udh, int udl, uns return p; } -/*! \brief takes a binary header (udhl bytes at udh) and UCS-2 - message (udl characters at ud) and packs in to o using 16 bit - UCS-2 character codes - The return value is the number of bytes packed in to o, which is - internally limited to 140 - o can be null, in which case this is used to validate or count - only if the input contains invalid characters then +/*! \brief takes a binary header (udhl bytes at udh) and UCS-2 + message (udl characters at ud) and packs in to o using 16 bit + UCS-2 character codes + The return value is the number of bytes packed in to o, which is + internally limited to 140 + o can be null, in which case this is used to validate or count + only if the input contains invalid characters then the return value is -1 */ static int packsms16(unsigned char *o, int udhl, unsigned char *udh, int udl, unsigned short *ud) { @@ -515,7 +515,7 @@ static int packsms16(unsigned char *o, int udhl, unsigned char *udh, int udl, un return p; } -/*! \brief general pack, with length and data, +/*! \brief general pack, with length and data, returns number of bytes of target used */ static int packsms(unsigned char dcs, unsigned char *base, unsigned int udhl, unsigned char *udh, int udl, unsigned short *ud) { @@ -523,7 +523,7 @@ static int packsms(unsigned char dcs, unsigned char *base, unsigned int udhl, un if (udl == 0) { *p++ = 0; /* no user data */ } else { - + int l = 0; if (is7bit(dcs)) { /* 7 bit */ if ((l = packsms7(p + 1, udhl, udh, udl, ud)) < 0) { @@ -596,8 +596,8 @@ static struct timeval unpackdate(unsigned char *i) return ast_mktime(&t, NULL); } -/*! \brief unpacks bytes (7 bit encoding) at i, len l septets, - and places in udh and ud setting udhl and udl. udh not used +/*! \brief unpacks bytes (7 bit encoding) at i, len l septets, + and places in udh and ud setting udhl and udl. udh not used if udhi not set */ static void unpacksms7(unsigned char *i, unsigned char l, unsigned char *udh, int *udhl, unsigned short *ud, int *udl, char udhi) { @@ -651,8 +651,8 @@ static void unpacksms7(unsigned char *i, unsigned char l, unsigned char *udh, in *udl = (o - ud); } -/*! \brief unpacks bytes (8 bit encoding) at i, len l septets, - * and places in udh and ud setting udhl and udl. udh not used +/*! \brief unpacks bytes (8 bit encoding) at i, len l septets, + * and places in udh and ud setting udhl and udl. udh not used * if udhi not set. */ static void unpacksms8(unsigned char *i, unsigned char l, unsigned char *udh, int *udhl, unsigned short *ud, int *udl, char udhi) @@ -679,7 +679,7 @@ static void unpacksms8(unsigned char *i, unsigned char l, unsigned char *udh, in } /*! \brief unpacks bytes (16 bit encoding) at i, len l septets, - and places in udh and ud setting udhl and udl. + and places in udh and ud setting udhl and udl. udh not used if udhi not set */ static void unpacksms16(unsigned char *i, unsigned char l, unsigned char *udh, int *udhl, unsigned short *ud, int *udl, char udhi) { @@ -1440,7 +1440,7 @@ static void sms_compose1(sms_t *h, int more) /*! \brief find and fill in next message, or send a REL if none waiting */ static void sms_nextoutgoing (sms_t * h) -{ +{ char fn[100 + NAME_MAX] = ""; DIR *d; char more = 0; @@ -1952,7 +1952,7 @@ static int sms_exec(struct ast_channel *chan, const char *data) if (ast_test_flag(&flags, OPTION_DCS)) { h.dcs = 1; } -#if 0 +#if 0 case '1': case '2': case '3': @@ -2007,7 +2007,7 @@ static int sms_exec(struct ast_channel *chan, const char *data) res = h.err; goto done; } - + if (ast_channel_state(chan) != AST_STATE_UP) { /* make sure channel is answered before any TX */ ast_answer(chan); } @@ -2064,7 +2064,7 @@ static int sms_exec(struct ast_channel *chan, const char *data) } res = h.err; /* XXX */ - /* + /* * The SMS generator data is on the stack. We _MUST_ make sure the generator * is stopped before returning from this function. */ @@ -2093,4 +2093,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "SMS/PSTN handler"); - diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index f74f7f9bd2..5c143afef3 100644 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -21,7 +21,7 @@ * \brief SoftHangup application * * \author Mark Spencer - * + * * \ingroup applications */ @@ -52,9 +52,9 @@ - + - Hangs up the requested channel. If there are no channels to + Hangs up the requested channel. If there are no channels to hangup, the application will report it. @@ -83,7 +83,7 @@ static int softhangup_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(options); ); struct ast_channel_iterator *iter; - + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SoftHangup requires an argument (Technology/resource)\n"); return 0; @@ -104,7 +104,7 @@ static int softhangup_exec(struct ast_channel *chan, const char *data) ast_channel_lock(c); ast_copy_string(name, ast_channel_name(c), sizeof(name)); if (ast_test_flag(&flags, OPTION_ALL)) { - /* CAPI is set up like CAPI[foo/bar]/clcnt */ + /* CAPI is set up like CAPI[foo/bar]/clcnt */ if (!strcmp(ast_channel_tech(c)->type, "CAPI")) { cut = strrchr(name, '/'); /* Basically everything else is Foo/Bar-Z */ diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c index 3a6a191e34..339c3161f6 100644 --- a/apps/app_speech_utils.c +++ b/apps/app_speech_utils.c @@ -107,7 +107,7 @@ and ${SPEECH_SCORE(1)}. The first argument is the sound file and the second is the timeout integer in seconds. Hangs up the channel on failure. If this is not desired, use TryExec. - + @@ -369,9 +369,9 @@ static int speech_score(struct ast_channel *chan, const char *cmd, char *data, if (data == NULL || speech == NULL || !(result = find_result(speech->results, data))) { return -1; } - + snprintf(tmp, sizeof(tmp), "%d", result->score); - + ast_copy_string(buf, tmp, len); return 0; @@ -679,10 +679,10 @@ static int speech_streamfile(struct ast_channel *chan, const char *filename, con if (!(fs = ast_openstream(chan, filename, preflang))) return -1; - + if (ast_applystream(chan, fs)) return -1; - + ast_playstream(fs); return 0; @@ -754,7 +754,7 @@ static int speech_background(struct ast_channel *chan, const char *data) if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_MAXLEN")) && !ast_strlen_zero(tmp2)) { max_dtmf_len = atoi(tmp2); } - + /* See if a terminator is specified */ if ((tmp2 = pbx_builtin_getvar_helper(chan, "SPEECH_DTMF_TERMINATOR"))) { if (ast_strlen_zero(tmp2)) @@ -973,7 +973,7 @@ static int unload_module(void) res |= ast_custom_function_unregister(&speech_engine_function); res |= ast_custom_function_unregister(&speech_results_type_function); - return res; + return res; } static int load_module(void) diff --git a/apps/app_stack.c b/apps/app_stack.c index 008627cc34..459c06df24 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -21,7 +21,7 @@ * \brief Stack applications Gosub, Return, etc. * * \author Tilghman Lesher - * + * * \ingroup applications */ @@ -31,7 +31,7 @@ ***/ #include "asterisk.h" - + #include "asterisk/pbx.h" #include "asterisk/module.h" #include "asterisk/app.h" @@ -303,7 +303,7 @@ static void gosub_release_frame(struct ast_channel *chan, struct gosub_stack_fra */ while ((vardata = AST_LIST_REMOVE_HEAD(&frame->varshead, entries))) { if (chan) - pbx_builtin_setvar_helper(chan, ast_var_name(vardata), NULL); + pbx_builtin_setvar_helper(chan, ast_var_name(vardata), NULL); ast_var_delete(vardata); } diff --git a/apps/app_statsd.c b/apps/app_statsd.c index 5f86539810..54f9511a8b 100644 --- a/apps/app_statsd.c +++ b/apps/app_statsd.c @@ -1,423 +1,423 @@ -/* - * Asterisk -- An open source telephony toolkit. - * - * Copyright (C) 2015, Digium, Inc. - * - * Tyler Cambron - * - * See http://www.asterisk.org for more information about - * the Asterisk project. Please do not directly contact - * any of the maintainers of this project for assistance; - * the project provides a web site, mailing lists and IRC - * channels for your use. - * - * This program is free software, distributed under the terms of - * the GNU General Public License Version 2. See the LICENSE file - * at the top of the source tree. - */ - - /*** MODULEINFO - res_statsd - no - extended - ***/ - -#include "asterisk.h" - -#include - -#include "asterisk/module.h" -#include "asterisk/logger.h" -#include "asterisk/app.h" -#include "asterisk/pbx.h" -#include "asterisk/strings.h" -#include "asterisk/statsd.h" - -/*** DOCUMENTATION - - - Allow statistics to be passed to the StatsD server from the dialplan. - - - - The metric type to be sent to StatsD. Valid metric types - are 'g' for gauge, 'c' for counter, 'ms' for timer, and 's' for - sets. - - - The name of the variable to be sent to StatsD. Statistic - names cannot contain the pipe (|) character. - - - The value of the variable to be sent to StatsD. Values - must be numeric. Values for gauge and counter metrics can be - sent with a '+' or '-' to update a value after the value has - been initialized. Only counters can be initialized as negative. - Sets can send a string as the value parameter, but the string - cannot contain the pipe character. - - - The value of the sample rate to be sent to StatsD. Sample - rates less than or equal to 0 will never be sent and sample rates - greater than or equal to 1 will always be sent. Any rate - between 1 and 0 will be compared to a randomly generated value, - and if it is greater than the random value, it will be sent. - - - - This dialplan application sends statistics to the StatsD - server specified inside of statsd.conf. - - - ***/ - -static const char app[] = "StatsD"; - -/*! - * \brief Check to ensure the value is within the allowed range. - * - * \param value The value of the statistic to be sent to StatsD. - * - * This function checks to see if the value given to the StatsD daialplan - * application is within the allowed range of [-2^63, 2^63] as specified by StatsD. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int value_in_range(const char *value) { - double numerical_value = strtod(value, NULL); - - if (numerical_value < pow(-2, 63) || numerical_value > pow(2, 63)) { - ast_log(AST_LOG_WARNING, "Value %lf out of range!\n", numerical_value); - return 1; - } - - return 0; -} - -/*! - * \brief Check to ensure the value is within the allowed range. - * - * \param value The value of the statistic to be sent to StatsD. - * - * This function checks to see if the value given to the StatsD daialplan - * application is within the allowed range of [0, 2^64] as specified by StatsD. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int non_neg_value_range(const char *value) { - double numerical_value = strtod(value, NULL); - - if (numerical_value < 0 || numerical_value > pow(2, 64)) { - ast_log(AST_LOG_WARNING, "Value %lf out of range!\n", numerical_value); - return 1; - } - - return 0; -} - -/*! - * \brief Check to ensure the metric type is a valid metric type. - * - * \param metric The metric type to be sent to StatsD. - * - * This function checks to see if the metric type given to the StatsD dialplan - * is a valid metric type. Metric types are determined by StatsD. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_metric(const char *metric) -{ - const char *valid_metrics[] = {"g","s","ms","c"}; - int i; - - if (ast_strlen_zero(metric)) { - ast_log(AST_LOG_ERROR, "Missing metric type argument.\n"); - return 1; - } - - for (i = 0; i < ARRAY_LEN(valid_metrics); i++) { - if (!strcmp(valid_metrics[i], metric)) { - return 0; - } - } - - ast_log(AST_LOG_ERROR, "Invalid metric type %s.\n", metric); - - return 1; -} - -/*! - * \brief Check to ensure that a numeric value is valid. - * - * \param numeric_value The numeric value to be sent to StatsD. - * - * This function checks to see if a number to be sent to StatsD is actually - * a valid number. One decimal is allowed. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_numeric(const char *numeric_value) { - const char *num; - int decimal_counter = 0; - - num = numeric_value; - while (*num) { - if (!isdigit(*num++)) { - if (strstr(numeric_value, ".") != NULL && decimal_counter == 0) { - decimal_counter++; - continue; - } - ast_log(AST_LOG_ERROR, "%s is not a number!\n", numeric_value); - return 1; - } - } - - return 0; -} - -/*! - * \brief Determines the actual value of a number by looking for a leading + or -. - * - * \param raw_value The entire numeric string to be sent to StatsD. - * - * This function checks to see if the numeric string contains valid characters - * and then isolates the actual number to be sent for validation. Returns the - * result of the numeric validation. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int determine_actual_value(const char *raw_value) { - const char *actual_value; - - if ((raw_value[0] == '+') || (raw_value[0] == '-')) { - actual_value = &raw_value[1]; - if (ast_strlen_zero(actual_value)) { - ast_log(AST_LOG_ERROR, "Value argument %s only contains a sign" - " operator.\n", raw_value); - return 1; - } - } else { - actual_value = &raw_value[0]; - } - - return validate_numeric(actual_value); -} - -/*! - * \brief Check to ensure the statistic name is valid. - * - * \param name The variable name to be sent to StatsD. - * - * This function checks to see if the statistic name given to the StatsD - * dialplan application is valid by ensuring that the name does not have any - * invalid characters. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_name(const char *name) -{ - if (ast_strlen_zero(name) || (strstr(name, "|") != NULL)) { - ast_log(AST_LOG_ERROR, "Statistic name %s is missing or contains a pipe (|)" - " character.\n", name); - return 1; - } - - return 0; -} - - -/*! - * \brief Calls the appropriate functions to validate a gauge metric. - * - * \param statistic_name The statistic name to be sent to StatsD. - * \param value The value to be sent to StatsD. - * - * This function calls other validating functions to correctly validate each - * input based on allowable input for a gauge metric. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_metric_type_gauge(const char *statistic_name, const char *value) { - - if (ast_strlen_zero(value)) { - ast_log(AST_LOG_ERROR, "Missing value argument.\n"); - return 1; - } - - if (validate_name(statistic_name) || determine_actual_value(value) - || value_in_range(value)) { - return 1; - } - - return 0; -} - -/*! - * \brief Calls the appropriate functions to validate a counter metric. - * - * \param statistic_name The statistic name to be sent to StatsD. - * \param value The value to be sent to StatsD. - * - * This function calls other validating functions to correctly validate each - * input based on allowable input for a counter metric. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_metric_type_counter(const char *statistic_name, const char *value) { - - if (ast_strlen_zero(value)) { - ast_log(AST_LOG_ERROR, "Missing value argument.\n"); - return 1; - } - - if (validate_name(statistic_name) || determine_actual_value(value) - || value_in_range(value)) { - return 1; - } - - return 0; -} - -/*! - * \brief Calls the appropriate functions to validate a timer metric. - * - * \param statistic_name The statistic name to be sent to StatsD. - * \param value The value to be sent to StatsD. - * - * This function calls other validating functions to correctly validate each - * input based on allowable input for a timer metric. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_metric_type_timer(const char *statistic_name, const char *value) { - - if (ast_strlen_zero(value)) { - ast_log(AST_LOG_ERROR, "Missing value argument.\n"); - return 1; - } - - if (validate_name(statistic_name) || validate_numeric(value) - || non_neg_value_range(value)) { - return 1; - } - - return 0; -} - -/*! - * \brief Calls the appropriate functions to validate a set metric. - * - * \param statistic_name The statistic name to be sent to StatsD. - * \param value The value to be sent to StatsD. - * - * This function calls other validating functions to correctly validate each - * input based on allowable input for a set metric. - * - * \retval zero on success. - * \retval 1 on error. - */ -static int validate_metric_type_set(const char *statistic_name, const char *value) { - if (ast_strlen_zero(value)) { - ast_log(AST_LOG_ERROR, "Missing value argument.\n"); - return 1; - } - - if (validate_name(statistic_name)) { - return 1; - } - - if (strstr(value, "|") != NULL) { - ast_log(AST_LOG_ERROR, "Pipe (|) character is not allowed for value %s" - " in a set metric.\n", value); - return 1; - } - - return 0; -} - -static int statsd_exec(struct ast_channel *chan, const char *data) -{ - char *stats; - double numerical_rate = 1.0; - - AST_DECLARE_APP_ARGS(args, - AST_APP_ARG(metric_type); - AST_APP_ARG(statistic_name); - AST_APP_ARG(value); - AST_APP_ARG(sample_rate); - ); - - if (!data) { - ast_log(AST_LOG_ERROR, "No parameters were provided. Correct format is " - "StatsD(metric_type,statistic_name,value[,sample_rate]). Sample rate is the " - "only optional parameter.\n"); - return 1; - } - - stats = ast_strdupa(data); - AST_STANDARD_APP_ARGS(args, stats); - - if (validate_metric(args.metric_type)) { - return 1; - } - - if (!strcmp(args.metric_type, "g")) { - if (validate_metric_type_gauge(args.statistic_name, args.value)) { - ast_log(AST_LOG_ERROR, "Invalid input for a gauge metric.\n"); - return 1; - } - } - else if (!strcmp(args.metric_type, "c")) { - if (validate_metric_type_counter(args.statistic_name, args.value)) { - ast_log(AST_LOG_ERROR, "Invalid input for a counter metric.\n"); - return 1; - } - } - else if (!strcmp(args.metric_type, "ms")) { - if (validate_metric_type_timer(args.statistic_name, args.value)) { - ast_log(AST_LOG_ERROR, "Invalid input for a timer metric.\n"); - return 1; - } - } - else if (!strcmp(args.metric_type, "s")) { - if (validate_metric_type_set(args.statistic_name, args.value)) { - ast_log(AST_LOG_ERROR, "Invalid input for a set metric.\n"); - return 1; - } - } - - if (args.sample_rate) { - - if (validate_numeric(args.sample_rate)) { - return 1; - } - - numerical_rate = strtod(args.sample_rate, NULL); - } - - ast_statsd_log_string(args.statistic_name, args.metric_type, args.value, - numerical_rate); - - return 0; -} - -static int unload_module(void) -{ - return ast_unregister_application(app); -} - -static int load_module(void) -{ - return ast_register_application_xml(app, statsd_exec); -} - -AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "StatsD Dialplan Application"); +/* + * Asterisk -- An open source telephony toolkit. + * + * Copyright (C) 2015, Digium, Inc. + * + * Tyler Cambron + * + * See http://www.asterisk.org for more information about + * the Asterisk project. Please do not directly contact + * any of the maintainers of this project for assistance; + * the project provides a web site, mailing lists and IRC + * channels for your use. + * + * This program is free software, distributed under the terms of + * the GNU General Public License Version 2. See the LICENSE file + * at the top of the source tree. + */ + + /*** MODULEINFO + res_statsd + no + extended + ***/ + +#include "asterisk.h" + +#include + +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/app.h" +#include "asterisk/pbx.h" +#include "asterisk/strings.h" +#include "asterisk/statsd.h" + +/*** DOCUMENTATION + + + Allow statistics to be passed to the StatsD server from the dialplan. + + + + The metric type to be sent to StatsD. Valid metric types + are 'g' for gauge, 'c' for counter, 'ms' for timer, and 's' for + sets. + + + The name of the variable to be sent to StatsD. Statistic + names cannot contain the pipe (|) character. + + + The value of the variable to be sent to StatsD. Values + must be numeric. Values for gauge and counter metrics can be + sent with a '+' or '-' to update a value after the value has + been initialized. Only counters can be initialized as negative. + Sets can send a string as the value parameter, but the string + cannot contain the pipe character. + + + The value of the sample rate to be sent to StatsD. Sample + rates less than or equal to 0 will never be sent and sample rates + greater than or equal to 1 will always be sent. Any rate + between 1 and 0 will be compared to a randomly generated value, + and if it is greater than the random value, it will be sent. + + + + This dialplan application sends statistics to the StatsD + server specified inside of statsd.conf. + + + ***/ + +static const char app[] = "StatsD"; + +/*! + * \brief Check to ensure the value is within the allowed range. + * + * \param value The value of the statistic to be sent to StatsD. + * + * This function checks to see if the value given to the StatsD daialplan + * application is within the allowed range of [-2^63, 2^63] as specified by StatsD. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int value_in_range(const char *value) { + double numerical_value = strtod(value, NULL); + + if (numerical_value < pow(-2, 63) || numerical_value > pow(2, 63)) { + ast_log(AST_LOG_WARNING, "Value %lf out of range!\n", numerical_value); + return 1; + } + + return 0; +} + +/*! + * \brief Check to ensure the value is within the allowed range. + * + * \param value The value of the statistic to be sent to StatsD. + * + * This function checks to see if the value given to the StatsD daialplan + * application is within the allowed range of [0, 2^64] as specified by StatsD. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int non_neg_value_range(const char *value) { + double numerical_value = strtod(value, NULL); + + if (numerical_value < 0 || numerical_value > pow(2, 64)) { + ast_log(AST_LOG_WARNING, "Value %lf out of range!\n", numerical_value); + return 1; + } + + return 0; +} + +/*! + * \brief Check to ensure the metric type is a valid metric type. + * + * \param metric The metric type to be sent to StatsD. + * + * This function checks to see if the metric type given to the StatsD dialplan + * is a valid metric type. Metric types are determined by StatsD. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_metric(const char *metric) +{ + const char *valid_metrics[] = {"g","s","ms","c"}; + int i; + + if (ast_strlen_zero(metric)) { + ast_log(AST_LOG_ERROR, "Missing metric type argument.\n"); + return 1; + } + + for (i = 0; i < ARRAY_LEN(valid_metrics); i++) { + if (!strcmp(valid_metrics[i], metric)) { + return 0; + } + } + + ast_log(AST_LOG_ERROR, "Invalid metric type %s.\n", metric); + + return 1; +} + +/*! + * \brief Check to ensure that a numeric value is valid. + * + * \param numeric_value The numeric value to be sent to StatsD. + * + * This function checks to see if a number to be sent to StatsD is actually + * a valid number. One decimal is allowed. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_numeric(const char *numeric_value) { + const char *num; + int decimal_counter = 0; + + num = numeric_value; + while (*num) { + if (!isdigit(*num++)) { + if (strstr(numeric_value, ".") != NULL && decimal_counter == 0) { + decimal_counter++; + continue; + } + ast_log(AST_LOG_ERROR, "%s is not a number!\n", numeric_value); + return 1; + } + } + + return 0; +} + +/*! + * \brief Determines the actual value of a number by looking for a leading + or -. + * + * \param raw_value The entire numeric string to be sent to StatsD. + * + * This function checks to see if the numeric string contains valid characters + * and then isolates the actual number to be sent for validation. Returns the + * result of the numeric validation. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int determine_actual_value(const char *raw_value) { + const char *actual_value; + + if ((raw_value[0] == '+') || (raw_value[0] == '-')) { + actual_value = &raw_value[1]; + if (ast_strlen_zero(actual_value)) { + ast_log(AST_LOG_ERROR, "Value argument %s only contains a sign" + " operator.\n", raw_value); + return 1; + } + } else { + actual_value = &raw_value[0]; + } + + return validate_numeric(actual_value); +} + +/*! + * \brief Check to ensure the statistic name is valid. + * + * \param name The variable name to be sent to StatsD. + * + * This function checks to see if the statistic name given to the StatsD + * dialplan application is valid by ensuring that the name does not have any + * invalid characters. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_name(const char *name) +{ + if (ast_strlen_zero(name) || (strstr(name, "|") != NULL)) { + ast_log(AST_LOG_ERROR, "Statistic name %s is missing or contains a pipe (|)" + " character.\n", name); + return 1; + } + + return 0; +} + + +/*! + * \brief Calls the appropriate functions to validate a gauge metric. + * + * \param statistic_name The statistic name to be sent to StatsD. + * \param value The value to be sent to StatsD. + * + * This function calls other validating functions to correctly validate each + * input based on allowable input for a gauge metric. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_metric_type_gauge(const char *statistic_name, const char *value) { + + if (ast_strlen_zero(value)) { + ast_log(AST_LOG_ERROR, "Missing value argument.\n"); + return 1; + } + + if (validate_name(statistic_name) || determine_actual_value(value) + || value_in_range(value)) { + return 1; + } + + return 0; +} + +/*! + * \brief Calls the appropriate functions to validate a counter metric. + * + * \param statistic_name The statistic name to be sent to StatsD. + * \param value The value to be sent to StatsD. + * + * This function calls other validating functions to correctly validate each + * input based on allowable input for a counter metric. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_metric_type_counter(const char *statistic_name, const char *value) { + + if (ast_strlen_zero(value)) { + ast_log(AST_LOG_ERROR, "Missing value argument.\n"); + return 1; + } + + if (validate_name(statistic_name) || determine_actual_value(value) + || value_in_range(value)) { + return 1; + } + + return 0; +} + +/*! + * \brief Calls the appropriate functions to validate a timer metric. + * + * \param statistic_name The statistic name to be sent to StatsD. + * \param value The value to be sent to StatsD. + * + * This function calls other validating functions to correctly validate each + * input based on allowable input for a timer metric. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_metric_type_timer(const char *statistic_name, const char *value) { + + if (ast_strlen_zero(value)) { + ast_log(AST_LOG_ERROR, "Missing value argument.\n"); + return 1; + } + + if (validate_name(statistic_name) || validate_numeric(value) + || non_neg_value_range(value)) { + return 1; + } + + return 0; +} + +/*! + * \brief Calls the appropriate functions to validate a set metric. + * + * \param statistic_name The statistic name to be sent to StatsD. + * \param value The value to be sent to StatsD. + * + * This function calls other validating functions to correctly validate each + * input based on allowable input for a set metric. + * + * \retval zero on success. + * \retval 1 on error. + */ +static int validate_metric_type_set(const char *statistic_name, const char *value) { + if (ast_strlen_zero(value)) { + ast_log(AST_LOG_ERROR, "Missing value argument.\n"); + return 1; + } + + if (validate_name(statistic_name)) { + return 1; + } + + if (strstr(value, "|") != NULL) { + ast_log(AST_LOG_ERROR, "Pipe (|) character is not allowed for value %s" + " in a set metric.\n", value); + return 1; + } + + return 0; +} + +static int statsd_exec(struct ast_channel *chan, const char *data) +{ + char *stats; + double numerical_rate = 1.0; + + AST_DECLARE_APP_ARGS(args, + AST_APP_ARG(metric_type); + AST_APP_ARG(statistic_name); + AST_APP_ARG(value); + AST_APP_ARG(sample_rate); + ); + + if (!data) { + ast_log(AST_LOG_ERROR, "No parameters were provided. Correct format is " + "StatsD(metric_type,statistic_name,value[,sample_rate]). Sample rate is the " + "only optional parameter.\n"); + return 1; + } + + stats = ast_strdupa(data); + AST_STANDARD_APP_ARGS(args, stats); + + if (validate_metric(args.metric_type)) { + return 1; + } + + if (!strcmp(args.metric_type, "g")) { + if (validate_metric_type_gauge(args.statistic_name, args.value)) { + ast_log(AST_LOG_ERROR, "Invalid input for a gauge metric.\n"); + return 1; + } + } + else if (!strcmp(args.metric_type, "c")) { + if (validate_metric_type_counter(args.statistic_name, args.value)) { + ast_log(AST_LOG_ERROR, "Invalid input for a counter metric.\n"); + return 1; + } + } + else if (!strcmp(args.metric_type, "ms")) { + if (validate_metric_type_timer(args.statistic_name, args.value)) { + ast_log(AST_LOG_ERROR, "Invalid input for a timer metric.\n"); + return 1; + } + } + else if (!strcmp(args.metric_type, "s")) { + if (validate_metric_type_set(args.statistic_name, args.value)) { + ast_log(AST_LOG_ERROR, "Invalid input for a set metric.\n"); + return 1; + } + } + + if (args.sample_rate) { + + if (validate_numeric(args.sample_rate)) { + return 1; + } + + numerical_rate = strtod(args.sample_rate, NULL); + } + + ast_statsd_log_string(args.statistic_name, args.metric_type, args.value, + numerical_rate); + + return 0; +} + +static int unload_module(void) +{ + return ast_unregister_application(app); +} + +static int load_module(void) +{ + return ast_register_application_xml(app, statsd_exec); +} + +AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "StatsD Dialplan Application"); diff --git a/apps/app_system.c b/apps/app_system.c index 64d529798c..05819236ce 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -21,7 +21,7 @@ * \brief Execute arbitrary system commands * * \author Mark Spencer - * + * * \ingroup applications */ @@ -147,14 +147,14 @@ static int system_exec_helper(struct ast_channel *chan, const char *data, int fa pbx_builtin_setvar_helper(chan, chanvar, "FAILURE"); res = failmode; } else { - if (res < 0) + if (res < 0) res = 0; if (res != 0) pbx_builtin_setvar_helper(chan, chanvar, "APPERROR"); else pbx_builtin_setvar_helper(chan, chanvar, "SUCCESS"); res = 0; - } + } ast_autoservice_stop(chan); diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c index fbe2ea70f4..1463b149a6 100644 --- a/apps/app_talkdetect.c +++ b/apps/app_talkdetect.c @@ -21,7 +21,7 @@ * \brief Playback a file with audio detect * * \author Mark Spencer - * + * * \ingroup applications */ @@ -171,7 +171,7 @@ static int background_detect_exec(struct ast_channel *chan, const char *data) ast_verb(3, "BackgroundDetect: Talk analysis time complete on %s.\n", ast_channel_name(chan)); } } - + if (!fr) { res = -1; break; @@ -203,8 +203,8 @@ static int background_detect_exec(struct ast_channel *chan, const char *data) char ms_str[12]; ast_debug(1, "Found qualified token of %d ms\n", ms); - /* Save detected talk time (in milliseconds) */ - snprintf(ms_str, sizeof(ms_str), "%d", ms); + /* Save detected talk time (in milliseconds) */ + snprintf(ms_str, sizeof(ms_str), "%d", ms); pbx_builtin_setvar_helper(chan, "TALK_DETECTED", ms_str); ast_goto_if_exists(chan, ast_channel_context(chan), "talk", 1); @@ -234,7 +234,7 @@ static int background_detect_exec(struct ast_channel *chan, const char *data) if (res > -1) { if (origrformat && ast_set_read_format(chan, origrformat)) { - ast_log(LOG_WARNING, "Failed to restore read format for %s to %s\n", + ast_log(LOG_WARNING, "Failed to restore read format for %s to %s\n", ast_channel_name(chan), ast_format_get_name(origrformat)); } } @@ -255,4 +255,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Playback with Talk Detection"); - diff --git a/apps/app_test.c b/apps/app_test.c index 2f0d77741f..7981dbd9a0 100644 --- a/apps/app_test.c +++ b/apps/app_test.c @@ -23,7 +23,7 @@ * * \author Mark Spencer * \author Russell Bryant - * + * * \ingroup applications */ @@ -497,4 +497,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Interface Test Application"); - diff --git a/apps/app_transfer.c b/apps/app_transfer.c index 1d7c879203..4fe3dcac06 100644 --- a/apps/app_transfer.c +++ b/apps/app_transfer.c @@ -21,7 +21,7 @@ * \brief Transfer a caller * * \author Mark Spencer - * + * * Requires transfer support from channel driver * * \ingroup applications diff --git a/apps/app_url.c b/apps/app_url.c index 185712dece..e143cab19a 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -21,14 +21,14 @@ * \brief App to transmit a URL * * \author Mark Spencer - * + * * \ingroup applications */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include "asterisk/pbx.h" @@ -104,7 +104,7 @@ static int sendurl_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(url); AST_APP_ARG(options); ); - + if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SendURL requires an argument (URL)\n"); pbx_builtin_setvar_helper(chan, "SENDURLSTATUS", status); @@ -116,7 +116,7 @@ static int sendurl_exec(struct ast_channel *chan, const char *data) AST_STANDARD_APP_ARGS(args, tmp); if (args.argc == 2) ast_app_parse_options(app_opts, &flags, opts, args.options); - + if (!ast_channel_supports_html(chan)) { /* Does not support transport */ pbx_builtin_setvar_helper(chan, "SENDURLSTATUS", "UNSUPPORTED"); @@ -132,7 +132,7 @@ static int sendurl_exec(struct ast_channel *chan, const char *data) for(;;) { /* Wait for an event */ res = ast_waitfor(chan, -1); - if (res < 0) + if (res < 0) break; f = ast_read(chan); if (!f) { @@ -161,8 +161,8 @@ static int sendurl_exec(struct ast_channel *chan, const char *data) } ast_frfree(f); } - } -out: + } +out: pbx_builtin_setvar_helper(chan, "SENDURLSTATUS", status); return res; } @@ -178,4 +178,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Send URL Applications"); - diff --git a/apps/app_userevent.c b/apps/app_userevent.c index d04e0713b0..029d17c2b3 100644 --- a/apps/app_userevent.c +++ b/apps/app_userevent.c @@ -17,7 +17,7 @@ /*! \file * * \brief UserEvent application -- send manager event - * + * * \ingroup applications */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e8b63a4016..0bcfa4f3ae 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -41,7 +41,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page voicemail.conf voicemail.conf * \verbinclude voicemail.conf.sample */ @@ -811,7 +811,7 @@ struct baseio { unsigned char iobuf[BASEMAXINLINE]; }; -/*! Structure for linked list of users +/*! Structure for linked list of users * Use ast_vm_user_destroy() to free one of these structures. */ struct ast_vm_user { char context[AST_MAX_CONTEXT]; /*!< Voicemail context */ @@ -930,7 +930,7 @@ static char odbc_table[80]; #define STORE(a,b,c,d,e,f,g,h,i,j,k) #define EXISTS(a,b,c,d) (ast_fileexists(c,NULL,d) > 0) #define RENAME(a,b,c,d,e,f,g,h) (rename_file(g,h)); -#define COPY(a,b,c,d,e,f,g,h) (copy_plain_file(g,h)); +#define COPY(a,b,c,d,e,f,g,h) (copy_plain_file(g,h)); #define DELETE(a,b,c,d) (vm_delete(c)) #define UPDATE_MSG_ID(a, b, c, d, e, f) #endif @@ -984,7 +984,7 @@ static int maxdeletedmsg; static int silencethreshold = 128; static char serveremail[80]; static char mailcmd[160]; /* Configurable mail cmd */ -static char externnotify[160]; +static char externnotify[160]; static struct ast_smdi_interface *smdi_iface = NULL; static char vmfmts[80]; static double volgain; @@ -1319,7 +1319,7 @@ static void populate_defaults(struct ast_vm_user *vmu) * \param vmu The voicemail user object to work with. * \param var The name of the property to be set. * \param value The value to be set to the property. - * + * * The property name must be one of the understood properties. See the source for details. */ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *value) @@ -1369,25 +1369,25 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v vmu->imapversion = imapversion; #endif } else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) { - ast_set2_flag(vmu, ast_true(value), VM_DELETE); + ast_set2_flag(vmu, ast_true(value), VM_DELETE); } else if (!strcasecmp(var, "saycid")){ - ast_set2_flag(vmu, ast_true(value), VM_SAYCID); + ast_set2_flag(vmu, ast_true(value), VM_SAYCID); } else if (!strcasecmp(var, "sendvoicemail")){ - ast_set2_flag(vmu, ast_true(value), VM_SVMAIL); + ast_set2_flag(vmu, ast_true(value), VM_SVMAIL); } else if (!strcasecmp(var, "review")){ ast_set2_flag(vmu, ast_true(value), VM_REVIEW); } else if (!strcasecmp(var, "tempgreetwarn")){ - ast_set2_flag(vmu, ast_true(value), VM_TEMPGREETWARN); + ast_set2_flag(vmu, ast_true(value), VM_TEMPGREETWARN); } else if (!strcasecmp(var, "messagewrap")){ - ast_set2_flag(vmu, ast_true(value), VM_MESSAGEWRAP); + ast_set2_flag(vmu, ast_true(value), VM_MESSAGEWRAP); } else if (!strcasecmp(var, "operator")) { - ast_set2_flag(vmu, ast_true(value), VM_OPERATOR); + ast_set2_flag(vmu, ast_true(value), VM_OPERATOR); } else if (!strcasecmp(var, "envelope")){ - ast_set2_flag(vmu, ast_true(value), VM_ENVELOPE); + ast_set2_flag(vmu, ast_true(value), VM_ENVELOPE); } else if (!strcasecmp(var, "moveheard")){ ast_set2_flag(vmu, ast_true(value), VM_MOVEHEARD); } else if (!strcasecmp(var, "sayduration")){ - ast_set2_flag(vmu, ast_true(value), VM_SAYDURATION); + ast_set2_flag(vmu, ast_true(value), VM_SAYDURATION); } else if (!strcasecmp(var, "saydurationm")){ if (sscanf(value, "%30d", &x) == 1) { vmu->saydurationm = x; @@ -1395,9 +1395,9 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v ast_log(AST_LOG_WARNING, "Invalid min duration for say duration\n"); } } else if (!strcasecmp(var, "forcename")){ - ast_set2_flag(vmu, ast_true(value), VM_FORCENAME); + ast_set2_flag(vmu, ast_true(value), VM_FORCENAME); } else if (!strcasecmp(var, "forcegreetings")){ - ast_set2_flag(vmu, ast_true(value), VM_FORCEGREET); + ast_set2_flag(vmu, ast_true(value), VM_FORCEGREET); } else if (!strcasecmp(var, "callback")) { ast_copy_string(vmu->callback, value, sizeof(vmu->callback)); } else if (!strcasecmp(var, "dialout")) { @@ -1461,7 +1461,7 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v } } -static char *vm_check_password_shell(char *command, char *buf, size_t len) +static char *vm_check_password_shell(char *command, char *buf, size_t len) { int fds[2], pid = 0; @@ -1499,7 +1499,7 @@ static char *vm_check_password_shell(char *command, char *buf, size_t len) AST_NONSTANDARD_APP_ARGS(arg, mycmd, ' '); - execv(arg.v[0], arg.v); + execv(arg.v[0], arg.v); printf("FAILURE: %s", strerror(errno)); _exit(0); } @@ -1545,11 +1545,11 @@ static int check_password(struct ast_vm_user *vmu, char *password) return 0; } -/*! +/*! * \brief Performs a change of the voicemail passowrd in the realtime engine. * \param vmu The voicemail user to change the password for. * \param password The new value to be set to the password for this user. - * + * * This only works if there is a realtime engine configured. * This is called from the (top level) vm_change_password. * @@ -1578,7 +1578,7 @@ static int change_password_realtime(struct ast_vm_user *vmu, const char *passwor * \brief Destructively Parse options and apply. */ static void apply_options(struct ast_vm_user *vmu, const char *options) -{ +{ char *stringp; char *s; char *var, *value; @@ -1588,12 +1588,12 @@ static void apply_options(struct ast_vm_user *vmu, const char *options) if ((var = strsep(&value, "=")) && value) { apply_option(vmu, var, value); } - } + } } /*! * \brief Loads the options specific to a voicemail user. - * + * * This is called when a vm_user structure is being set up, such as from load_options. */ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable *var) @@ -1659,7 +1659,7 @@ static void apply_options_full(struct ast_vm_user *retval, struct ast_variable * * \brief Determines if a DTMF key entered is valid. * \param key The character to be compared. expects a single character. Though is capable of handling a string, this is internally copies using ast_strdupa. * - * Tests the character entered against the set of valid DTMF characters. + * Tests the character entered against the set of valid DTMF characters. * \return 1 if the character entered is a valid DTMF digit, 0 if the character is invalid. */ static int is_valid_dtmf(const char *key) @@ -1711,12 +1711,12 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha if (var) { apply_options_full(retval, var); ast_variables_destroy(var); - } else { - if (!ivm) + } else { + if (!ivm) ast_free(retval); retval = NULL; - } - } + } + } return retval; } @@ -1725,7 +1725,7 @@ static struct ast_vm_user *find_user_realtime(struct ast_vm_user *ivm, const cha * \param ivm * \param context * \param mailbox - * + * * \return The ast_vm_user structure for the user that was found. */ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, const char *context, const char *mailbox) @@ -1804,7 +1804,7 @@ static inline int valid_config(const struct ast_config *cfg) return cfg && cfg != CONFIG_STATUS_FILEINVALID; } -/*! +/*! * \brief The handler for the change password option. * \param vmu The voicemail user to work with. * \param newpassword The new password (that has been gathered from the appropriate prompting). @@ -1932,15 +1932,15 @@ static void vm_change_password_shell(struct ast_vm_user *vmu, char *newpassword) } } -/*! +/*! * \brief Creates a file system path expression for a folder within the voicemail data folder and the appropriate context. * \param dest The variable to hold the output generated path expression. This buffer should be of size PATH_MAX. * \param len The length of the path string that was written out. * \param context - * \param ext - * \param folder - * - * The path is constructed as + * \param ext + * \param folder + * + * The path is constructed as * VM_SPOOL_DIRcontext/ext/folder * * \return zero on success, -1 on error. @@ -1950,14 +1950,14 @@ static int make_dir(char *dest, int len, const char *context, const char *ext, c return snprintf(dest, len, "%s%s/%s/%s", VM_SPOOL_DIR, context, ext, folder); } -/*! +/*! * \brief Creates a file system path expression for a folder within the voicemail data folder and the appropriate context. * \param dest The variable to hold the output generated path expression. This buffer should be of size PATH_MAX. * \param len The length of the path string that was written out. - * \param dir - * \param num - * - * The path is constructed as + * \param dir + * \param num + * + * The path is constructed as * VM_SPOOL_DIRcontext/ext/folder * * \return zero on success, -1 on error. @@ -1988,7 +1988,7 @@ static FILE *vm_mkftemp(char *template) * \param len Length of dest. * \param context String. Ignored if is null or empty string. * \param ext String. Ignored if is null or empty string. - * \param folder String. Ignored if is null or empty string. + * \param folder String. Ignored if is null or empty string. * \return -1 on failure, 0 on success. */ static int create_dirpath(char *dest, int len, const char *context, const char *ext, const char *folder) @@ -2222,9 +2222,9 @@ static int imap_retrieve_greeting(const char *dir, const int msgnum, struct ast_ } /* check if someone is accessing this box right now... */ - if (!(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 1)) && + if (!(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 1)) && !(vms_p = get_vm_state_by_mailbox(vmu->mailbox, vmu->context, 0))) { - /* Unlike when retrieving a message, it is reasonable not to be able to find a + /* Unlike when retrieving a message, it is reasonable not to be able to find a * vm_state for a mailbox when trying to retrieve a greeting. Just create one, * that's all we need to do. */ @@ -2377,7 +2377,7 @@ static int imap_retrieve_file(const char *dir, const int msgnum, const char *mai res = -1; goto exit; } - + /* Find the format of the attached file */ strsep(&attachedfilefmt, "."); @@ -2386,7 +2386,7 @@ static int imap_retrieve_file(const char *dir, const int msgnum, const char *mai res = -1; goto exit; } - + save_body(body, vms, "2", attachedfilefmt, 0); if (save_body(body, vms, "3", attachedfilefmt, 1)) { *vms->introfn = '\0'; @@ -2476,7 +2476,7 @@ static int __messagecount(const char *context, const char *mailbox, const char * int ret = 0; int fold = folder_int(folder); int urgent = 0; - + /* If URGENT, then look at INBOX */ if (fold == 11) { fold = NEW_FOLDER; @@ -2624,7 +2624,7 @@ static int imap_check_limits(struct ast_channel *chan, struct vm_state *vms, str * \brief Gets the number of messages that exist in a mailbox folder. * \param mailbox_id * \param folder - * + * * This method is used when IMAP backend is used. * \return The number of messages in this mailbox folder (zero or more). */ @@ -2790,7 +2790,7 @@ static int imap_store_file(const char *dir, const char *mailboxuser, const char * \param newmsgs The variable that is updated with the count of new messages within this inbox. * \param oldmsgs The variable that is updated with the count of old messages within this inbox. * \param urgentmsgs The variable that is updated with the count of urgent messages within this inbox. - * + * * This method is used when IMAP backend is used. * Simultaneously determines the count of new,old, and urgent messages. The total messages would then be the sum of these three. * @@ -2828,7 +2828,7 @@ static int inboxcount2(const char *mailbox_context, int *urgentmsgs, int *newmsg return -1; else { if (newmsgs) - *newmsgs += tmpnew; + *newmsgs += tmpnew; if (oldmsgs) *oldmsgs += tmpold; if (urgentmsgs) @@ -2872,7 +2872,7 @@ static int inboxcount2(const char *mailbox_context, int *urgentmsgs, int *newmsg return 0; } -/** +/** * \brief Determines if the given folder has messages. * \param mailbox The @ delimited string for user@context. If no context is found, uses 'default' for the context. * \param folder the folder to look in @@ -2950,7 +2950,7 @@ static void imap_mailbox_name(char *spec, size_t len, struct vm_state *vms, int { char tmp[256], *t = tmp; size_t left = sizeof(tmp); - + if (box == OLD_FOLDER) { ast_copy_string(vms->curbox, mbox(NULL, NEW_FOLDER), sizeof(vms->curbox)); } else { @@ -3645,7 +3645,7 @@ static void vmstate_delete(struct vm_state *vms) } AST_LIST_TRAVERSE_SAFE_END AST_LIST_UNLOCK(&vmstates); - + if (vc) { ast_mutex_destroy(&vc->vms->lock); ast_free(vc->vms->msgArray); @@ -3724,8 +3724,8 @@ static int save_body(BODY *body, struct vm_state *vms, char *section, char *form return 0; } -/*! - * \brief Get delimiter via mm_list callback +/*! + * \brief Get delimiter via mm_list callback * \param vms The voicemail state object * \param stream * @@ -3738,8 +3738,8 @@ static void get_mailbox_delimiter(struct vm_state *vms, MAILSTREAM *stream) { mail_list(stream, tmp, "*"); } -/*! - * \brief Check Quota for user +/*! + * \brief Check Quota for user * \param vms a pointer to a vm_state struct, will use the mailstream property of this. * \param mailbox the mailbox to check the quota for. * @@ -4507,7 +4507,7 @@ static void rename_file(char *sdir, int smsg, char *mailboxuser, char *mailboxco * * Removes the message content file and the information file. * This method is used by the DISPOSE macro when mailboxes are stored in an ODBC back end. - * Typical use is to clean up after a RETRIEVE operation. + * Typical use is to clean up after a RETRIEVE operation. * Note that this does not remove the message from the mailbox folders, to do that we would use delete_file(). * \return zero on success, -1 on error. */ @@ -4516,13 +4516,13 @@ static int remove_file(char *dir, int msgnum) char fn[PATH_MAX]; char full_fn[PATH_MAX]; char msgnums[80]; - + if (msgnum > -1) { snprintf(msgnums, sizeof(msgnums), "%d", msgnum); make_file(fn, sizeof(fn), dir, msgnum); } else ast_copy_string(fn, dir, sizeof(fn)); - ast_filedelete(fn, NULL); + ast_filedelete(fn, NULL); snprintf(full_fn, sizeof(full_fn), "%s.txt", fn); unlink(full_fn); return 0; @@ -4557,7 +4557,7 @@ static int count_messages(struct ast_vm_user *vmu, char *dir) closedir(vmdir); } ast_unlock_path(dir); - + return vmcount; } @@ -4581,9 +4581,9 @@ static void rename_file(char *sfn, char *dfn) rename(stxt, dtxt); } -/*! +/*! * \brief Determines the highest message number in use for a given user and mailbox folder. - * \param vmu + * \param vmu * \param dir the folder the mailbox folder to look for messages. Used to construct the SQL where clause. * * This method is used when mailboxes are stored on the filesystem. (not ODBC and not IMAP). @@ -4702,7 +4702,7 @@ static int copy(char *infile, char *outfile) /*! * \brief Copies a voicemail information (envelope) file. * \param frompath - * \param topath + * \param topath * * Every voicemail has the data (.wav) file, and the information file. * This function performs the file system copying of the information file for a voicemail, handling the internal fields and their values. @@ -4751,7 +4751,7 @@ static void copy_plain_file(char *frompath, char *topath) } #endif -/*! +/*! * \brief Removes the voicemail sound and information file. * \param file The path to the sound file. This will be the folder and message index, without the extension. * @@ -4897,7 +4897,7 @@ static int base_encode(char *filename, FILE *so) } fclose(fi); - + if (fputs(ENDL, so) == EOF) { return 0; } @@ -4964,7 +4964,7 @@ static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu * \param from The string to work with. * \param buf The buffer into which to write the modified quoted string. * \param maxlen Always zero, but see \see ast_str - * + * * \return The destination string with quotes wrapped on it (the to field). */ static const char *ast_str_quote(struct ast_str **buf, ssize_t maxlen, const char *from) @@ -5078,13 +5078,13 @@ static const char *ast_str_encode_mime(struct ast_str **end, ssize_t maxlen, con * \param srcemail The email address to send the email to, presumably the email address for the owner of the mailbox. * \param vmu The voicemail user who is sending the voicemail. * \param msgnum The message index in the mailbox folder. - * \param context + * \param context * \param mailbox The voicemail box to read the voicemail to be notified in this email. * \param fromfolder * \param cidnum The caller ID number. * \param cidname The caller ID name. * \param attach the name of the sound file to be attached to the email, if attach_user_voicemail == 1. - * \param attach2 + * \param attach2 * \param format The message sound file format. i.e. .wav * \param duration The time of the message content, in seconds. * \param attach_user_voicemail if 1, the sound file is attached to the email. @@ -5123,7 +5123,7 @@ static void make_email_file(FILE *p, struct ast_tm tm; char enc_cidnum[256] = "", enc_cidname[256] = ""; struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16); - char *greeting_attachment; + char *greeting_attachment; char filename[256]; int first_line; char *emailsbuf; @@ -5689,9 +5689,9 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char * \brief Gets the current date and time, as formatted string. * \param s The buffer to hold the output formatted date. * \param len the length of the buffer. Used to prevent buffer overflow in ast_strftime. - * + * * The date format string used is "%a %b %e %r UTC %Y". - * + * * \return zero on success, -1 on error. */ static int get_date(char *s, int len) @@ -5911,10 +5911,10 @@ bail: return nummsgs; } -/** +/** * \brief Determines if the given folder has messages. * \param mailbox The @ delimited string for user@context. If no context is found, uses 'default' for the context. - * + * * This function is used when the mailbox is stored in an ODBC back end. * This invokes the messagecount(). Here we are interested in the presence of messages (> 0) only, not the actual count. * \return 1 if the folder has one or more messages. zero otherwise. @@ -5934,7 +5934,7 @@ static int has_voicemail(const char *mailboxes, const char *folder) } #endif #ifndef IMAP_STORAGE -/*! +/*! * \brief Copies a message from one mailbox to another. * \param chan * \param vmu @@ -6066,7 +6066,7 @@ static int __has_voicemail(const char *context, const char *mailbox, const char return ret; } -/** +/** * \brief Determines if the given folder has messages. * \param mailbox The \@ delimited string for user\@context. If no context is found, uses 'default' for the context. * \param folder the folder to look in @@ -6126,7 +6126,7 @@ static int inboxcount2(const char *mailbox, int *urgentmsgs, int *newmsgs, int * return -1; else { if (newmsgs) - *newmsgs += tmpnew; + *newmsgs += tmpnew; if (oldmsgs) *oldmsgs += tmpold; if (urgentmsgs) @@ -6138,7 +6138,7 @@ static int inboxcount2(const char *mailbox, int *urgentmsgs, int *newmsgs, int * } ast_copy_string(tmp, mailbox, sizeof(tmp)); - + if ((context = strchr(tmp, '@'))) *context++ = '\0'; else @@ -6180,7 +6180,7 @@ static void run_externnotify(char *context, char *extension, const char *flag) ast_copy_string(ext_context, extension, sizeof(ext_context)); if (smdi_iface) { - if (ast_app_has_voicemail(ext_context, NULL)) + if (ast_app_has_voicemail(ext_context, NULL)) ast_smdi_mwi_set(smdi_iface, extension); else ast_smdi_mwi_unset(smdi_iface, extension); @@ -6528,9 +6528,9 @@ static int msg_create_from_file(struct ast_vm_recording_data *recdata) * \param chan * \param ext * \param options OPT_BUSY_GREETING, OPT_UNAVAIL_GREETING - * - * - * + * + * + * * \return zero on success, -1 on error. */ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_options *options) @@ -6627,7 +6627,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ else ast_copy_string(ext_context, vmu->mailbox, sizeof(ext_context)); - /* Set the path to the prefile. Will be one of + /* Set the path to the prefile. Will be one of VM_SPOOL_DIRcontext/ext/busy VM_SPOOL_DIRcontext/ext/unavail Depending on the flag set in options. @@ -6714,11 +6714,11 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ /* Play the beginning intro if desired */ if (!ast_strlen_zero(prefile)) { #ifdef ODBC_STORAGE - int success = + int success = #endif RETRIEVE(prefile, -1, ext, context); if (ast_fileexists(prefile, NULL, NULL) > 0) { - if (ast_streamfile(chan, prefile, ast_channel_language(chan)) > -1) + if (ast_streamfile(chan, prefile, ast_channel_language(chan)) > -1) res = ast_waitstream(chan, ecodes); #ifdef ODBC_STORAGE if (success == -1) { @@ -6883,7 +6883,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ /* Unless we're *really* silent, try to send the beep */ res = ast_stream_and_wait(chan, "beep", ""); } - + /* Store information in real-time storage */ if (ast_check_realtime("voicemail_data")) { snprintf(priority, sizeof(priority), "%d", ast_channel_priority(chan)); @@ -6917,7 +6917,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ S_COR(ast_channel_caller(chan)->id.name.valid, ast_channel_caller(chan)->id.name.str, NULL), S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL), "Unknown"); - fprintf(txt, + fprintf(txt, ";\n" "; Message Information file\n" ";\n" @@ -6936,7 +6936,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ "msg_id=%s\n", ext, ast_channel_context(chan), - ast_channel_macrocontext(chan), + ast_channel_macrocontext(chan), ast_channel_exten(chan), S_COR(ast_channel_redirecting(chan)->from.number.valid, ast_channel_redirecting(chan)->from.number.str, "unknown"), @@ -6991,7 +6991,7 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ #endif make_file(fn, sizeof(fn), dir, msgnum); - /* assign a variable with the name of the voicemail file */ + /* assign a variable with the name of the voicemail file */ #ifndef IMAP_STORAGE pbx_builtin_setvar_helper(chan, "VM_MESSAGEFILE", fn); #else @@ -7102,7 +7102,7 @@ leave_vm_out: #ifdef HAVE_IMAP_TK2006 if (LEVELUIDPLUS (vms->mailstream)) { mail_expunge_full(vms->mailstream, NIL, EX_UID); - } else + } else #endif mail_expunge(vms->mailstream); ast_mutex_unlock(&vms->lock); @@ -7482,7 +7482,7 @@ static void adsi_folders(struct ast_channel *chan, int start, char *label) static void adsi_message(struct ast_channel *chan, struct vm_state *vms) { int bytes = 0; - unsigned char buf[256]; + unsigned char buf[256]; char buf1[256], buf2[256]; char fn2[PATH_MAX]; @@ -7503,7 +7503,7 @@ static void adsi_message(struct ast_channel *chan, struct vm_state *vms) snprintf(fn2, sizeof(fn2), "%s.txt", vms->fn); f = fopen(fn2, "r"); if (f) { - while (!feof(f)) { + while (!feof(f)) { if (!fgets((char *) buf, sizeof(buf), f)) { continue; } @@ -7719,7 +7719,7 @@ static void adsi_status2(struct ast_channel *chan, struct vm_state *vms) bytes += ast_adsi_voice_mode(buf + bytes, 0); ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY); - + } /* @@ -7836,9 +7836,9 @@ static int get_folder_ja(struct ast_channel *chan, int start) * \param start Does not appear to be used at this time. * * This is used by the main menu option to move a message to a folder or to save a message into a folder. - * After playing the message identified by the fn parameter value, it calls get_folder(), which plays the + * After playing the message identified by the fn parameter value, it calls get_folder(), which plays the * prompting for the number inputs that correspond to the available folders. - * + * * \return zero on success, or -1 on error. */ static int get_folder2(struct ast_channel *chan, char *fn, int start) @@ -7877,7 +7877,7 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start) * \param record_gain * \param duration * \param vms - * \param flag + * \param flag * * Presents a prompt for 1 to prepend the current message, 2 to forward the message without prepending, or * to return to the main menu. * @@ -7919,7 +7919,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, if (cmd) retries = 0; switch (cmd) { - case '1': + case '1': #ifdef IMAP_STORAGE /* Record new intro file */ @@ -7977,7 +7977,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, if (record_gain) ast_channel_setoption(chan, AST_OPTION_RXGAIN, &zero_gain, sizeof(zero_gain), 0); - + if ((duration_str = ast_variable_retrieve(msg_cfg, "message", "duration"))) *duration = atoi(duration_str); @@ -7996,7 +7996,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, #endif break; - case '2': + case '2': /* NULL out introfile so we know there is no intro! */ #ifdef IMAP_STORAGE *vms->introfn = '\0'; @@ -8006,7 +8006,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, case '*': cmd = '*'; break; - default: + default: /* If time_out and return to menu, reset already_recorded */ already_recorded = 0; @@ -8141,7 +8141,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, DELETE(todir, msgnum, fn, vmu); /* Leave voicemail for someone */ - if (ast_app_has_voicemail(ext_context, NULL)) + if (ast_app_has_voicemail(ext_context, NULL)) ast_app_inboxcount2(ext_context, &urgentmsgs, &newmsgs, &oldmsgs); queue_mwi_event(ast_channel_uniqueid(chan), ext_context, urgentmsgs, newmsgs, oldmsgs); @@ -8165,14 +8165,14 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, * \param vms * \param sender * \param fmt - * \param is_new_message Used to indicate the mode for which this method was invoked. + * \param is_new_message Used to indicate the mode for which this method was invoked. * Will be 0 when called to forward an existing message (option 8) * Will be 1 when called to leave a message (option 3->5) - * \param record_gain + * \param record_gain * \param urgent * * Reads the destination mailbox(es) from keypad input for CID, or if use_directory feature is enabled, the Directory. - * + * * When in the leave message mode (is_new_message == 1): * - allow the leaving of a message for ourselves. (Will not allow us to forward a message to ourselves, when is_new_message == 0). * - attempt to determine the context and mailbox, and then invoke leave_message() function to record and store the message. @@ -8228,19 +8228,19 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st if (cmd) retries = 0; switch (cmd) { - case '1': + case '1': use_directory = 0; done = 1; break; - case '2': + case '2': use_directory = 1; done = 1; break; - case '*': + case '*': cmd = 't'; done = 1; break; - default: + default: /* Press 1 to enter an extension press 2 to use the directory */ cmd = ast_play_and_wait(chan, "vm-forward"); if (!cmd) { @@ -8434,7 +8434,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st #ifdef IMAP_STORAGE int attach_user_voicemail; char *myserveremail = serveremail; - + /* get destination mailbox */ dstvms = get_vm_state_by_mailbox(vmtmp->mailbox, vmtmp->context, 0); if (!dstvms) { @@ -8446,7 +8446,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st ast_log(AST_LOG_ERROR, "IMAP mailstream for %s is NULL\n", vmtmp->mailbox); } else { copy_msg_result = STORE(vmstmp.curdir, vmtmp->mailbox, vmtmp->context, curmsg, chan, vmtmp, fmt, duration, dstvms, urgent_str, msg_id); - run_externnotify(vmtmp->context, vmtmp->mailbox, urgent_str); + run_externnotify(vmtmp->context, vmtmp->mailbox, urgent_str); } } else { ast_log(AST_LOG_ERROR, "Could not find state information for mailbox %s\n", vmtmp->mailbox); @@ -8526,12 +8526,12 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st static int wait_file2(struct ast_channel *chan, struct vm_state *vms, char *file) { int res; - if ((res = ast_stream_and_wait(chan, file, AST_DIGIT_ANY)) < 0) - ast_log(AST_LOG_WARNING, "Unable to play message %s\n", file); + if ((res = ast_stream_and_wait(chan, file, AST_DIGIT_ANY)) < 0) + ast_log(AST_LOG_WARNING, "Unable to play message %s\n", file); return res; } -static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file) +static int wait_file(struct ast_channel *chan, struct vm_state *vms, char *file) { ast_test_suite_event_notify("PLAYVOICE", "Message: Playing %s", file); return ast_control_streamfile(chan, file, listen_control_forward_key, listen_control_reverse_key, listen_control_stop_key, listen_control_pause_key, listen_control_restart_key, skipms, NULL); @@ -8930,13 +8930,13 @@ static int imap_remove_file(char *dir, int msgnum) char fn[PATH_MAX]; char full_fn[PATH_MAX]; char intro[PATH_MAX] = {0,}; - + if (msgnum > -1) { make_file(fn, sizeof(fn), dir, msgnum); snprintf(intro, sizeof(intro), "%sintro", fn); } else ast_copy_string(fn, dir, sizeof(fn)); - + if ((msgnum < 0 && imapgreetings) || msgnum > -1) { ast_filedelete(fn, NULL); if (!ast_strlen_zero(intro)) { @@ -9282,7 +9282,7 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms) if (vms->newmessages) { res = ast_play_and_wait(chan, "vm-youhave"); - if (!res) + if (!res) res = ast_say_number(chan, vms->newmessages, AST_DIGIT_ANY, ast_channel_language(chan), NULL); if (!res) { if (vms->newmessages == 1) { @@ -9308,20 +9308,20 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms) if (!res) res = ast_play_and_wait(chan, "vm-messages"); } - } else if (!vms->oldmessages && !vms->newmessages) - res = ast_play_and_wait(chan, "vm-denExeteMynhmata"); + } else if (!vms->oldmessages && !vms->newmessages) + res = ast_play_and_wait(chan, "vm-denExeteMynhmata"); return res; } /* Version of vm_intro() designed to work for many languages. * - * It is hoped that this function can prevent the proliferation of + * It is hoped that this function can prevent the proliferation of * language-specific vm_intro() functions and in time replace the language- * specific functions which already exist. An examination of the language- * specific functions revealed that they all corrected the same deficiencies * in vm_intro_en() (which was the default function). Namely: * - * 1) The vm-Old and vm-INBOX sound files were overloaded. The English + * 1) The vm-Old and vm-INBOX sound files were overloaded. The English * wording of the voicemail greeting hides this problem. For example, * vm-INBOX contains only the word "new". This means that both of these * sequences produce valid utterances: @@ -9347,7 +9347,7 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms) * 3) Call ast_say_counted_adjective() to put the proper gender and number * prefix on vm-new and vm-old (none for English). * 4) Pass the gender of the language's word for "message" as an agument to - * this function which is can in turn pass on to the functions which + * this function which is can in turn pass on to the functions which * say numbers and put endings on nounds and adjectives. * * All languages require these messages: @@ -9459,7 +9459,7 @@ static int vm_intro_he(struct ast_channel *chan, struct vm_state *vms) if (vms->oldmessages == 2) { res = ast_play_and_wait(chan, "vm-shtei"); } else { - res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f"); + res = ast_say_number(chan, vms->oldmessages, AST_DIGIT_ANY, ast_channel_language(chan), "f"); } res = ast_play_and_wait(chan, "vm-Old"); } @@ -9514,7 +9514,7 @@ static int vm_intro_ja(struct ast_channel *chan,struct vm_state *vms) } return res; } /* Japanese */ - + /* Default English syntax */ static int vm_intro_en(struct ast_channel *chan, struct vm_state *vms) { @@ -9548,7 +9548,7 @@ static int vm_intro_en(struct ast_channel *chan, struct vm_state *vms) else res = ast_play_and_wait(chan, "vm-messages"); } - + } if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); @@ -9857,7 +9857,7 @@ static int vm_intro_de(struct ast_channel *chan, struct vm_state *vms) else res = ast_play_and_wait(chan, "vm-messages"); } - + } if (!res && vms->oldmessages) { if (vms->oldmessages == 1) @@ -10001,7 +10001,7 @@ static int vm_intro_fr(struct ast_channel *chan, struct vm_state *vms) else res = ast_play_and_wait(chan, "vm-messages"); } - + } if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); @@ -10048,7 +10048,7 @@ static int vm_intro_nl(struct ast_channel *chan, struct vm_state *vms) else res = ast_play_and_wait(chan, "vm-messages"); } - + } if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); @@ -10129,14 +10129,14 @@ static int vm_intro_pt(struct ast_channel *chan, struct vm_state *vms) /* in czech there must be declension of word new and message * czech : english : czech : english * -------------------------------------------------------- - * vm-youhave : you have + * vm-youhave : you have * vm-novou : one new : vm-zpravu : message * vm-nove : 2-4 new : vm-zpravy : messages * vm-novych : 5-infinite new : vm-zprav : messages * vm-starou : one old - * vm-stare : 2-4 old + * vm-stare : 2-4 old * vm-starych : 5-infinite old - * jednu : one - falling 4. + * jednu : one - falling 4. * vm-no : no ( no messages ) */ @@ -10217,7 +10217,7 @@ static int vm_intro_zh(struct ast_channel *chan, struct vm_state *vms) res = ast_play_and_wait(chan, "vm-INBOX"); if (vms->oldmessages && !res) res = ast_play_and_wait(chan, "vm-and"); - else if (!res) + else if (!res) res = ast_play_and_wait(chan, "vm-messages"); } if (!res && vms->oldmessages) { @@ -10257,7 +10257,7 @@ static int vm_intro_vi(struct ast_channel *chan, struct vm_state *vms) if (!res && vms->oldmessages) { res = say_and_wait(chan, vms->oldmessages, ast_channel_language(chan)); if (!res) - res = ast_play_and_wait(chan, "vm-Old"); + res = ast_play_and_wait(chan, "vm-Old"); } if (!res) { if (!vms->oldmessages && !vms->newmessages) { @@ -10273,7 +10273,7 @@ static int vm_intro_vi(struct ast_channel *chan, struct vm_state *vms) static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms) { char prefile[256]; - + /* Notify the user that the temp greeting is set and give them the option to remove it */ snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username); if (ast_test_flag(vmu, VM_TEMPGREETWARN)) { @@ -10782,7 +10782,7 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct } /*! - * \brief The handler for 'record a temporary greeting'. + * \brief The handler for 'record a temporary greeting'. * \param chan * \param vmu * \param vms @@ -10826,7 +10826,7 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st if (cmd == -1) { break; } - cmd = 't'; + cmd = 't'; } else { switch (cmd) { case '1': @@ -10835,9 +10835,9 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st case '2': DELETE(prefile, -1, prefile, vmu); ast_play_and_wait(chan, "vm-tempremoved"); - cmd = 't'; + cmd = 't'; break; - case '*': + case '*': cmd = 't'; break; default: @@ -10870,7 +10870,7 @@ static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, st * \param vmu * * \return zero on success, -1 on error. - */ + */ static int vm_browse_messages_gr(struct ast_channel *chan, struct vm_state *vms, struct ast_vm_user *vmu) { int cmd = 0; @@ -10894,7 +10894,7 @@ static int vm_browse_messages_gr(struct ast_channel *chan, struct vm_state *vms, cmd = ast_play_and_wait(chan, vms->fn); } } - } + } return cmd; } @@ -10915,7 +10915,7 @@ static int vm_browse_messages_he(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! * \brief Default English syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -10931,7 +10931,7 @@ static int vm_browse_messages_en(struct ast_channel *chan, struct vm_state *vms, cmd = play_message(chan, vmu, vms); } else { cmd = ast_play_and_wait(chan, "vm-youhave"); - if (!cmd) + if (!cmd) cmd = ast_play_and_wait(chan, "vm-no"); if (!cmd) { snprintf(vms->fn, sizeof(vms->fn), "vm-%s", vms->curbox); @@ -10943,7 +10943,7 @@ static int vm_browse_messages_en(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! *\brief Italian syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -10996,7 +10996,7 @@ static int vm_browse_messages_ja(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! * \brief Spanish syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -11022,7 +11022,7 @@ static int vm_browse_messages_es(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! * \brief Portuguese syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -11048,7 +11048,7 @@ static int vm_browse_messages_pt(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! * \brief Chinese (Taiwan)syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -11064,7 +11064,7 @@ static int vm_browse_messages_zh(struct ast_channel *chan, struct vm_state *vms, cmd = play_message(chan, vmu, vms); } else { cmd = ast_play_and_wait(chan, "vm-you"); - if (!cmd) + if (!cmd) cmd = ast_play_and_wait(chan, "vm-haveno"); if (!cmd) cmd = ast_play_and_wait(chan, "vm-messages"); @@ -11076,7 +11076,7 @@ static int vm_browse_messages_zh(struct ast_channel *chan, struct vm_state *vms, return cmd; } -/*! +/*! * \brief Vietnamese syntax for 'You have N messages' greeting. * \param chan * \param vms @@ -11105,7 +11105,7 @@ static int vm_browse_messages_vi(struct ast_channel *chan, struct vm_state *vms, * \param chan The channel for the current user. We read the language property from this. * \param vms passed into the language-specific vm_browse_messages function. * \param vmu passed into the language-specific vm_browse_messages function. - * + * * The method to be invoked is determined by the value of language code property in the user's channel. * The default (when unable to match) is to use english. * @@ -11163,7 +11163,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ if (ast_channel_caller(chan)->id.number.valid && ast_channel_caller(chan)->id.number.str) { ast_copy_string(mailbox, ast_channel_caller(chan)->id.number.str, mailbox_size); } else { - ast_verb(3, "Username not entered\n"); + ast_verb(3, "Username not entered\n"); return -1; } } else if (mailbox[0] == '*') { @@ -11502,7 +11502,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data) ast_set_flag(&flags, OPT_SILENT); else if (*(args.argv0) == 'p') ast_set_flag(&flags, OPT_PREPEND_MAILBOX); - else + else break; (args.argv0)++; } @@ -11639,7 +11639,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data) res = 0; /* Check to see if this is a new user */ - if (!strcasecmp(vmu->mailbox, vmu->password) && + if (!strcasecmp(vmu->mailbox, vmu->password) && (ast_test_flag(vmu, VM_FORCENAME | VM_FORCEGREET))) { if (ast_play_and_wait(chan, vm_newuser) == -1) ast_log(AST_LOG_WARNING, "Couldn't stream new user file\n"); @@ -12031,7 +12031,7 @@ static int vm_execmain(struct ast_channel *chan, const char *data) snprintf(vms.fn, sizeof(vms.fn), "vm-%s", mbox(vmu, box)); if (!cmd) { cmd = ast_play_and_wait(chan, "vm-message"); - if (!cmd) + if (!cmd) cmd = say_and_wait(chan, vms.curmsg + 1, ast_channel_language(chan)); if (!cmd) cmd = ast_play_and_wait(chan, "vm-savedto"); @@ -12135,7 +12135,7 @@ out: if (valid && res != OPERATOR_EXIT) { if (silentexit) res = ast_play_and_wait(chan, "vm-dialout"); - else + else res = ast_play_and_wait(chan, "vm-goodbye"); } if ((valid && res > 0) || res == OPERATOR_EXIT) { @@ -12193,7 +12193,7 @@ static int vm_exec(struct ast_channel *chan, const char *data) AST_APP_ARG(argv0); AST_APP_ARG(argv1); ); - + memset(&leave_options, 0, sizeof(leave_options)); if (ast_channel_state(chan) != AST_STATE_UP) @@ -12307,15 +12307,15 @@ static struct ast_vm_user *find_or_create(const char *context, const char *box) return NULL; } } - + if (!(vmu = ast_calloc(1, sizeof(*vmu)))) return NULL; - + ast_copy_string(vmu->context, context, sizeof(vmu->context)); ast_copy_string(vmu->mailbox, box, sizeof(vmu->mailbox)); AST_LIST_INSERT_TAIL(&users, vmu, list); - + return vmu; } @@ -12573,7 +12573,7 @@ AST_TEST_DEFINE(test_voicemail_vmuser) } #endif -static int vm_box_exists(struct ast_channel *chan, const char *data) +static int vm_box_exists(struct ast_channel *chan, const char *data) { struct ast_vm_user svm, *vmu; char *context, *box; @@ -12743,7 +12743,7 @@ static int vmauthenticate(struct ast_channel *chan, const char *data) char *options = NULL; int silent = 0, skipuser = 0; int res = -1; - + if (data) { s = ast_strdupa(data); user = strsep(&s, ","); @@ -12782,7 +12782,7 @@ static char *show_users_realtime(int fd, const char *context) struct ast_config *cfg; const char *cat = NULL; - if (!(cfg = ast_load_realtime_multientry("voicemail", + if (!(cfg = ast_load_realtime_multientry("voicemail", "context", context, SENTINEL))) { return CLI_FAILURE; } @@ -12855,7 +12855,7 @@ static char *handle_voicemail_show_users(struct ast_cli_entry *e, int cmd, struc return NULL; case CLI_GENERATE: return complete_voicemail_show_users(a->line, a->word, a->pos, a->n); - } + } if ((a->argc < 3) || (a->argc > 5) || (a->argc == 4)) return CLI_SHOWUSAGE; @@ -12967,9 +12967,9 @@ static char *handle_voicemail_reload(struct ast_cli_entry *e, int cmd, struct as if (a->argc != 2) return CLI_SHOWUSAGE; - ast_cli(a->fd, "Reloading voicemail configuration...\n"); + ast_cli(a->fd, "Reloading voicemail configuration...\n"); load_config(1); - + return CLI_SUCCESS; } @@ -13450,9 +13450,9 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa AST_LIST_UNLOCK(&users); return RESULT_SUCCESS; } - + astman_send_listack(s, m, "Voicemail user list will follow", "start"); - + AST_LIST_TRAVERSE(&users, vmu, list) { /* append vmu info event */ ret = append_vmu_info_astman(s, vmu, "VoicemailUserEntry", actionid); @@ -13472,7 +13472,7 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa } /*! \brief Free the users structure. */ -static void free_vm_users(void) +static void free_vm_users(void) { struct ast_vm_user *current; AST_LIST_LOCK(&users); @@ -13501,7 +13501,7 @@ static const char *substitute_escapes(const char *value) struct ast_str *str = ast_str_thread_get(&ast_str_thread_global_buf, strlen(value) + 16); ast_str_reset(str); - + /* Substitute strings \r, \n, and \t into the appropriate characters */ for (current = (char *) value; *current; current++) { if (*current == '\\') { @@ -13623,7 +13623,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con /* Free all the zones structure */ free_vm_zones(); - AST_LIST_LOCK(&users); + AST_LIST_LOCK(&users); memset(ext_pass_cmd, 0, sizeof(ext_pass_cmd)); memset(ext_pass_check_cmd, 0, sizeof(ext_pass_check_cmd)); @@ -13635,9 +13635,9 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con val = "default"; ast_copy_string(userscontext, val, sizeof(userscontext)); /* Attach voice message to mail message ? */ - if (!(val = ast_variable_retrieve(cfg, "general", "attach"))) + if (!(val = ast_variable_retrieve(cfg, "general", "attach"))) val = "yes"; - ast_set2_flag((&globalflags), ast_true(val), VM_ATTACH); + ast_set2_flag((&globalflags), ast_true(val), VM_ATTACH); if (!(val = ast_variable_retrieve(cfg, "general", "searchcontexts"))) val = "no"; @@ -13656,7 +13656,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con if ((val = ast_variable_retrieve(cfg, "general", "odbctable"))) { ast_copy_string(odbc_table, val, sizeof(odbc_table)); } -#endif +#endif /* Mail command */ strcpy(mailcmd, SENDMAIL); if ((val = ast_variable_retrieve(cfg, "general", "mailcmd"))) @@ -13668,7 +13668,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con if (maxsilence > 0) maxsilence *= 1000; } - + if (!(val = ast_variable_retrieve(cfg, "general", "maxmsg"))) { maxmsg = MAXMSG; } else { @@ -13789,7 +13789,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con } /* There is some very unorthodox casting done here. This is due - * to the way c-client handles the argument passed in. It expects a + * to the way c-client handles the argument passed in. It expects a * void pointer and casts the pointer directly to a long without * first dereferencing it. */ if ((val = ast_variable_retrieve(cfg, "general", "imapreadtimeout"))) { @@ -13898,7 +13898,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con val = ast_variable_retrieve(cfg, "general", "format"); if (!val) { - val = "wav"; + val = "wav"; } else { tmp = ast_strdupa(val); val = ast_format_str_reduce(tmp); @@ -14102,9 +14102,9 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con if ((val = ast_variable_retrieve(cfg, "general", "listen-control-stop-key")) && is_valid_dtmf(val)) ast_copy_string(listen_control_stop_key, val, sizeof(listen_control_stop_key)); - if (!(val = ast_variable_retrieve(cfg, "general", "usedirectory"))) + if (!(val = ast_variable_retrieve(cfg, "general", "usedirectory"))) val = "no"; - ast_set2_flag((&globalflags), ast_true(val), VM_DIRECFORWARD); + ast_set2_flag((&globalflags), ast_true(val), VM_DIRECFORWARD); if (!(val = ast_variable_retrieve(cfg, "general", "passwordlocation"))) { val = "voicemail.conf"; @@ -14210,7 +14210,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con } /* load mailboxes from users.conf */ - if (ucfg) { + if (ucfg) { for (cat = ast_category_browse(ucfg, NULL); cat ; cat = ast_category_browse(ucfg, cat)) { if (!strcasecmp(cat, "general")) { continue; @@ -14606,7 +14606,7 @@ AST_TEST_DEFINE(test_voicemail_msgcount) /* hasvm-old, hasvm-urgent, hasvm-new, ic-old, ic-urgent, ic-new, ic2-old, ic2-urgent, ic2-new, mc-old, mc-urgent, mc-new */ for (j = 0; j < 3; j++) { - /* folder[2] is INBOX, __has_voicemail will default back to INBOX */ + /* folder[2] is INBOX, __has_voicemail will default back to INBOX */ if (ast_app_has_voicemail(testspec, (j==2 ? NULL : folders[j])) != expected_results[i][0 + j]) { ast_test_status_update(test, "has_voicemail(%s, %s) returned %d and we expected %d\n", testspec, folders[j], ast_app_has_voicemail(testspec, folders[j]), expected_results[i][0 + j]); @@ -15050,7 +15050,7 @@ static int load_module(void) /* compute the location of the voicemail spool directory */ snprintf(VM_SPOOL_DIR, sizeof(VM_SPOOL_DIR), "%s/voicemail/", ast_config_AST_SPOOL_DIR); - + if (!(mwi_subscription_tps = ast_taskprocessor_get("app_voicemail", 0))) { ast_log(AST_LOG_WARNING, "failed to reference mwi subscription taskprocessor. MWI will not work\n"); } @@ -15114,7 +15114,7 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context) +static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context) { int cmd = 0; char destination[80] = ""; @@ -15144,7 +15144,7 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, ast_verb(3, "User hit '*' to cancel outgoing call\n"); return 0; } - if ((cmd = ast_readstring(chan, destination + strlen(destination), sizeof(destination) - 1, 6000, 10000, "#")) < 0) + if ((cmd = ast_readstring(chan, destination + strlen(destination), sizeof(destination) - 1, 6000, 10000, "#")) < 0) retries++; else cmd = 't'; @@ -15154,7 +15154,7 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, if (retries >= 3) { return 0; } - + } else { ast_verb(3, "Destination number is CID number '%s'\n", num); ast_copy_string(destination, num, sizeof(destination)); @@ -15162,7 +15162,7 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, if (!ast_strlen_zero(destination)) { if (destination[strlen(destination) -1 ] == '*') - return 0; + return 0; ast_verb(3, "Placing outgoing call to extension '%s' in context '%s' from context '%s'\n", destination, outgoing_context, ast_channel_context(chan)); ast_channel_exten_set(chan, destination); ast_channel_context_set(chan, outgoing_context); @@ -15175,13 +15175,13 @@ static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, /*! * \brief The advanced options within a message. * \param chan - * \param vmu + * \param vmu * \param vms * \param msg * \param option * \param record_gain * - * Provides handling for the play message envelope, call the person back, or reply to message. + * Provides handling for the play message envelope, call the person back, or reply to message. * * \return zero on success, -1 on error. */ @@ -15196,7 +15196,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s char *cid; struct ast_flags config_flags = { CONFIG_FLAG_NOCACHE, }; - vms->starting = 0; + vms->starting = 0; make_file(vms->fn, sizeof(vms->fn), vms->curdir, msg); @@ -15315,8 +15315,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s } } ast_test_suite_event_notify("USERPRESS", "Message: User pressed %c\r\nDTMF: %c", res, res); - break; - + break; + } if (res == 't') res = 0; @@ -15324,7 +15324,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s res = -1; } break; - + case 1: /* Reply */ /* Send reply directly to sender */ if (ast_strlen_zero(cid)) @@ -15347,7 +15347,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s snprintf(mailbox, sizeof(mailbox), "%s@%s", num, vmu->context); ast_verb(3, "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context); - + memset(&leave_options, 0, sizeof(leave_options)); leave_options.record_gain = record_gain; res = leave_voicemail(chan, mailbox, &leave_options); @@ -15364,7 +15364,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s ast_config_destroy(msg_cfg); return res; } - } + } res = 0; break; @@ -15424,7 +15424,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re } else { /* Otherwise 1 is to save the existing message */ ast_verb(3, "Saving message as is\n"); - if (!outsidecaller) + if (!outsidecaller) ast_filerename(tempfile, recordfile, NULL); if (!forwardintro) { ast_stream_and_wait(chan, "vm-msgsaved", ""); @@ -15445,11 +15445,11 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re case '3': msg_exists = 0; /* Record */ - if (recorded == 1) + if (recorded == 1) ast_verb(3, "Re-recording the message\n"); - else + else ast_verb(3, "Recording the message\n"); - + if (recorded && outsidecaller) { if (forwardintro) { cmd = ast_play_and_wait(chan, "vm-record-prepend"); @@ -15476,7 +15476,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (!outsidecaller) { /* user was recording a greeting and they hung up, so let's delete the recording. */ ast_filedelete(tempfile, NULL); - } + } return cmd; } if (cmd == '0') { @@ -15533,7 +15533,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re case '#': cmd = ast_play_and_wait(chan, "vm-sorry"); break; -#if 0 +#if 0 /* XXX Commented out for the moment because of the dangers of deleting a message while recording (can put the message numbers out of sync) */ case '*': @@ -15595,7 +15595,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re if (!cmd) cmd = ast_waitfordigit(chan, 600); } - + if (!cmd && outsidecaller && ast_test_flag(vmu, VM_OPERATOR)) { cmd = ast_play_and_wait(chan, "vm-reachoper"); if (!cmd) diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index d59f527c68..7ce2471c34 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -21,7 +21,7 @@ * \brief Wait for Ring Application * * \author Mark Spencer - * + * * \ingroup applications */ @@ -139,4 +139,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Waits until first ring after time"); - diff --git a/apps/app_while.c b/apps/app_while.c index 6bac60ab5d..7d390040f0 100644 --- a/apps/app_while.c +++ b/apps/app_while.c @@ -21,7 +21,7 @@ * \brief While Loop Implementation * * \author Anthony Minessale - * + * * \ingroup applications */ @@ -225,13 +225,13 @@ static int _while_exec(struct ast_channel *chan, const char *data, int end) for (x=0;;x++) { if (get_index(chan, prefix, x)) { used_index_i = x; - } else + } else break; } - + snprintf(used_index, VAR_SIZE, "%d", used_index_i); snprintf(new_index, VAR_SIZE, "%d", used_index_i + 1); - + if (!end) condition = ast_strdupa(data); @@ -239,7 +239,7 @@ static int _while_exec(struct ast_channel *chan, const char *data, int end) my_name = ast_alloca(size); memset(my_name, 0, size); snprintf(my_name, size, "%s_%s_%d", ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan)); - + ast_channel_lock(chan); if (end) { label = used_index; @@ -253,7 +253,7 @@ static int _while_exec(struct ast_channel *chan, const char *data, int end) snprintf(end_varname,VAR_SIZE,"END_%s",varname); } ast_channel_unlock(chan); - + if ((!end && !pbx_checkcondition(condition)) || (end == 2)) { /* Condition Met (clean up helper vars) */ @@ -338,7 +338,7 @@ static int while_continue_exec(struct ast_channel *chan, const char *data) static int unload_module(void) { int res; - + res = ast_unregister_application(start_app); res |= ast_unregister_application(stop_app); res |= ast_unregister_application(exit_app); diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c index f62f7bb502..4c5f1e54d6 100644 --- a/apps/app_zapateller.c +++ b/apps/app_zapateller.c @@ -21,14 +21,14 @@ * \brief Playback the special information tone to get rid of telemarketers * * \author Mark Spencer - * + * * \ingroup applications */ /*** MODULEINFO extended ***/ - + #include "asterisk.h" #include "asterisk/lock.h" @@ -112,15 +112,15 @@ static int zapateller_exec(struct ast_channel *chan, const char *data) return res; } - if (!res) + if (!res) res = ast_tonepair(chan, 950, 0, 330, 0); - if (!res) + if (!res) res = ast_tonepair(chan, 1400, 0, 330, 0); - if (!res) + if (!res) res = ast_tonepair(chan, 1800, 0, 330, 0); - if (!res) + if (!res) res = ast_tonepair(chan, 0, 0, 1000, 0); - + pbx_builtin_setvar_helper(chan, "ZAPATELLERSTATUS", "ZAPPED"); return res; } @@ -136,4 +136,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Block Telemarketers with Special Information Tone"); - diff --git a/apps/enter.h b/apps/enter.h index ac765984a7..a0b244df9e 100644 --- a/apps/enter.h +++ b/apps/enter.h @@ -10,278 +10,278 @@ */ static unsigned char enter[] = { -0xba, 0xba, 0xb0, 0xa6, 0xa9, 0xb8, 0xfe, 0x46, 0x42, 0x46, -0x4a, 0xfe, 0xac, 0xa2, 0x9f, 0x9f, 0xa8, 0xb8, 0x3b, 0x29, -0x35, 0x4a, 0xfe, 0xc1, 0xad, 0xa2, 0xad, 0xc5, 0x4e, 0x68, -0x68, 0xe7, 0xb8, 0xb0, 0xb2, 0xc1, 0xc1, 0xb0, 0xae, 0xcd, -0xfe, 0xfe, 0xcd, 0xcd, 0xfe, 0x68, 0xd3, 0xb2, 0xae, 0xab, -0xb2, 0xfe, 0x35, 0x31, 0xdb, 0xac, 0xab, 0xaf, 0xab, 0xaa, -0xb4, 0x68, 0x3b, 0x39, 0x3f, 0x68, 0xb4, 0xa8, 0xa8, 0xb0, -0xbc, 0xbc, 0xc5, 0x3f, 0x31, 0x37, 0xfe, 0xc1, 0xbc, 0xb0, -0xa5, 0xa2, 0xa8, 0xaf, 0xbe, 0x3b, 0x28, 0x26, 0x3d, 0xbc, -0xb0, 0xae, 0xa2, 0x9f, 0xa2, 0xfe, 0x29, 0x24, 0x29, 0x4a, -0xc5, 0xaa, 0xa8, 0xa9, 0xa8, 0xa5, 0xa7, 0xdb, 0x2c, 0x27, -0x2d, 0x4a, 0xfe, 0xdb, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0xe7, -0x2c, 0x22, 0x2b, 0xfe, 0xba, 0xb0, 0xaa, 0x9f, 0xa3, 0xb0, -0x5c, 0x33, 0x33, 0x39, 0x5c, 0xdb, 0xc1, 0xb4, 0xb0, 0xaa, -0xad, 0xba, 0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xe7, 0xaf, -0xa6, 0xa7, 0xb0, 0xfe, 0x46, 0x39, 0x5c, 0xe7, 0xdb, 0xfe, -0xba, 0xac, 0xa8, 0xc5, 0x46, 0x33, 0x54, 0xc5, 0xae, 0xad, -0xb2, 0xc1, 0xcd, 0xc1, 0xbc, 0xfe, 0x3f, 0x37, 0xfe, 0xb4, -0xb6, 0xcd, 0xdb, 0xc1, 0xb0, 0xb6, 0xcd, 0x4e, 0x39, 0x37, -0xfe, 0xb0, 0xab, 0xa9, 0xa9, 0xa9, 0xb0, 0x5c, 0x29, 0x25, -0x31, 0xfe, 0xc1, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xcd, 0x3b, -0x2a, 0x2c, 0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, -0xfe, 0x33, 0x27, 0x2a, 0x39, 0xfe, 0xc1, 0xbe, 0xb0, 0xa2, -0x9f, 0xb0, 0x33, 0x22, 0x25, 0x46, 0xc1, 0xb8, 0xb0, 0xab, -0xa8, 0xa8, 0xb0, 0xbe, 0x42, 0x2c, 0x2e, 0x4a, 0xfe, 0x5c, -0xfe, 0xb4, 0xa8, 0xa8, 0xba, 0xfe, 0x4a, 0x39, 0x39, 0x46, -0xfe, 0xbc, 0xaf, 0xa5, 0xa5, 0xae, 0x68, 0x37, 0x4a, 0xfe, -0xfe, 0x4a, 0x4a, 0xd3, 0xb0, 0xb0, 0xc1, 0x5c, 0x46, 0x46, -0xd3, 0xb6, 0xbe, 0x54, 0x54, 0xc9, 0xab, 0xae, 0xc5, 0x46, -0x4a, 0xfe, 0xcd, 0xc9, 0xcd, 0xe7, 0xe7, 0xc9, 0xb4, 0xc5, -0x4a, 0x2c, 0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, -0xfe, 0x4a, 0x46, 0x3f, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, -0xb2, 0xcd, 0x33, 0x2e, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xaf, -0xa7, 0xa7, 0xad, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xcd, -0xc5, 0xac, 0xa6, 0xac, 0xfe, 0x3b, 0x2c, 0x2d, 0x3d, 0xc1, -0xb4, 0xbe, 0xcd, 0xaf, 0xa5, 0xa8, 0xe7, 0x31, 0x2f, 0x39, -0x46, 0x5c, 0xdb, 0xbc, 0xba, 0xaf, 0xa9, 0xad, 0xfe, 0x2f, -0x2d, 0xba, 0xad, 0xba, 0xfe, 0x3d, 0x42, 0x5c, 0xc9, 0xc1, -0xcd, 0xfe, 0xc1, 0xae, 0xa6, 0xcd, 0x33, 0x25, 0x3b, 0xdb, -0xb0, 0xb6, 0xb8, 0xb6, 0xb4, 0xb8, 0xba, 0xfe, 0x3d, 0x37, -0xfe, 0xba, 0xc1, 0x54, 0x54, 0xd3, 0xb0, 0xb4, 0xe7, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xb6, 0xa9, 0xa7, 0xba, -0x3d, 0x35, 0xfe, 0xc1, 0xcd, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, -0xfe, 0x46, 0x3b, 0xfe, 0xba, 0xab, 0xc5, 0x46, 0x3b, 0xbc, -0xaa, 0xab, 0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xdb, 0x54, 0x3d, -0x4a, 0xbc, 0xac, 0xb4, 0x3f, 0x2e, 0x3d, 0xba, 0xb0, 0xb8, -0xba, 0xb6, 0xba, 0xcd, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, -0xbe, 0x54, 0x54, 0xcd, 0xb6, 0xc9, 0x46, 0x54, 0xcd, 0xc5, -0xdb, 0xfe, 0xfe, 0xc1, 0xae, 0xa9, 0xac, 0xfe, 0x35, 0x2e, -0xfe, 0xba, 0xc1, 0x5c, 0xfe, 0xb6, 0xaa, 0xb0, 0xe7, 0x35, -0x2e, 0x39, 0xc1, 0xac, 0xb0, 0xfe, 0xfe, 0xbc, 0xa6, 0xac, -0xc1, 0x42, 0x46, 0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xc9, 0xae, -0xa9, 0xb0, 0x54, 0x35, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xae, -0xab, 0xb6, 0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x4e, -0xfe, 0xb0, 0xac, 0xb8, 0xfe, 0xfe, 0xc1, 0xb6, 0xc5, 0x46, -0x3d, 0xe7, 0xb4, 0xa7, 0xab, 0xbc, 0x3f, 0x37, 0x54, 0xba, -0xcd, 0x54, 0x42, 0xc5, 0xae, 0xac, 0xc9, 0x46, 0x3d, 0x54, -0xba, 0xb0, 0xb0, 0xfe, 0x5c, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, -0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xc1, 0xba, 0xc5, -0xfe, 0x42, 0x46, 0xfe, 0xc5, 0xba, 0xb2, 0xa7, 0xa7, 0xb0, -0xfe, 0x3d, 0x4a, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xb0, -0xae, 0xc5, 0x4e, 0x39, 0xfe, 0xc5, 0xbe, 0xfe, 0x54, 0xc9, -0xa9, 0xa2, 0xa5, 0xbc, 0x3b, 0x2f, 0x35, 0xfe, 0xc9, 0xfe, -0xfe, 0xc5, 0xa9, 0xa6, 0xb0, 0x54, 0x31, 0x31, 0x3f, 0xd3, -0xbc, 0xc1, 0xcd, 0xb8, 0xae, 0xa8, 0xb4, 0xd3, 0x54, 0x4e, -0x5c, 0x54, 0xfe, 0xdb, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, -0x3d, 0x3f, 0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0xfe, -0xfe, 0xe7, 0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xb8, 0xaf, 0xb0, -0xe7, 0x42, 0x4a, 0xcd, 0xbc, 0xdb, 0x46, 0x68, 0xcd, 0xb0, -0xab, 0xbc, 0xfe, 0x3d, 0x46, 0xfe, 0xb8, 0xbc, 0xd3, 0xd3, -0xb6, 0xb0, 0xb6, 0x5c, 0x3b, 0x35, 0x54, 0xdb, 0xba, 0xb4, -0xc1, 0xc9, 0xc1, 0xba, 0xc9, 0x5c, 0x3d, 0x46, 0xfe, 0xcd, -0xc5, 0xb8, 0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3d, 0x35, 0x46, -0xfe, 0xdb, 0xbc, 0xb2, 0xa9, 0xab, 0xba, 0x3f, 0x31, 0x39, -0xfe, 0xe7, 0xdb, 0xcd, 0xb8, 0xae, 0xab, 0xac, 0xe7, 0x3d, -0x2d, 0x3f, 0xfe, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa8, 0xb0, -0xfe, 0x31, 0x2d, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xb4, 0xa8, -0xad, 0xc5, 0x46, 0x39, 0x3f, 0x5c, 0xfe, 0xd3, 0xc5, 0xc1, -0xb6, 0xb0, 0xbc, 0x68, 0x46, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, -0xc1, 0xaf, 0xb0, 0xb8, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, -0xfe, 0xe7, 0xb0, 0xab, 0xb2, 0x4a, 0x37, 0x3f, 0xcd, 0xbe, -0xc1, 0xe7, 0xe7, 0xd3, 0xb6, 0xb4, 0xc9, 0x3b, 0x33, 0x4a, -0xba, 0xb4, 0xc5, 0xfe, 0xc9, 0xb6, 0xb4, 0xcd, 0xfe, 0x3b, -0x3b, 0xfe, 0xc1, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xba, 0x4a, -0x31, 0x35, 0x68, 0xcd, 0xc5, 0xba, 0xb4, 0xb0, 0xb0, 0xba, -0x5c, 0x35, 0x2f, 0x4e, 0xd3, 0xc1, 0xdb, 0xd3, 0xb4, 0xa9, -0xab, 0xcd, 0x3b, 0x2f, 0x35, 0xfe, 0xd3, 0xd3, 0xdb, 0xbc, -0xad, 0xa4, 0xb0, 0xfe, 0x2d, 0x2f, 0x3f, 0xe7, 0xe7, 0xe7, -0xcd, 0xb4, 0xaf, 0xad, 0xc5, 0x3d, 0x31, 0x3d, 0xe7, 0xd3, -0xe7, 0xe7, 0xc1, 0xaf, 0xad, 0xb6, 0xfe, 0x4a, 0x42, 0x54, -0xfe, 0x68, 0xfe, 0xd3, 0xb2, 0xae, 0xb4, 0xfe, 0x42, 0x4e, -0xcd, 0xc5, 0xcd, 0xdb, 0xc9, 0xb4, 0xb0, 0xb6, 0xfe, 0x3b, -0x42, 0xe7, 0xb0, 0xb8, 0xcd, 0xfe, 0xc9, 0xb6, 0xb8, 0xfe, -0x42, 0x3d, 0xfe, 0xc1, 0xb0, 0xba, 0xd3, 0xfe, 0xc1, 0xb0, -0xb6, 0xfe, 0x3b, 0x3f, 0xe7, 0xba, 0xb8, 0xbc, 0xc5, 0xc1, -0xc1, 0xcd, 0xfe, 0x3b, 0x37, 0xfe, 0xc1, 0xb4, 0xb6, 0xb8, -0xb6, 0xb8, 0xc5, 0x5c, 0x3f, 0x46, 0xfe, 0xcd, 0xc5, 0xcd, -0xcd, 0xc1, 0xb2, 0xb2, 0xfe, 0x3f, 0x35, 0x54, 0xdb, 0xc1, -0xcd, 0xcd, 0xbc, 0xaf, 0xac, 0xb6, 0x54, 0x35, 0x31, 0x68, -0xba, 0xb8, 0xcd, 0xdb, 0xc9, 0xb2, 0xb4, 0xc9, 0x46, 0x39, -0x42, 0xdb, 0xbc, 0xbc, 0xcd, 0xcd, 0xbe, 0xb2, 0xb8, 0xe7, -0x54, 0x46, 0xfe, 0xfe, 0xdb, 0xc9, 0xc5, 0xbe, 0xbe, 0xc9, -0xfe, 0x5c, 0x5c, 0xfe, 0xd3, 0xcd, 0xcd, 0xc5, 0xb6, 0xb2, -0xc5, 0x68, 0x4e, 0xfe, 0xc5, 0xc1, 0xcd, 0x68, 0x5c, 0xe7, -0xb8, 0xb6, 0xd3, 0x4a, 0x46, 0xfe, 0xbc, 0xb8, 0xc1, 0xe7, -0xe7, 0xc1, 0xb4, 0xbe, 0xfe, 0x3f, 0x3f, 0xfe, 0xba, 0xb2, -0xba, 0xe7, 0xfe, 0xcd, 0xcd, 0xfe, 0x4e, 0x46, 0xfe, 0xc5, -0xb8, 0xb2, 0xba, 0xc1, 0xcd, 0xd3, 0xe7, 0xfe, 0x5c, 0x5c, -0xfe, 0xe7, 0xc5, 0xbe, 0xb6, 0xba, 0xc5, 0xfe, 0x3f, 0x3f, -0x54, 0xfe, 0xd3, 0xc1, 0xbc, 0xb6, 0xb0, 0xb0, 0xd3, 0x54, -0x39, 0x46, 0xfe, 0xc1, 0xcd, 0xe7, 0xe7, 0xc5, 0xb8, 0xb4, -0xd3, 0x54, 0x37, 0x42, 0xdb, 0xbe, 0xc1, 0xd3, 0xcd, 0xb8, -0xb0, 0xb0, 0xcd, 0x4a, 0x3b, 0x42, 0xe7, 0xc5, 0xbe, 0xcd, -0xe7, 0xd3, 0xc5, 0xcd, 0xfe, 0x54, 0x54, 0x68, 0xe7, 0xc5, -0xc1, 0xc1, 0xcd, 0xcd, 0xc9, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, -0xfe, 0xe7, 0xc5, 0xbe, 0xc1, 0xfe, 0x5c, 0x5c, 0xfe, 0xcd, -0xcd, 0xcd, 0xdb, 0xd3, 0xc1, 0xbc, 0xbe, 0xfe, 0x4e, 0x54, -0xcd, 0xb6, 0xb8, 0xd3, 0x5c, 0x5c, 0xfe, 0xc5, 0xc9, 0xfe, -0x46, 0x4a, 0xe7, 0xb4, 0xb6, 0xc5, 0xfe, 0xe7, 0xcd, 0xc9, -0xdb, 0xfe, 0x4e, 0x68, 0xd3, 0xb6, 0xb2, 0xbc, 0xfe, 0x68, -0xfe, 0xfe, 0x68, 0x54, 0x68, 0xe7, 0xc5, 0xbc, 0xb8, 0xbe, -0xcd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, 0xcd, -0xc1, 0xb8, 0xbc, 0xdb, 0x4e, 0x42, 0x4a, 0xfe, 0xc9, 0xc1, -0xcd, 0xd3, 0xcd, 0xba, 0xb8, 0xcd, 0x46, 0x3b, 0xfe, 0xc9, -0xba, 0xcd, 0xe7, 0xfe, 0xd3, 0xc1, 0xba, 0xdb, 0x54, 0x3d, -0x68, 0xd3, 0xbc, 0xcd, 0xfe, 0xfe, 0xc5, 0xbe, 0xc1, 0xe7, -0x54, 0x4a, 0xfe, 0xc9, 0xc1, 0xcd, 0xfe, 0xfe, 0xd3, 0xd3, -0xd3, 0xfe, 0xe7, 0xe7, 0xe7, 0xdb, 0xd3, 0xe7, 0xe7, 0xe7, -0xfe, 0xfe, 0xfe, 0xfe, 0xcd, 0xc9, 0xdb, 0xfe, 0xfe, 0xdb, -0xbe, 0xc9, 0xfe, 0x5c, 0xfe, 0xc9, 0xbc, 0xbe, 0xdb, 0x68, -0x5c, 0xdb, 0xc5, 0xd3, 0x54, 0x46, 0xfe, 0xbc, 0xb2, 0xb8, -0xdb, 0x68, 0x68, 0xe7, 0xcd, 0xdb, 0x5c, 0x54, 0xfe, 0xc1, -0xb8, 0xc1, 0xe7, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, -0xd3, 0xc5, 0xc1, 0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0x54, 0x4e, -0xfe, 0xd3, 0xcd, 0xd3, 0xd3, 0xc5, 0xc1, 0xc1, 0xe7, 0x5c, -0x4e, 0x5c, 0xd3, 0xc1, 0xcd, 0xfe, 0xfe, 0xcd, 0xba, 0xba, -0xe7, 0x4a, 0x4a, 0x68, 0xcd, 0xc5, 0xcd, 0xfe, 0xfe, 0xcd, -0xb8, 0xc1, 0xe7, 0x4e, 0x5c, 0xe7, 0xc1, 0xc9, 0xdb, 0xfe, -0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0x68, 0xfe, 0xdb, 0xd3, 0xe7, -0xfe, 0xfe, 0xcd, 0xc9, 0xcd, 0xd3, 0xd3, 0xd3, 0xcd, 0xe7, -0xfe, 0xfe, 0xe7, 0xc5, 0xc5, 0xe7, 0x68, 0x68, 0xe7, 0xc1, -0xc5, 0xfe, 0x5c, 0xfe, 0xd3, 0xc1, 0xd3, 0xfe, 0x68, 0xe7, -0xc5, 0xb6, 0xc5, 0xe7, 0x68, 0xfe, 0xcd, 0xc5, 0xe7, 0xfe, -0x54, 0xfe, 0xc9, 0xc5, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, -0xfe, 0xfe, 0xfe, 0xcd, 0xc1, 0xc1, 0xc9, 0xd3, 0xd3, 0xe7, -0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xd3, 0xdb, 0xe7, 0xe7, 0xd3, -0xcd, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xd3, 0xe7, 0xe7, -0xc9, 0xbc, 0xbe, 0xe7, 0x68, 0x4a, 0xfe, 0xdb, 0xcd, 0xfe, -0xfe, 0xfe, 0xcd, 0xc1, 0xc9, 0xfe, 0x54, 0x5c, 0xe7, 0xc9, -0xc5, 0xe7, 0xfe, 0xfe, 0xcd, 0xc5, 0xc5, 0xe7, 0xfe, 0xfe, -0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xdb, 0xd3, 0xd3, 0xdb, 0xe7, -0xfe, 0xfe, 0xe7, 0xe7, 0xdb, 0xd3, 0xc9, 0xd3, 0xe7, 0xfe, -0xfe, 0xd3, 0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xcd, 0xcd, -0xfe, 0xfe, 0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, -0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xdb, 0xc9, 0xcd, 0xe7, 0xfe, -0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, 0xd3, 0xc5, 0xcd, -0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, -0xe7, 0xcd, 0xcd, 0xd3, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, -0xe7, 0xe7, 0xdb, 0xc9, 0xc1, 0xc5, 0xfe, 0x5c, 0x68, 0xfe, -0xd3, 0xdb, 0xe7, 0xe7, 0xe7, 0xd3, 0xc5, 0xcd, 0xe7, 0x68, -0xfe, 0xe7, 0xcd, 0xd3, 0xe7, 0xfe, 0xe7, 0xcd, 0xc1, 0xc1, -0xdb, 0xfe, 0x54, 0xfe, 0xe7, 0xcd, 0xe7, 0xfe, 0xe7, 0xd3, -0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xcd, 0xfe, -0xfe, 0xe7, 0xcd, 0xd3, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, -0xd3, 0xd3, 0xe7, 0xfe, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, -0xfe, 0xdb, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, -0xcd, 0xe7, 0xfe, 0xfe, 0xd3, 0xcd, 0xdb, 0xfe, 0x5c, 0xfe, -0xcd, 0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, 0xcd, 0xfe, -0x68, 0xfe, 0xd3, 0xc1, 0xc1, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, -0xfe, 0xfe, 0x68, 0xfe, 0xe7, 0xc5, 0xc9, 0xdb, 0xfe, 0xfe, -0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xdb, 0xc5, 0xc5, -0xd3, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, -0xc9, 0xc1, 0xc5, 0xfe, 0x54, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, -0xfe, 0xfe, 0xdb, 0xc5, 0xc9, 0xfe, 0x5c, 0x68, 0xfe, 0xcd, -0xcd, 0xfe, 0xfe, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, -0xdb, 0xc9, 0xc5, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, -0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, -0xe7, 0xd3, 0xcd, 0xd3, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, -0xfe, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xd3, 0xc5, -0xc9, 0xfe, 0x5c, 0x54, 0xfe, 0xcd, 0xc1, 0xcd, 0xe7, 0xfe, -0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x5c, 0xe7, 0xc1, 0xc1, 0xd3, -0xfe, 0xfe, 0xe7, 0xd3, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, -0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xe7, 0xd3, 0xcd, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, 0xfe, 0xdb, -0xc9, 0xcd, 0xe7, 0xfe, 0xe7, 0xc9, 0xc5, 0xdb, 0xfe, 0x5c, -0xfe, 0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, -0xfe, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, -0xd3, 0xe7, 0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, -0xfe, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xe7, 0xdb, 0xcd, 0xd3, -0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, 0xdb, 0xd3, 0xdb, 0xe7, -0xe7, 0xdb, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xc5, -0xcd, 0xe7, 0xfe, 0xdb, 0xd3, 0xe7, 0xfe, 0x68, 0xfe, 0xe7, -0xcd, 0xcd, 0xd3, 0xfe, 0xfe, 0xe7, 0xdb, 0xe7, 0xfe, 0x68, -0xfe, 0xdb, 0xfe, 0x68, 0xbe, 0xb2, 0xae, 0xab, 0xb2, 0xfe, -0x2f, 0x31, 0xdb, 0xac, 0xad, 0xaf, 0xab, 0xab, 0xb4, 0x68, -0x37, 0x39, 0x3f, 0xe7, 0xb4, 0xa8, 0xaa, 0xb0, 0xbc, 0xbc, -0xc5, 0x3f, 0x31, 0x3d, 0xfe, 0xc1, 0xb8, 0xb0, 0xa5, 0xa2, -0xa8, 0xaf, 0xdb, 0x3b, 0x28, 0x2a, 0x3d, 0xbc, 0xb0, 0xaa, -0xa2, 0x9f, 0xab, 0xfe, 0x29, 0x24, 0x29, 0x4a, 0xb4, 0xaa, -0xa8, 0xa9, 0xa8, 0xa5, 0xac, 0xdb, 0x2c, 0x27, 0x35, 0x4a, -0xfe, 0xcd, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0x4e, 0x2c, 0x22, -0x33, 0xfe, 0xba, 0xb0, 0xa6, 0x9f, 0xa3, 0xbc, 0x5c, 0x33, -0x31, 0x39, 0x5c, 0xcd, 0xc1, 0xb4, 0xad, 0xaa, 0xad, 0xcd, -0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xc5, 0xaf, 0xa6, 0xa9, -0xb0, 0xfe, 0x3d, 0x39, 0x5c, 0xdb, 0xdb, 0xfe, 0xba, 0xac, -0xa8, 0xc5, 0x39, 0x33, 0x54, 0xb8, 0xae, 0xad, 0xb8, 0xc1, -0xcd, 0xbe, 0xbc, 0xfe, 0x39, 0x37, 0xfe, 0xb4, 0xba, 0xcd, -0xdb, 0xb8, 0xb0, 0xb6, 0xfe, 0x4e, 0x39, 0x3d, 0xfe, 0xb0, -0xaa, 0xa9, 0xa9, 0xaa, 0xb0, 0x5c, 0x29, 0x28, 0x31, 0xfe, -0xba, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xfe, 0x3b, 0x2a, 0x2f, -0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, 0xfe, 0x2c, -0x27, 0x2a, 0x46, 0xfe, 0xc1, 0xbc, 0xb0, 0xa2, 0xa2, 0xb0, -0x33, 0x22, 0x2b, 0x46, 0xc1, 0xb4, 0xb0, 0xab, 0xa8, 0xa8, -0xb0, 0xdb, 0x42, 0x2c, 0x33, 0x4a, 0xfe, 0x5c, 0xdb, 0xb4, -0xa8, 0xad, 0xba, 0xfe, 0x46, 0x39, 0x39, 0x4a, 0xfe, 0xbc, -0xab, 0xa5, 0xa5, 0xb8, 0x68, 0x37, 0x4a, 0xe7, 0xfe, 0x4a, -0x5c, 0xd3, 0xb0, 0xb2, 0xc1, 0x5c, 0x42, 0x46, 0xd3, 0xb4, -0xbe, 0x54, 0x54, 0xb6, 0xab, 0xae, 0xe7, 0x46, 0x4a, 0xfe, -0xcd, 0xc9, 0xd3, 0xe7, 0xe7, 0xbe, 0xb4, 0xc5, 0x37, 0x2c, -0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, 0x54, 0x4a, -0x46, 0x42, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, 0xb6, 0xcd, -0x33, 0x2f, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xac, 0xa7, 0xa7, -0xb2, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xd3, 0xc5, 0xac, -0xa6, 0xac, 0xfe, 0x33, 0x2c, 0x2d, 0x54, 0xc1, 0xb4, 0xcd, -0xcd, 0xaf, 0xa4, 0xa8, 0xe7, 0x31, 0x31, 0x39, 0x46, 0xfe, -0xdb, 0xbc, 0xb6, 0xaf, 0xa9, 0xb2, 0xfe, 0x2f, 0xfe, 0xba, -0xad, 0xba, 0x4e, 0x3d, 0x42, 0xfe, 0xc9, 0xc1, 0xe7, 0xfe, -0xc1, 0xa9, 0xa6, 0xcd, 0x2a, 0x25, 0x3b, 0xbc, 0xb0, 0xb6, -0xb8, 0xb4, 0xb4, 0xb8, 0xc1, 0xfe, 0x3d, 0x3d, 0xfe, 0xba, -0xd3, 0x54, 0x54, 0xbe, 0xb0, 0xb4, 0xe7, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xc5, 0xb6, 0xa9, 0xaa, 0xba, 0x3d, 0x39, -0xfe, 0xc1, 0xfe, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, 0xfe, 0x3d, -0x3b, 0xfe, 0xb0, 0xab, 0xc5, 0x39, 0x3b, 0xbc, 0xa7, 0xab, -0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x3d, 0xfe, 0xbc, -0xac, 0xc9, 0x3f, 0x2e, 0xfe, 0xba, 0xb0, 0xba, 0xba, 0xb6, -0xba, 0xd3, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, 0xbe, 0x54, -0x68, 0xcd, 0xb6, 0xfe, 0x46, 0x54, 0xcd, 0xc5, 0xdb, 0xfe, -0xe7, 0xc1, 0xae, 0xa8, 0xac, 0xfe, 0x2e, 0x2e, 0xfe, 0xb6, -0xc1, 0x5c, 0xe7, 0xb6, 0xaa, 0xb0, 0x54, 0x35, 0x2e, 0x4a, -0xc1, 0xac, 0xbc, 0xfe, 0xfe, 0xaf, 0xa6, 0xac, 0xfe, 0x42, -0x46, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xae, 0xa9, 0xb0, -0x54, 0x31, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xac, 0xab, 0xb6, -0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x54, 0xfe, 0xb0, -0xae, 0xb8, 0xfe, 0xe7, 0xc1, 0xb6, 0xe7, 0x46, 0x3d, 0xe7, -0xae, 0xa7, 0xab, 0xdb, 0x3f, 0x37, 0xfe, 0xba, 0xcd, 0x3f, -0x42, 0xc5, 0xab, 0xac, 0xc9, 0x46, 0x3d, 0x54, 0xba, 0xad, -0xb0, 0xfe, 0x68, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, 0x54, 0xfe, -0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xbe, 0xba, 0xc5, 0x68, 0x42, -0x46, 0xe7, 0xc5, 0xba, 0xaf, 0xa7, 0xa7, 0xbc, 0xfe, 0x3d, -0x4a, 0x68, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xaf, 0xae, 0xc5, -0x3d, 0x39, 0xfe, 0xbc, 0xbe, 0xfe, 0x68, 0xc9, 0xa9, 0xa2, -0xaa, 0xbc, 0x3b, 0x2d, 0x35, 0xfe, 0xcd, 0xfe, 0xfe, 0xb4, -0xa9, 0xa6, 0xbc, 0x54, 0x31, 0x31, 0x54, 0xd3, 0xbc, 0xc5, -0xcd, 0xb8, 0xab, 0xa8, 0xb4, 0xfe, 0x54, 0x4e, 0x68, 0x54, -0xfe, 0xc9, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, 0x3b, 0x3f, -0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0x68, 0xfe, 0xe7, -0xdb, 0xfe, 0xfe, 0xfe, 0xcd, 0xb8, 0xaf, 0xb6, 0xe7, 0x42, -0x5c, 0xcd, 0xbc, 0xfe, 0x46, 0x68, 0xba, 0xb0, 0xab, 0xbc, -0x54, 0x3d, 0x46, 0xc9, 0xb8, 0xbc, 0xdb, 0xd3, 0xb6, 0xb0, -0xb6, 0x5c, 0x37, 0x35, 0x54, 0xc9, 0xba, 0xb4, 0xc1, 0xc9, -0xc1, 0xba, 0xe7, 0x5c, 0x3d, 0x54, 0xfe, 0xcd, 0xc5, 0xb8, -0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3b, 0x35, 0x46, 0xfe, 0xdb, -0xbc, 0xaf, 0xa9, 0xab, 0xd3, 0x3f, 0x31, 0x3f, 0xfe, 0xe7, -0xdb, 0xcd, 0xb8, 0xae, 0xaa, 0xac, 0xe7, 0x33, 0x2d, 0x3f, -0xd3, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa9, 0xb0, 0xfe, 0x31, -0x2f, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xae, 0xa8, 0xad, 0xfe, -0x46, 0x39, 0x46, 0x5c, 0xfe, 0xcd, 0xc5, 0xc1, 0xb6, 0xb0, -0xbc, 0x68, 0x42, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, 0xb6, 0xaf, -0xb0, 0xc5, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, 0x68, 0xe7, -0xb0, 0xac, 0xb2, 0x4a, 0x35, 0x3f, 0xcd, 0xbc, 0xc1, 0xe7, -0xe7, 0xd3, 0xb6, 0xb4, 0xfe, 0x3b, 0x33, 0xfe, 0xba, 0xb4, -0xd3, 0xfe, 0xc9, 0xb4, 0xb4, 0xcd, 0x4a, 0x3b, 0x3b, 0xfe, -0xb8, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xcd, 0x4a, 0x31, 0x3b, -0x68, 0xcd, 0xc1, 0xba, 0xb4, 0xb0, 0xb0, 0xba, 0x5c, 0x2f, +0xba, 0xba, 0xb0, 0xa6, 0xa9, 0xb8, 0xfe, 0x46, 0x42, 0x46, +0x4a, 0xfe, 0xac, 0xa2, 0x9f, 0x9f, 0xa8, 0xb8, 0x3b, 0x29, +0x35, 0x4a, 0xfe, 0xc1, 0xad, 0xa2, 0xad, 0xc5, 0x4e, 0x68, +0x68, 0xe7, 0xb8, 0xb0, 0xb2, 0xc1, 0xc1, 0xb0, 0xae, 0xcd, +0xfe, 0xfe, 0xcd, 0xcd, 0xfe, 0x68, 0xd3, 0xb2, 0xae, 0xab, +0xb2, 0xfe, 0x35, 0x31, 0xdb, 0xac, 0xab, 0xaf, 0xab, 0xaa, +0xb4, 0x68, 0x3b, 0x39, 0x3f, 0x68, 0xb4, 0xa8, 0xa8, 0xb0, +0xbc, 0xbc, 0xc5, 0x3f, 0x31, 0x37, 0xfe, 0xc1, 0xbc, 0xb0, +0xa5, 0xa2, 0xa8, 0xaf, 0xbe, 0x3b, 0x28, 0x26, 0x3d, 0xbc, +0xb0, 0xae, 0xa2, 0x9f, 0xa2, 0xfe, 0x29, 0x24, 0x29, 0x4a, +0xc5, 0xaa, 0xa8, 0xa9, 0xa8, 0xa5, 0xa7, 0xdb, 0x2c, 0x27, +0x2d, 0x4a, 0xfe, 0xdb, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0xe7, +0x2c, 0x22, 0x2b, 0xfe, 0xba, 0xb0, 0xaa, 0x9f, 0xa3, 0xb0, +0x5c, 0x33, 0x33, 0x39, 0x5c, 0xdb, 0xc1, 0xb4, 0xb0, 0xaa, +0xad, 0xba, 0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xe7, 0xaf, +0xa6, 0xa7, 0xb0, 0xfe, 0x46, 0x39, 0x5c, 0xe7, 0xdb, 0xfe, +0xba, 0xac, 0xa8, 0xc5, 0x46, 0x33, 0x54, 0xc5, 0xae, 0xad, +0xb2, 0xc1, 0xcd, 0xc1, 0xbc, 0xfe, 0x3f, 0x37, 0xfe, 0xb4, +0xb6, 0xcd, 0xdb, 0xc1, 0xb0, 0xb6, 0xcd, 0x4e, 0x39, 0x37, +0xfe, 0xb0, 0xab, 0xa9, 0xa9, 0xa9, 0xb0, 0x5c, 0x29, 0x25, +0x31, 0xfe, 0xc1, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xcd, 0x3b, +0x2a, 0x2c, 0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, +0xfe, 0x33, 0x27, 0x2a, 0x39, 0xfe, 0xc1, 0xbe, 0xb0, 0xa2, +0x9f, 0xb0, 0x33, 0x22, 0x25, 0x46, 0xc1, 0xb8, 0xb0, 0xab, +0xa8, 0xa8, 0xb0, 0xbe, 0x42, 0x2c, 0x2e, 0x4a, 0xfe, 0x5c, +0xfe, 0xb4, 0xa8, 0xa8, 0xba, 0xfe, 0x4a, 0x39, 0x39, 0x46, +0xfe, 0xbc, 0xaf, 0xa5, 0xa5, 0xae, 0x68, 0x37, 0x4a, 0xfe, +0xfe, 0x4a, 0x4a, 0xd3, 0xb0, 0xb0, 0xc1, 0x5c, 0x46, 0x46, +0xd3, 0xb6, 0xbe, 0x54, 0x54, 0xc9, 0xab, 0xae, 0xc5, 0x46, +0x4a, 0xfe, 0xcd, 0xc9, 0xcd, 0xe7, 0xe7, 0xc9, 0xb4, 0xc5, +0x4a, 0x2c, 0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, +0xfe, 0x4a, 0x46, 0x3f, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, +0xb2, 0xcd, 0x33, 0x2e, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xaf, +0xa7, 0xa7, 0xad, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xcd, +0xc5, 0xac, 0xa6, 0xac, 0xfe, 0x3b, 0x2c, 0x2d, 0x3d, 0xc1, +0xb4, 0xbe, 0xcd, 0xaf, 0xa5, 0xa8, 0xe7, 0x31, 0x2f, 0x39, +0x46, 0x5c, 0xdb, 0xbc, 0xba, 0xaf, 0xa9, 0xad, 0xfe, 0x2f, +0x2d, 0xba, 0xad, 0xba, 0xfe, 0x3d, 0x42, 0x5c, 0xc9, 0xc1, +0xcd, 0xfe, 0xc1, 0xae, 0xa6, 0xcd, 0x33, 0x25, 0x3b, 0xdb, +0xb0, 0xb6, 0xb8, 0xb6, 0xb4, 0xb8, 0xba, 0xfe, 0x3d, 0x37, +0xfe, 0xba, 0xc1, 0x54, 0x54, 0xd3, 0xb0, 0xb4, 0xe7, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xb6, 0xa9, 0xa7, 0xba, +0x3d, 0x35, 0xfe, 0xc1, 0xcd, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, +0xfe, 0x46, 0x3b, 0xfe, 0xba, 0xab, 0xc5, 0x46, 0x3b, 0xbc, +0xaa, 0xab, 0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xdb, 0x54, 0x3d, +0x4a, 0xbc, 0xac, 0xb4, 0x3f, 0x2e, 0x3d, 0xba, 0xb0, 0xb8, +0xba, 0xb6, 0xba, 0xcd, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, +0xbe, 0x54, 0x54, 0xcd, 0xb6, 0xc9, 0x46, 0x54, 0xcd, 0xc5, +0xdb, 0xfe, 0xfe, 0xc1, 0xae, 0xa9, 0xac, 0xfe, 0x35, 0x2e, +0xfe, 0xba, 0xc1, 0x5c, 0xfe, 0xb6, 0xaa, 0xb0, 0xe7, 0x35, +0x2e, 0x39, 0xc1, 0xac, 0xb0, 0xfe, 0xfe, 0xbc, 0xa6, 0xac, +0xc1, 0x42, 0x46, 0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xc9, 0xae, +0xa9, 0xb0, 0x54, 0x35, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xae, +0xab, 0xb6, 0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x4e, +0xfe, 0xb0, 0xac, 0xb8, 0xfe, 0xfe, 0xc1, 0xb6, 0xc5, 0x46, +0x3d, 0xe7, 0xb4, 0xa7, 0xab, 0xbc, 0x3f, 0x37, 0x54, 0xba, +0xcd, 0x54, 0x42, 0xc5, 0xae, 0xac, 0xc9, 0x46, 0x3d, 0x54, +0xba, 0xb0, 0xb0, 0xfe, 0x5c, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, +0x54, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xc1, 0xba, 0xc5, +0xfe, 0x42, 0x46, 0xfe, 0xc5, 0xba, 0xb2, 0xa7, 0xa7, 0xb0, +0xfe, 0x3d, 0x4a, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xb0, +0xae, 0xc5, 0x4e, 0x39, 0xfe, 0xc5, 0xbe, 0xfe, 0x54, 0xc9, +0xa9, 0xa2, 0xa5, 0xbc, 0x3b, 0x2f, 0x35, 0xfe, 0xc9, 0xfe, +0xfe, 0xc5, 0xa9, 0xa6, 0xb0, 0x54, 0x31, 0x31, 0x3f, 0xd3, +0xbc, 0xc1, 0xcd, 0xb8, 0xae, 0xa8, 0xb4, 0xd3, 0x54, 0x4e, +0x5c, 0x54, 0xfe, 0xdb, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, +0x3d, 0x3f, 0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0xfe, +0xfe, 0xe7, 0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xb8, 0xaf, 0xb0, +0xe7, 0x42, 0x4a, 0xcd, 0xbc, 0xdb, 0x46, 0x68, 0xcd, 0xb0, +0xab, 0xbc, 0xfe, 0x3d, 0x46, 0xfe, 0xb8, 0xbc, 0xd3, 0xd3, +0xb6, 0xb0, 0xb6, 0x5c, 0x3b, 0x35, 0x54, 0xdb, 0xba, 0xb4, +0xc1, 0xc9, 0xc1, 0xba, 0xc9, 0x5c, 0x3d, 0x46, 0xfe, 0xcd, +0xc5, 0xb8, 0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3d, 0x35, 0x46, +0xfe, 0xdb, 0xbc, 0xb2, 0xa9, 0xab, 0xba, 0x3f, 0x31, 0x39, +0xfe, 0xe7, 0xdb, 0xcd, 0xb8, 0xae, 0xab, 0xac, 0xe7, 0x3d, +0x2d, 0x3f, 0xfe, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa8, 0xb0, +0xfe, 0x31, 0x2d, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xb4, 0xa8, +0xad, 0xc5, 0x46, 0x39, 0x3f, 0x5c, 0xfe, 0xd3, 0xc5, 0xc1, +0xb6, 0xb0, 0xbc, 0x68, 0x46, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, +0xc1, 0xaf, 0xb0, 0xb8, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, +0xfe, 0xe7, 0xb0, 0xab, 0xb2, 0x4a, 0x37, 0x3f, 0xcd, 0xbe, +0xc1, 0xe7, 0xe7, 0xd3, 0xb6, 0xb4, 0xc9, 0x3b, 0x33, 0x4a, +0xba, 0xb4, 0xc5, 0xfe, 0xc9, 0xb6, 0xb4, 0xcd, 0xfe, 0x3b, +0x3b, 0xfe, 0xc1, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xba, 0x4a, +0x31, 0x35, 0x68, 0xcd, 0xc5, 0xba, 0xb4, 0xb0, 0xb0, 0xba, +0x5c, 0x35, 0x2f, 0x4e, 0xd3, 0xc1, 0xdb, 0xd3, 0xb4, 0xa9, +0xab, 0xcd, 0x3b, 0x2f, 0x35, 0xfe, 0xd3, 0xd3, 0xdb, 0xbc, +0xad, 0xa4, 0xb0, 0xfe, 0x2d, 0x2f, 0x3f, 0xe7, 0xe7, 0xe7, +0xcd, 0xb4, 0xaf, 0xad, 0xc5, 0x3d, 0x31, 0x3d, 0xe7, 0xd3, +0xe7, 0xe7, 0xc1, 0xaf, 0xad, 0xb6, 0xfe, 0x4a, 0x42, 0x54, +0xfe, 0x68, 0xfe, 0xd3, 0xb2, 0xae, 0xb4, 0xfe, 0x42, 0x4e, +0xcd, 0xc5, 0xcd, 0xdb, 0xc9, 0xb4, 0xb0, 0xb6, 0xfe, 0x3b, +0x42, 0xe7, 0xb0, 0xb8, 0xcd, 0xfe, 0xc9, 0xb6, 0xb8, 0xfe, +0x42, 0x3d, 0xfe, 0xc1, 0xb0, 0xba, 0xd3, 0xfe, 0xc1, 0xb0, +0xb6, 0xfe, 0x3b, 0x3f, 0xe7, 0xba, 0xb8, 0xbc, 0xc5, 0xc1, +0xc1, 0xcd, 0xfe, 0x3b, 0x37, 0xfe, 0xc1, 0xb4, 0xb6, 0xb8, +0xb6, 0xb8, 0xc5, 0x5c, 0x3f, 0x46, 0xfe, 0xcd, 0xc5, 0xcd, +0xcd, 0xc1, 0xb2, 0xb2, 0xfe, 0x3f, 0x35, 0x54, 0xdb, 0xc1, +0xcd, 0xcd, 0xbc, 0xaf, 0xac, 0xb6, 0x54, 0x35, 0x31, 0x68, +0xba, 0xb8, 0xcd, 0xdb, 0xc9, 0xb2, 0xb4, 0xc9, 0x46, 0x39, +0x42, 0xdb, 0xbc, 0xbc, 0xcd, 0xcd, 0xbe, 0xb2, 0xb8, 0xe7, +0x54, 0x46, 0xfe, 0xfe, 0xdb, 0xc9, 0xc5, 0xbe, 0xbe, 0xc9, +0xfe, 0x5c, 0x5c, 0xfe, 0xd3, 0xcd, 0xcd, 0xc5, 0xb6, 0xb2, +0xc5, 0x68, 0x4e, 0xfe, 0xc5, 0xc1, 0xcd, 0x68, 0x5c, 0xe7, +0xb8, 0xb6, 0xd3, 0x4a, 0x46, 0xfe, 0xbc, 0xb8, 0xc1, 0xe7, +0xe7, 0xc1, 0xb4, 0xbe, 0xfe, 0x3f, 0x3f, 0xfe, 0xba, 0xb2, +0xba, 0xe7, 0xfe, 0xcd, 0xcd, 0xfe, 0x4e, 0x46, 0xfe, 0xc5, +0xb8, 0xb2, 0xba, 0xc1, 0xcd, 0xd3, 0xe7, 0xfe, 0x5c, 0x5c, +0xfe, 0xe7, 0xc5, 0xbe, 0xb6, 0xba, 0xc5, 0xfe, 0x3f, 0x3f, +0x54, 0xfe, 0xd3, 0xc1, 0xbc, 0xb6, 0xb0, 0xb0, 0xd3, 0x54, +0x39, 0x46, 0xfe, 0xc1, 0xcd, 0xe7, 0xe7, 0xc5, 0xb8, 0xb4, +0xd3, 0x54, 0x37, 0x42, 0xdb, 0xbe, 0xc1, 0xd3, 0xcd, 0xb8, +0xb0, 0xb0, 0xcd, 0x4a, 0x3b, 0x42, 0xe7, 0xc5, 0xbe, 0xcd, +0xe7, 0xd3, 0xc5, 0xcd, 0xfe, 0x54, 0x54, 0x68, 0xe7, 0xc5, +0xc1, 0xc1, 0xcd, 0xcd, 0xc9, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, +0xfe, 0xe7, 0xc5, 0xbe, 0xc1, 0xfe, 0x5c, 0x5c, 0xfe, 0xcd, +0xcd, 0xcd, 0xdb, 0xd3, 0xc1, 0xbc, 0xbe, 0xfe, 0x4e, 0x54, +0xcd, 0xb6, 0xb8, 0xd3, 0x5c, 0x5c, 0xfe, 0xc5, 0xc9, 0xfe, +0x46, 0x4a, 0xe7, 0xb4, 0xb6, 0xc5, 0xfe, 0xe7, 0xcd, 0xc9, +0xdb, 0xfe, 0x4e, 0x68, 0xd3, 0xb6, 0xb2, 0xbc, 0xfe, 0x68, +0xfe, 0xfe, 0x68, 0x54, 0x68, 0xe7, 0xc5, 0xbc, 0xb8, 0xbe, +0xcd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, 0xcd, +0xc1, 0xb8, 0xbc, 0xdb, 0x4e, 0x42, 0x4a, 0xfe, 0xc9, 0xc1, +0xcd, 0xd3, 0xcd, 0xba, 0xb8, 0xcd, 0x46, 0x3b, 0xfe, 0xc9, +0xba, 0xcd, 0xe7, 0xfe, 0xd3, 0xc1, 0xba, 0xdb, 0x54, 0x3d, +0x68, 0xd3, 0xbc, 0xcd, 0xfe, 0xfe, 0xc5, 0xbe, 0xc1, 0xe7, +0x54, 0x4a, 0xfe, 0xc9, 0xc1, 0xcd, 0xfe, 0xfe, 0xd3, 0xd3, +0xd3, 0xfe, 0xe7, 0xe7, 0xe7, 0xdb, 0xd3, 0xe7, 0xe7, 0xe7, +0xfe, 0xfe, 0xfe, 0xfe, 0xcd, 0xc9, 0xdb, 0xfe, 0xfe, 0xdb, +0xbe, 0xc9, 0xfe, 0x5c, 0xfe, 0xc9, 0xbc, 0xbe, 0xdb, 0x68, +0x5c, 0xdb, 0xc5, 0xd3, 0x54, 0x46, 0xfe, 0xbc, 0xb2, 0xb8, +0xdb, 0x68, 0x68, 0xe7, 0xcd, 0xdb, 0x5c, 0x54, 0xfe, 0xc1, +0xb8, 0xc1, 0xe7, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, +0xd3, 0xc5, 0xc1, 0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0x54, 0x4e, +0xfe, 0xd3, 0xcd, 0xd3, 0xd3, 0xc5, 0xc1, 0xc1, 0xe7, 0x5c, +0x4e, 0x5c, 0xd3, 0xc1, 0xcd, 0xfe, 0xfe, 0xcd, 0xba, 0xba, +0xe7, 0x4a, 0x4a, 0x68, 0xcd, 0xc5, 0xcd, 0xfe, 0xfe, 0xcd, +0xb8, 0xc1, 0xe7, 0x4e, 0x5c, 0xe7, 0xc1, 0xc9, 0xdb, 0xfe, +0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0x68, 0xfe, 0xdb, 0xd3, 0xe7, +0xfe, 0xfe, 0xcd, 0xc9, 0xcd, 0xd3, 0xd3, 0xd3, 0xcd, 0xe7, +0xfe, 0xfe, 0xe7, 0xc5, 0xc5, 0xe7, 0x68, 0x68, 0xe7, 0xc1, +0xc5, 0xfe, 0x5c, 0xfe, 0xd3, 0xc1, 0xd3, 0xfe, 0x68, 0xe7, +0xc5, 0xb6, 0xc5, 0xe7, 0x68, 0xfe, 0xcd, 0xc5, 0xe7, 0xfe, +0x54, 0xfe, 0xc9, 0xc5, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xd3, +0xfe, 0xfe, 0xfe, 0xcd, 0xc1, 0xc1, 0xc9, 0xd3, 0xd3, 0xe7, +0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xd3, 0xdb, 0xe7, 0xe7, 0xd3, +0xcd, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xd3, 0xe7, 0xe7, +0xc9, 0xbc, 0xbe, 0xe7, 0x68, 0x4a, 0xfe, 0xdb, 0xcd, 0xfe, +0xfe, 0xfe, 0xcd, 0xc1, 0xc9, 0xfe, 0x54, 0x5c, 0xe7, 0xc9, +0xc5, 0xe7, 0xfe, 0xfe, 0xcd, 0xc5, 0xc5, 0xe7, 0xfe, 0xfe, +0xfe, 0xe7, 0xe7, 0xfe, 0xfe, 0xdb, 0xd3, 0xd3, 0xdb, 0xe7, +0xfe, 0xfe, 0xe7, 0xe7, 0xdb, 0xd3, 0xc9, 0xd3, 0xe7, 0xfe, +0xfe, 0xd3, 0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xd3, 0xcd, 0xcd, +0xfe, 0xfe, 0xe7, 0xc9, 0xc5, 0xd3, 0xfe, 0xfe, 0xfe, 0xcd, +0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xdb, 0xc9, 0xcd, 0xe7, 0xfe, +0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, 0xd3, 0xc5, 0xcd, +0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, +0xe7, 0xcd, 0xcd, 0xd3, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, +0xe7, 0xe7, 0xdb, 0xc9, 0xc1, 0xc5, 0xfe, 0x5c, 0x68, 0xfe, +0xd3, 0xdb, 0xe7, 0xe7, 0xe7, 0xd3, 0xc5, 0xcd, 0xe7, 0x68, +0xfe, 0xe7, 0xcd, 0xd3, 0xe7, 0xfe, 0xe7, 0xcd, 0xc1, 0xc1, +0xdb, 0xfe, 0x54, 0xfe, 0xe7, 0xcd, 0xe7, 0xfe, 0xe7, 0xd3, +0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, 0xc5, 0xcd, 0xfe, +0xfe, 0xe7, 0xcd, 0xd3, 0xdb, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, +0xd3, 0xd3, 0xe7, 0xfe, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, +0xfe, 0xdb, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, +0xcd, 0xe7, 0xfe, 0xfe, 0xd3, 0xcd, 0xdb, 0xfe, 0x5c, 0xfe, +0xcd, 0xc9, 0xd3, 0xfe, 0xfe, 0xfe, 0xd3, 0xc9, 0xcd, 0xfe, +0x68, 0xfe, 0xd3, 0xc1, 0xc1, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, +0xfe, 0xfe, 0x68, 0xfe, 0xe7, 0xc5, 0xc9, 0xdb, 0xfe, 0xfe, +0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xdb, 0xc5, 0xc5, +0xd3, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xfe, +0xc9, 0xc1, 0xc5, 0xfe, 0x54, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, +0xfe, 0xfe, 0xdb, 0xc5, 0xc9, 0xfe, 0x5c, 0x68, 0xfe, 0xcd, +0xcd, 0xfe, 0xfe, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, 0xfe, 0xfe, +0xdb, 0xc9, 0xc5, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, +0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, +0xe7, 0xd3, 0xcd, 0xd3, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, +0xfe, 0xfe, 0xfe, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xd3, 0xc5, +0xc9, 0xfe, 0x5c, 0x54, 0xfe, 0xcd, 0xc1, 0xcd, 0xe7, 0xfe, +0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x5c, 0xe7, 0xc1, 0xc1, 0xd3, +0xfe, 0xfe, 0xe7, 0xd3, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xcd, +0xc5, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xe7, 0xd3, 0xcd, 0xc9, 0xcd, 0xe7, 0xfe, 0xfe, 0xfe, 0xdb, +0xc9, 0xcd, 0xe7, 0xfe, 0xe7, 0xc9, 0xc5, 0xdb, 0xfe, 0x5c, +0xfe, 0xe7, 0xcd, 0xcd, 0xe7, 0xfe, 0xe7, 0xc5, 0xc1, 0xd3, +0xfe, 0x5c, 0xfe, 0xcd, 0xc5, 0xcd, 0xe7, 0xfe, 0xfe, 0xe7, +0xd3, 0xe7, 0xfe, 0xfe, 0xe7, 0xcd, 0xcd, 0xdb, 0xfe, 0xfe, +0xfe, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xe7, 0xdb, 0xcd, 0xd3, +0xd3, 0xdb, 0xfe, 0xfe, 0xfe, 0xfe, 0xdb, 0xd3, 0xdb, 0xe7, +0xe7, 0xdb, 0xd3, 0xe7, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xc5, +0xcd, 0xe7, 0xfe, 0xdb, 0xd3, 0xe7, 0xfe, 0x68, 0xfe, 0xe7, +0xcd, 0xcd, 0xd3, 0xfe, 0xfe, 0xe7, 0xdb, 0xe7, 0xfe, 0x68, +0xfe, 0xdb, 0xfe, 0x68, 0xbe, 0xb2, 0xae, 0xab, 0xb2, 0xfe, +0x2f, 0x31, 0xdb, 0xac, 0xad, 0xaf, 0xab, 0xab, 0xb4, 0x68, +0x37, 0x39, 0x3f, 0xe7, 0xb4, 0xa8, 0xaa, 0xb0, 0xbc, 0xbc, +0xc5, 0x3f, 0x31, 0x3d, 0xfe, 0xc1, 0xb8, 0xb0, 0xa5, 0xa2, +0xa8, 0xaf, 0xdb, 0x3b, 0x28, 0x2a, 0x3d, 0xbc, 0xb0, 0xaa, +0xa2, 0x9f, 0xab, 0xfe, 0x29, 0x24, 0x29, 0x4a, 0xb4, 0xaa, +0xa8, 0xa9, 0xa8, 0xa5, 0xac, 0xdb, 0x2c, 0x27, 0x35, 0x4a, +0xfe, 0xcd, 0xb2, 0xa2, 0x9f, 0x9f, 0xae, 0x4e, 0x2c, 0x22, +0x33, 0xfe, 0xba, 0xb0, 0xa6, 0x9f, 0xa3, 0xbc, 0x5c, 0x33, +0x31, 0x39, 0x5c, 0xcd, 0xc1, 0xb4, 0xad, 0xaa, 0xad, 0xcd, +0x54, 0x46, 0xfe, 0xe7, 0xfe, 0x54, 0xc5, 0xaf, 0xa6, 0xa9, +0xb0, 0xfe, 0x3d, 0x39, 0x5c, 0xdb, 0xdb, 0xfe, 0xba, 0xac, +0xa8, 0xc5, 0x39, 0x33, 0x54, 0xb8, 0xae, 0xad, 0xb8, 0xc1, +0xcd, 0xbe, 0xbc, 0xfe, 0x39, 0x37, 0xfe, 0xb4, 0xba, 0xcd, +0xdb, 0xb8, 0xb0, 0xb6, 0xfe, 0x4e, 0x39, 0x3d, 0xfe, 0xb0, +0xaa, 0xa9, 0xa9, 0xaa, 0xb0, 0x5c, 0x29, 0x28, 0x31, 0xfe, +0xba, 0xb4, 0xae, 0xab, 0xab, 0xb2, 0xfe, 0x3b, 0x2a, 0x2f, +0x54, 0xb4, 0xb4, 0xba, 0xb2, 0xa3, 0x9f, 0xa8, 0xfe, 0x2c, +0x27, 0x2a, 0x46, 0xfe, 0xc1, 0xbc, 0xb0, 0xa2, 0xa2, 0xb0, +0x33, 0x22, 0x2b, 0x46, 0xc1, 0xb4, 0xb0, 0xab, 0xa8, 0xa8, +0xb0, 0xdb, 0x42, 0x2c, 0x33, 0x4a, 0xfe, 0x5c, 0xdb, 0xb4, +0xa8, 0xad, 0xba, 0xfe, 0x46, 0x39, 0x39, 0x4a, 0xfe, 0xbc, +0xab, 0xa5, 0xa5, 0xb8, 0x68, 0x37, 0x4a, 0xe7, 0xfe, 0x4a, +0x5c, 0xd3, 0xb0, 0xb2, 0xc1, 0x5c, 0x42, 0x46, 0xd3, 0xb4, +0xbe, 0x54, 0x54, 0xb6, 0xab, 0xae, 0xe7, 0x46, 0x4a, 0xfe, +0xcd, 0xc9, 0xd3, 0xe7, 0xe7, 0xbe, 0xb4, 0xc5, 0x37, 0x2c, +0x37, 0xc1, 0xb0, 0xb2, 0xb4, 0xb2, 0xb6, 0xdb, 0x54, 0x4a, +0x46, 0x42, 0x68, 0xba, 0xb2, 0xba, 0xc5, 0xb6, 0xb6, 0xcd, +0x33, 0x2f, 0x39, 0x68, 0xfe, 0xe7, 0xba, 0xac, 0xa7, 0xa7, +0xb2, 0xe7, 0x2d, 0x25, 0x2f, 0xd3, 0xbe, 0xd3, 0xc5, 0xac, +0xa6, 0xac, 0xfe, 0x33, 0x2c, 0x2d, 0x54, 0xc1, 0xb4, 0xcd, +0xcd, 0xaf, 0xa4, 0xa8, 0xe7, 0x31, 0x31, 0x39, 0x46, 0xfe, +0xdb, 0xbc, 0xb6, 0xaf, 0xa9, 0xb2, 0xfe, 0x2f, 0xfe, 0xba, +0xad, 0xba, 0x4e, 0x3d, 0x42, 0xfe, 0xc9, 0xc1, 0xe7, 0xfe, +0xc1, 0xa9, 0xa6, 0xcd, 0x2a, 0x25, 0x3b, 0xbc, 0xb0, 0xb6, +0xb8, 0xb4, 0xb4, 0xb8, 0xc1, 0xfe, 0x3d, 0x3d, 0xfe, 0xba, +0xd3, 0x54, 0x54, 0xbe, 0xb0, 0xb4, 0xe7, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xc5, 0xb6, 0xa9, 0xaa, 0xba, 0x3d, 0x39, +0xfe, 0xc1, 0xfe, 0x4a, 0x54, 0xbe, 0xb2, 0xb8, 0xfe, 0x3d, +0x3b, 0xfe, 0xb0, 0xab, 0xc5, 0x39, 0x3b, 0xbc, 0xa7, 0xab, +0xd3, 0x68, 0xfe, 0xd3, 0xcd, 0xfe, 0x54, 0x3d, 0xfe, 0xbc, +0xac, 0xc9, 0x3f, 0x2e, 0xfe, 0xba, 0xb0, 0xba, 0xba, 0xb6, +0xba, 0xd3, 0xfe, 0xfe, 0x5c, 0x54, 0xc9, 0xb4, 0xbe, 0x54, +0x68, 0xcd, 0xb6, 0xfe, 0x46, 0x54, 0xcd, 0xc5, 0xdb, 0xfe, +0xe7, 0xc1, 0xae, 0xa8, 0xac, 0xfe, 0x2e, 0x2e, 0xfe, 0xb6, +0xc1, 0x5c, 0xe7, 0xb6, 0xaa, 0xb0, 0x54, 0x35, 0x2e, 0x4a, +0xc1, 0xac, 0xbc, 0xfe, 0xfe, 0xaf, 0xa6, 0xac, 0xfe, 0x42, +0x46, 0x5c, 0xfe, 0xfe, 0xfe, 0xe7, 0xc9, 0xae, 0xa9, 0xb0, +0x54, 0x31, 0x37, 0xfe, 0xd3, 0xd3, 0xb8, 0xac, 0xab, 0xb6, +0xe7, 0xfe, 0xfe, 0x68, 0xfe, 0xfe, 0xfe, 0x54, 0xfe, 0xb0, +0xae, 0xb8, 0xfe, 0xe7, 0xc1, 0xb6, 0xe7, 0x46, 0x3d, 0xe7, +0xae, 0xa7, 0xab, 0xdb, 0x3f, 0x37, 0xfe, 0xba, 0xcd, 0x3f, +0x42, 0xc5, 0xab, 0xac, 0xc9, 0x46, 0x3d, 0x54, 0xba, 0xad, +0xb0, 0xfe, 0x68, 0xcd, 0xb0, 0xb0, 0xc9, 0x54, 0x54, 0xfe, +0xfe, 0xfe, 0xfe, 0xe7, 0xcd, 0xbe, 0xba, 0xc5, 0x68, 0x42, +0x46, 0xe7, 0xc5, 0xba, 0xaf, 0xa7, 0xa7, 0xbc, 0xfe, 0x3d, +0x4a, 0x68, 0xfe, 0xfe, 0xfe, 0xe7, 0xbc, 0xaf, 0xae, 0xc5, +0x3d, 0x39, 0xfe, 0xbc, 0xbe, 0xfe, 0x68, 0xc9, 0xa9, 0xa2, +0xaa, 0xbc, 0x3b, 0x2d, 0x35, 0xfe, 0xcd, 0xfe, 0xfe, 0xb4, +0xa9, 0xa6, 0xbc, 0x54, 0x31, 0x31, 0x54, 0xd3, 0xbc, 0xc5, +0xcd, 0xb8, 0xab, 0xa8, 0xb4, 0xfe, 0x54, 0x4e, 0x68, 0x54, +0xfe, 0xc9, 0xba, 0xb4, 0xb4, 0xba, 0xcd, 0x5c, 0x3b, 0x3f, +0x54, 0xfe, 0xcd, 0xaf, 0xa8, 0xac, 0xc5, 0x68, 0xfe, 0xe7, +0xdb, 0xfe, 0xfe, 0xfe, 0xcd, 0xb8, 0xaf, 0xb6, 0xe7, 0x42, +0x5c, 0xcd, 0xbc, 0xfe, 0x46, 0x68, 0xba, 0xb0, 0xab, 0xbc, +0x54, 0x3d, 0x46, 0xc9, 0xb8, 0xbc, 0xdb, 0xd3, 0xb6, 0xb0, +0xb6, 0x5c, 0x37, 0x35, 0x54, 0xc9, 0xba, 0xb4, 0xc1, 0xc9, +0xc1, 0xba, 0xe7, 0x5c, 0x3d, 0x54, 0xfe, 0xcd, 0xc5, 0xb8, +0xae, 0xaf, 0xb4, 0xd3, 0x54, 0x3b, 0x35, 0x46, 0xfe, 0xdb, +0xbc, 0xaf, 0xa9, 0xab, 0xd3, 0x3f, 0x31, 0x3f, 0xfe, 0xe7, +0xdb, 0xcd, 0xb8, 0xae, 0xaa, 0xac, 0xe7, 0x33, 0x2d, 0x3f, +0xd3, 0xdb, 0xfe, 0xfe, 0xbc, 0xaa, 0xa9, 0xb0, 0xfe, 0x31, +0x2f, 0x3d, 0xdb, 0xc5, 0xcd, 0xc9, 0xae, 0xa8, 0xad, 0xfe, +0x46, 0x39, 0x46, 0x5c, 0xfe, 0xcd, 0xc5, 0xc1, 0xb6, 0xb0, +0xbc, 0x68, 0x42, 0x4e, 0xe7, 0xfe, 0x5c, 0xfe, 0xb6, 0xaf, +0xb0, 0xc5, 0xe7, 0x5c, 0x5c, 0xfe, 0xe7, 0xfe, 0x68, 0xe7, +0xb0, 0xac, 0xb2, 0x4a, 0x35, 0x3f, 0xcd, 0xbc, 0xc1, 0xe7, +0xe7, 0xd3, 0xb6, 0xb4, 0xfe, 0x3b, 0x33, 0xfe, 0xba, 0xb4, +0xd3, 0xfe, 0xc9, 0xb4, 0xb4, 0xcd, 0x4a, 0x3b, 0x3b, 0xfe, +0xb8, 0xb6, 0xc5, 0xc5, 0xb8, 0xb0, 0xcd, 0x4a, 0x31, 0x3b, +0x68, 0xcd, 0xc1, 0xba, 0xb4, 0xb0, 0xb0, 0xba, 0x5c, 0x2f, 0x2f, 0x4e, 0xc9, 0xc1, 0xdb, 0xc9, 0xb4 }; diff --git a/apps/leave.h b/apps/leave.h index 238976f209..8850d1cd0b 100644 --- a/apps/leave.h +++ b/apps/leave.h @@ -10,198 +10,198 @@ */ static unsigned char leave[] = { -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc1, 0x3d, -0x42, 0x46, 0x3f, 0x3f, 0x46, 0x3f, 0x4e, 0xba, 0xbe, 0xbe, -0xbc, 0xba, 0xbe, 0xc5, 0xb6, 0x2e, 0x2c, 0x33, 0x2f, 0x2e, -0x2f, 0x33, 0x2b, 0x54, 0xac, 0xb0, 0xb0, 0xad, 0xaf, 0xb0, -0xae, 0xcd, 0x3b, 0x2f, 0x31, 0x2e, 0x2f, 0x31, 0x2e, 0x46, -0xc5, 0xaf, 0xb0, 0xaf, 0xae, 0xaf, 0xaf, 0xb0, 0xfe, 0x2d, -0x31, 0x31, 0x2e, 0x31, 0x2f, 0x31, 0xfe, 0xae, 0xaf, 0xaf, -0xae, 0xb0, 0xae, 0xaf, 0xfe, 0xdb, 0x2e, 0x2e, 0x31, 0x31, -0x2d, 0x2e, 0xdb, 0x68, 0xaf, 0xad, 0xb0, 0xb0, 0xae, 0xaf, -0x5c, 0xe7, 0x39, 0x2d, 0x31, 0x31, 0x31, 0x2d, 0xfe, 0xfe, -0x68, 0xad, 0xaf, 0xb0, 0xaf, 0xac, 0xbc, 0xfe, 0xd3, 0x2f, -0x2e, 0x33, 0x31, 0x2d, 0x4e, 0xdb, 0xfe, 0xfe, 0xac, 0xaf, -0xb0, 0xac, 0xb6, 0x68, 0xe7, 0xdb, 0x2e, 0x2f, 0x35, 0x2f, -0x31, 0xe7, 0xe7, 0x68, 0xad, 0xac, 0xb0, 0xae, 0xac, 0xfe, -0xfe, 0xdb, 0xfe, 0x2d, 0x33, 0x31, 0x2e, 0xfe, 0xfe, 0xfe, -0xfe, 0xbc, 0xaf, 0xb0, 0xad, 0xfe, 0xfe, 0xfe, 0xe7, 0x5c, -0x2e, 0x33, 0x2e, 0x35, 0xe7, 0xfe, 0xfe, 0xfe, 0xad, 0xb0, -0xaf, 0xc1, 0xfe, 0xe7, 0xfe, 0xe7, 0x3d, 0x31, 0x2f, 0x37, -0xe7, 0xfe, 0xfe, 0xe7, 0xfe, 0xaf, 0xad, 0xbe, 0xfe, 0xdb, -0xfe, 0xfe, 0xdb, 0x35, 0x2d, 0x39, 0xdb, 0xfe, 0xfe, 0xdb, -0xfe, 0xfe, 0xad, 0xaf, 0xfe, 0xfe, 0xe7, 0x68, 0xfe, 0xd3, -0x2e, 0x2c, 0xdb, 0xdb, 0x2c, 0x35, 0xd3, 0x68, 0xaf, 0xad, -0xb0, 0xb0, 0xad, 0xba, 0x68, 0xe7, 0xe7, 0x2e, 0x2f, 0x33, -0x31, 0x2d, 0xdb, 0xd3, 0x5c, 0xae, 0xaa, 0xe7, 0x68, 0xaa, -0xe7, 0xfe, 0xdb, 0xe7, 0xfe, 0xe7, 0xd3, 0x2d, 0xfe, 0xdb, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc5, 0xfe, 0xe7, 0xe7, -0xfe, 0xfe, 0xe7, 0xe7, 0x3b, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xc5, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0x3b, -0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xb0, 0xfe, 0xfe, -0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0x2e, 0x5c, 0xdb, 0xfe, 0xfe, -0xe7, 0xe7, 0x68, 0xb0, 0xbe, 0x68, 0xe7, 0xe7, 0xfe, 0xfe, -0xdb, 0x39, 0x2f, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xbe, -0xaf, 0xe7, 0x68, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0x33, 0x33, -0xdb, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xb0, 0xb0, 0xfe, 0xfe, -0xe7, 0xfe, 0xfe, 0xfe, 0x35, 0x33, 0xe7, 0xe7, 0xfe, 0xe7, -0xe7, 0xfe, 0xb0, 0xb2, 0xb0, 0xfe, 0xfe, 0xe7, 0xfe, 0xe7, -0x46, 0x35, 0x35, 0x3f, 0xe7, 0xfe, 0xe7, 0xfe, 0xb2, 0xb0, -0xb2, 0xb0, 0xfe, 0xfe, 0xfe, 0xfe, 0x42, 0x35, 0x37, 0x33, -0xe7, 0xfe, 0xfe, 0xfe, 0xb8, 0xb0, 0xb6, 0xb0, 0xba, 0xfe, -0xfe, 0xe7, 0xe7, 0x33, 0x39, 0x39, 0x33, 0xe7, 0xdb, 0xfe, -0xe7, 0xb0, 0xb4, 0xb6, 0xb0, 0xcd, 0xfe, 0xe7, 0xe7, 0x33, -0x39, 0x3b, 0x33, 0x46, 0xd3, 0xfe, 0xfe, 0xb0, 0xb2, 0xb6, -0xb4, 0xb0, 0xfe, 0xfe, 0xdb, 0x35, 0x37, 0x39, 0x39, 0x35, -0x37, 0xdb, 0x68, 0xcd, 0xb2, 0xb6, 0xb6, 0xb4, 0xb4, 0x68, -0xe7, 0x42, 0x37, 0x3b, 0x3b, 0x39, 0x37, 0xdb, 0xfe, 0xcd, -0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb4, 0xfe, 0x54, 0x37, 0x3b, -0x39, 0x3b, 0x3b, 0x39, 0xe7, 0xfe, 0xb6, 0xb6, 0xb6, 0xb4, -0xb6, 0xb6, 0xbc, 0xfe, 0x3f, 0x3b, 0x3b, 0x39, 0x3b, 0x3b, -0x39, 0xe7, 0xb6, 0xb8, 0xb8, 0xb6, 0xb8, 0xb8, 0xb4, 0xfe, -0x3b, 0x3d, 0x3d, 0x3b, 0x39, 0x3d, 0x3b, 0x39, 0xbe, 0xb8, -0xba, 0xb8, 0xb6, 0xb8, 0xba, 0xb4, 0xfe, 0x39, 0x3f, 0x3d, -0x3b, 0x3d, 0x3f, 0x39, 0xdb, 0xb4, 0xba, 0xb8, 0xb6, 0xb8, -0xbc, 0xb4, 0xba, 0x39, 0x42, 0x3f, 0x3d, 0x3d, 0x3f, 0x3f, -0x3b, 0xb8, 0xb6, 0xbc, 0xb8, 0xb8, 0xba, 0xbc, 0xb8, 0xe7, -0x3d, 0x42, 0x3f, 0x3d, 0x3f, 0x42, 0x3d, 0xfe, 0xb8, 0xbc, -0xbc, 0xba, 0xba, 0xbc, 0xba, 0xe7, 0x3d, 0x3f, 0x42, 0x3f, -0x3f, 0x42, 0x42, 0xfe, 0xfe, 0xbc, 0xbc, 0xbe, 0xbc, 0xbe, -0xbc, 0xc5, 0xe7, 0x68, 0x42, 0x46, 0x42, 0x46, 0x42, 0x46, -0xfe, 0xfe, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xc5, 0xfe, 0xdb, -0x46, 0x46, 0x4a, 0x4a, 0x46, 0x46, 0xe7, 0xfe, 0xd3, 0xbe, -0xc9, 0xc9, 0xc5, 0xc5, 0xe7, 0xdb, 0xd3, 0x4a, 0x4e, 0x54, -0x4e, 0x4e, 0xfe, 0x5c, 0x54, 0xd3, 0xcd, 0xd3, 0xd3, 0xcd, -0xd3, 0xd3, 0xcd, 0xfe, 0x5c, 0x68, 0x5c, 0x5c, 0x5c, 0x68, -0x5c, 0x5c, 0xcd, 0xcd, 0xd3, 0xcd, 0xdb, 0xe7, 0xe7, 0xdb, -0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, -0xfe, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0xfe, 0x46, 0x35, 0x35, -0x37, 0x39, 0x3b, 0x39, 0x35, 0x33, 0x35, 0x5c, 0xd3, 0xcd, -0xdb, 0xfe, 0xfe, 0xd3, 0xb0, 0xb0, 0xb0, 0xb4, 0xb4, 0xb6, -0xb2, 0xb0, 0xb0, 0xb6, 0xcd, 0x5c, 0x68, 0xfe, 0xfe, 0xfe, -0x3b, 0x33, 0x35, 0x37, 0x39, 0x3b, 0x39, 0x37, 0x35, 0x35, -0x3f, 0xdb, 0xcd, 0xcd, 0xdb, 0xfe, 0xe7, 0xc5, 0xb0, 0xb0, -0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb0, 0xb0, 0xcd, 0x5c, 0x5c, -0xfe, 0xe7, 0xe7, 0xfe, 0x35, 0x35, 0x35, 0x39, 0x3b, 0x3b, -0x39, 0x35, 0x33, 0x39, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, -0xba, 0xb0, 0xb0, 0xb2, 0xb4, 0xb6, 0xb6, 0xb4, 0xb2, 0xb0, -0xb4, 0xc9, 0x5c, 0x68, 0xfe, 0xfe, 0x5c, 0x3b, 0x35, 0x37, -0x39, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, 0x3d, 0xe7, 0xcd, -0xdb, 0xfe, 0xe7, 0xbe, 0xb2, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, -0xb6, 0xb4, 0xb0, 0xb0, 0xc5, 0x5c, 0x5c, 0xfe, 0xe7, 0xe7, -0x4e, 0x35, 0x35, 0x37, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, -0x3b, 0xe7, 0xc9, 0xcd, 0xe7, 0xfe, 0xd3, 0xb4, 0xb2, 0xb2, -0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, 0xb4, 0xc1, 0x68, -0x68, 0xfe, 0xfe, 0x42, 0x39, 0x37, 0x39, 0x3b, 0x3b, 0x3b, -0x3b, 0x3b, 0x39, 0x37, 0x3b, 0xfe, 0xd3, 0xdb, 0xfe, 0xcd, -0xb4, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, -0xb2, 0xc1, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0x3d, 0x37, 0x37, -0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x37, 0x37, 0x39, 0xfe, 0xcd, -0xd3, 0xfe, 0xfe, 0xc1, 0xb2, 0xb2, 0xb4, 0xb6, 0xb6, 0xb6, -0xb6, 0xb6, 0xb6, 0xb4, 0xb4, 0xbc, 0x68, 0xfe, 0xfe, 0xfe, -0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x39, -0x39, 0x3b, 0xfe, 0xdb, 0xe7, 0xfe, 0xbc, 0xb6, 0xb6, 0xb6, -0xb8, 0xb6, 0xb6, 0xb6, 0xb8, 0xb6, 0xb4, 0xb4, 0xbc, 0xfe, -0x68, 0xfe, 0xe7, 0x5c, 0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, -0x3d, 0x3d, 0x3b, 0x39, 0x3b, 0x68, 0xdb, 0xdb, 0xfe, 0xe7, -0xb8, 0xb6, 0xb6, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb6, -0xb4, 0xb6, 0xdb, 0x68, 0xfe, 0xfe, 0x46, 0x3b, 0x3b, 0x3b, -0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3b, 0x5c, -0xdb, 0xdb, 0xc9, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, -0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xbc, 0xcd, 0xfe, 0xfe, 0x3d, -0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, -0x3b, 0x3d, 0x46, 0xfe, 0xe7, 0xe7, 0xc5, 0xb8, 0xb8, 0xb8, -0xba, 0xba, 0xb8, 0xb8, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xcd, -0xfe, 0xfe, 0x68, 0x3f, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, -0x3d, 0x3d, 0x3f, 0x3f, 0x3d, 0x3b, 0x4a, 0xfe, 0xdb, 0xbc, -0xb8, 0xba, 0xba, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xba, 0xba, -0xba, 0xba, 0xba, 0xc5, 0xfe, 0x54, 0x3f, 0x3f, 0x3f, 0x3f, -0x3f, 0x3f, 0x3d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, -0xfe, 0xe7, 0xdb, 0xbc, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, -0xba, 0xba, 0xbc, 0xba, 0xba, 0xba, 0xc5, 0xfe, 0xfe, 0x4e, -0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, -0x42, 0x42, 0x3f, 0x46, 0xfe, 0xcd, 0xb8, 0xba, 0xbc, 0xbc, -0xbc, 0xba, 0xba, 0xba, 0xba, 0xbc, 0xbc, 0xbc, 0xba, 0xb8, -0xbe, 0xfe, 0x42, 0x3d, 0x3f, 0x42, 0x42, 0x42, 0x3f, 0x3f, -0x3f, 0x42, 0x42, 0x42, 0x42, 0x3f, 0x3f, 0x68, 0xdb, 0xc5, -0xba, 0xbc, 0xbc, 0xbc, 0xbc, 0xba, 0xba, 0xba, 0xbc, 0xbc, -0xbc, 0xbc, 0xba, 0xc1, 0xfe, 0xfe, 0x3f, 0x42, 0x46, 0x46, -0x46, 0x42, 0x42, 0x42, 0x42, 0x42, 0x46, 0x46, 0x42, 0x3f, -0x42, 0x68, 0xbe, 0xba, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xbc, -0xbc, 0xbc, 0xbe, 0xc1, 0xbe, 0xbc, 0xba, 0xbe, 0x68, 0x3f, -0x42, 0x46, 0x4a, 0x4a, 0x46, 0x42, 0x42, 0x42, 0x46, 0x46, -0x46, 0x46, 0x42, 0x42, 0x68, 0xd3, 0xbc, 0xbc, 0xbe, 0xc1, -0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, 0xc1, 0xbe, 0xbe, -0xc1, 0xfe, 0x4e, 0x42, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, -0x46, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, 0x68, 0xdb, 0xbe, -0xbe, 0xc1, 0xc5, 0xc1, 0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, -0xc5, 0xc5, 0xbe, 0xbc, 0xc1, 0x4e, 0x46, 0x46, 0x4a, 0x4e, -0x4e, 0x4a, 0x46, 0x46, 0x46, 0x4a, 0x4a, 0x4e, 0x4a, 0x46, -0x46, 0xfe, 0xbe, 0xbe, 0xc1, 0xc9, 0xc5, 0xc5, 0xc1, 0xc1, -0xc1, 0xc1, 0xc5, 0xc5, 0xc5, 0xc5, 0xbe, 0xc1, 0xfe, 0x4a, -0x4a, 0x4e, 0x4e, 0x4e, 0x4e, 0x4e, 0x4a, 0x4a, 0x4a, 0x4e, -0x54, 0x4e, 0x4a, 0x4a, 0x4e, 0xcd, 0xc1, 0xc5, 0xc5, 0xc9, -0xc5, 0xc5, 0xc5, 0xc5, 0xc9, 0xcd, 0xcd, 0xcd, 0xcd, 0xc9, -0xc9, 0xd3, 0x68, 0x54, 0x5c, 0x68, 0x68, 0x68, 0x5c, 0x5c, -0x5c, 0x5c, 0x5c, 0x68, 0x68, 0x5c, 0x54, 0x5c, 0xdb, 0xcd, -0xcd, 0xdb, 0xdb, 0xdb, 0xdb, 0xd3, 0xd3, 0xe7, 0xe7, 0xe7, -0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, -0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc1, 0x3d, +0x42, 0x46, 0x3f, 0x3f, 0x46, 0x3f, 0x4e, 0xba, 0xbe, 0xbe, +0xbc, 0xba, 0xbe, 0xc5, 0xb6, 0x2e, 0x2c, 0x33, 0x2f, 0x2e, +0x2f, 0x33, 0x2b, 0x54, 0xac, 0xb0, 0xb0, 0xad, 0xaf, 0xb0, +0xae, 0xcd, 0x3b, 0x2f, 0x31, 0x2e, 0x2f, 0x31, 0x2e, 0x46, +0xc5, 0xaf, 0xb0, 0xaf, 0xae, 0xaf, 0xaf, 0xb0, 0xfe, 0x2d, +0x31, 0x31, 0x2e, 0x31, 0x2f, 0x31, 0xfe, 0xae, 0xaf, 0xaf, +0xae, 0xb0, 0xae, 0xaf, 0xfe, 0xdb, 0x2e, 0x2e, 0x31, 0x31, +0x2d, 0x2e, 0xdb, 0x68, 0xaf, 0xad, 0xb0, 0xb0, 0xae, 0xaf, +0x5c, 0xe7, 0x39, 0x2d, 0x31, 0x31, 0x31, 0x2d, 0xfe, 0xfe, +0x68, 0xad, 0xaf, 0xb0, 0xaf, 0xac, 0xbc, 0xfe, 0xd3, 0x2f, +0x2e, 0x33, 0x31, 0x2d, 0x4e, 0xdb, 0xfe, 0xfe, 0xac, 0xaf, +0xb0, 0xac, 0xb6, 0x68, 0xe7, 0xdb, 0x2e, 0x2f, 0x35, 0x2f, +0x31, 0xe7, 0xe7, 0x68, 0xad, 0xac, 0xb0, 0xae, 0xac, 0xfe, +0xfe, 0xdb, 0xfe, 0x2d, 0x33, 0x31, 0x2e, 0xfe, 0xfe, 0xfe, +0xfe, 0xbc, 0xaf, 0xb0, 0xad, 0xfe, 0xfe, 0xfe, 0xe7, 0x5c, +0x2e, 0x33, 0x2e, 0x35, 0xe7, 0xfe, 0xfe, 0xfe, 0xad, 0xb0, +0xaf, 0xc1, 0xfe, 0xe7, 0xfe, 0xe7, 0x3d, 0x31, 0x2f, 0x37, +0xe7, 0xfe, 0xfe, 0xe7, 0xfe, 0xaf, 0xad, 0xbe, 0xfe, 0xdb, +0xfe, 0xfe, 0xdb, 0x35, 0x2d, 0x39, 0xdb, 0xfe, 0xfe, 0xdb, +0xfe, 0xfe, 0xad, 0xaf, 0xfe, 0xfe, 0xe7, 0x68, 0xfe, 0xd3, +0x2e, 0x2c, 0xdb, 0xdb, 0x2c, 0x35, 0xd3, 0x68, 0xaf, 0xad, +0xb0, 0xb0, 0xad, 0xba, 0x68, 0xe7, 0xe7, 0x2e, 0x2f, 0x33, +0x31, 0x2d, 0xdb, 0xd3, 0x5c, 0xae, 0xaa, 0xe7, 0x68, 0xaa, +0xe7, 0xfe, 0xdb, 0xe7, 0xfe, 0xe7, 0xd3, 0x2d, 0xfe, 0xdb, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc5, 0xfe, 0xe7, 0xe7, +0xfe, 0xfe, 0xe7, 0xe7, 0x3b, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xc5, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0x3b, +0xdb, 0xfe, 0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xb0, 0xfe, 0xfe, +0xe7, 0xfe, 0xfe, 0xfe, 0xdb, 0x2e, 0x5c, 0xdb, 0xfe, 0xfe, +0xe7, 0xe7, 0x68, 0xb0, 0xbe, 0x68, 0xe7, 0xe7, 0xfe, 0xfe, +0xdb, 0x39, 0x2f, 0xdb, 0xfe, 0xfe, 0xe7, 0xe7, 0xfe, 0xbe, +0xaf, 0xe7, 0x68, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0x33, 0x33, +0xdb, 0xfe, 0xfe, 0xdb, 0xe7, 0xfe, 0xb0, 0xb0, 0xfe, 0xfe, +0xe7, 0xfe, 0xfe, 0xfe, 0x35, 0x33, 0xe7, 0xe7, 0xfe, 0xe7, +0xe7, 0xfe, 0xb0, 0xb2, 0xb0, 0xfe, 0xfe, 0xe7, 0xfe, 0xe7, +0x46, 0x35, 0x35, 0x3f, 0xe7, 0xfe, 0xe7, 0xfe, 0xb2, 0xb0, +0xb2, 0xb0, 0xfe, 0xfe, 0xfe, 0xfe, 0x42, 0x35, 0x37, 0x33, +0xe7, 0xfe, 0xfe, 0xfe, 0xb8, 0xb0, 0xb6, 0xb0, 0xba, 0xfe, +0xfe, 0xe7, 0xe7, 0x33, 0x39, 0x39, 0x33, 0xe7, 0xdb, 0xfe, +0xe7, 0xb0, 0xb4, 0xb6, 0xb0, 0xcd, 0xfe, 0xe7, 0xe7, 0x33, +0x39, 0x3b, 0x33, 0x46, 0xd3, 0xfe, 0xfe, 0xb0, 0xb2, 0xb6, +0xb4, 0xb0, 0xfe, 0xfe, 0xdb, 0x35, 0x37, 0x39, 0x39, 0x35, +0x37, 0xdb, 0x68, 0xcd, 0xb2, 0xb6, 0xb6, 0xb4, 0xb4, 0x68, +0xe7, 0x42, 0x37, 0x3b, 0x3b, 0x39, 0x37, 0xdb, 0xfe, 0xcd, +0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb4, 0xfe, 0x54, 0x37, 0x3b, +0x39, 0x3b, 0x3b, 0x39, 0xe7, 0xfe, 0xb6, 0xb6, 0xb6, 0xb4, +0xb6, 0xb6, 0xbc, 0xfe, 0x3f, 0x3b, 0x3b, 0x39, 0x3b, 0x3b, +0x39, 0xe7, 0xb6, 0xb8, 0xb8, 0xb6, 0xb8, 0xb8, 0xb4, 0xfe, +0x3b, 0x3d, 0x3d, 0x3b, 0x39, 0x3d, 0x3b, 0x39, 0xbe, 0xb8, +0xba, 0xb8, 0xb6, 0xb8, 0xba, 0xb4, 0xfe, 0x39, 0x3f, 0x3d, +0x3b, 0x3d, 0x3f, 0x39, 0xdb, 0xb4, 0xba, 0xb8, 0xb6, 0xb8, +0xbc, 0xb4, 0xba, 0x39, 0x42, 0x3f, 0x3d, 0x3d, 0x3f, 0x3f, +0x3b, 0xb8, 0xb6, 0xbc, 0xb8, 0xb8, 0xba, 0xbc, 0xb8, 0xe7, +0x3d, 0x42, 0x3f, 0x3d, 0x3f, 0x42, 0x3d, 0xfe, 0xb8, 0xbc, +0xbc, 0xba, 0xba, 0xbc, 0xba, 0xe7, 0x3d, 0x3f, 0x42, 0x3f, +0x3f, 0x42, 0x42, 0xfe, 0xfe, 0xbc, 0xbc, 0xbe, 0xbc, 0xbe, +0xbc, 0xc5, 0xe7, 0x68, 0x42, 0x46, 0x42, 0x46, 0x42, 0x46, +0xfe, 0xfe, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xc5, 0xfe, 0xdb, +0x46, 0x46, 0x4a, 0x4a, 0x46, 0x46, 0xe7, 0xfe, 0xd3, 0xbe, +0xc9, 0xc9, 0xc5, 0xc5, 0xe7, 0xdb, 0xd3, 0x4a, 0x4e, 0x54, +0x4e, 0x4e, 0xfe, 0x5c, 0x54, 0xd3, 0xcd, 0xd3, 0xd3, 0xcd, +0xd3, 0xd3, 0xcd, 0xfe, 0x5c, 0x68, 0x5c, 0x5c, 0x5c, 0x68, +0x5c, 0x5c, 0xcd, 0xcd, 0xd3, 0xcd, 0xdb, 0xe7, 0xe7, 0xdb, +0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe7, +0xfe, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0xfe, 0x46, 0x35, 0x35, +0x37, 0x39, 0x3b, 0x39, 0x35, 0x33, 0x35, 0x5c, 0xd3, 0xcd, +0xdb, 0xfe, 0xfe, 0xd3, 0xb0, 0xb0, 0xb0, 0xb4, 0xb4, 0xb6, +0xb2, 0xb0, 0xb0, 0xb6, 0xcd, 0x5c, 0x68, 0xfe, 0xfe, 0xfe, +0x3b, 0x33, 0x35, 0x37, 0x39, 0x3b, 0x39, 0x37, 0x35, 0x35, +0x3f, 0xdb, 0xcd, 0xcd, 0xdb, 0xfe, 0xe7, 0xc5, 0xb0, 0xb0, +0xb2, 0xb6, 0xb6, 0xb6, 0xb2, 0xb0, 0xb0, 0xcd, 0x5c, 0x5c, +0xfe, 0xe7, 0xe7, 0xfe, 0x35, 0x35, 0x35, 0x39, 0x3b, 0x3b, +0x39, 0x35, 0x33, 0x39, 0xdb, 0xcd, 0xd3, 0xe7, 0xfe, 0xfe, +0xba, 0xb0, 0xb0, 0xb2, 0xb4, 0xb6, 0xb6, 0xb4, 0xb2, 0xb0, +0xb4, 0xc9, 0x5c, 0x68, 0xfe, 0xfe, 0x5c, 0x3b, 0x35, 0x37, +0x39, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, 0x3d, 0xe7, 0xcd, +0xdb, 0xfe, 0xe7, 0xbe, 0xb2, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, +0xb6, 0xb4, 0xb0, 0xb0, 0xc5, 0x5c, 0x5c, 0xfe, 0xe7, 0xe7, +0x4e, 0x35, 0x35, 0x37, 0x3b, 0x3b, 0x3b, 0x39, 0x37, 0x37, +0x3b, 0xe7, 0xc9, 0xcd, 0xe7, 0xfe, 0xd3, 0xb4, 0xb2, 0xb2, +0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, 0xb4, 0xc1, 0x68, +0x68, 0xfe, 0xfe, 0x42, 0x39, 0x37, 0x39, 0x3b, 0x3b, 0x3b, +0x3b, 0x3b, 0x39, 0x37, 0x3b, 0xfe, 0xd3, 0xdb, 0xfe, 0xcd, +0xb4, 0xb2, 0xb4, 0xb4, 0xb6, 0xb6, 0xb6, 0xb6, 0xb4, 0xb2, +0xb2, 0xc1, 0x5c, 0x5c, 0xfe, 0xfe, 0xfe, 0x3d, 0x37, 0x37, +0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x37, 0x37, 0x39, 0xfe, 0xcd, +0xd3, 0xfe, 0xfe, 0xc1, 0xb2, 0xb2, 0xb4, 0xb6, 0xb6, 0xb6, +0xb6, 0xb6, 0xb6, 0xb4, 0xb4, 0xbc, 0x68, 0xfe, 0xfe, 0xfe, +0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x3b, 0x39, +0x39, 0x3b, 0xfe, 0xdb, 0xe7, 0xfe, 0xbc, 0xb6, 0xb6, 0xb6, +0xb8, 0xb6, 0xb6, 0xb6, 0xb8, 0xb6, 0xb4, 0xb4, 0xbc, 0xfe, +0x68, 0xfe, 0xe7, 0x5c, 0x3b, 0x39, 0x39, 0x3b, 0x3b, 0x3b, +0x3d, 0x3d, 0x3b, 0x39, 0x3b, 0x68, 0xdb, 0xdb, 0xfe, 0xe7, +0xb8, 0xb6, 0xb6, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb6, +0xb4, 0xb6, 0xdb, 0x68, 0xfe, 0xfe, 0x46, 0x3b, 0x3b, 0x3b, +0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3b, 0x5c, +0xdb, 0xdb, 0xc9, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, +0xb8, 0xb8, 0xb8, 0xb8, 0xb8, 0xbc, 0xcd, 0xfe, 0xfe, 0x3d, +0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3b, 0x3d, 0x3d, 0x3d, 0x3d, +0x3b, 0x3d, 0x46, 0xfe, 0xe7, 0xe7, 0xc5, 0xb8, 0xb8, 0xb8, +0xba, 0xba, 0xb8, 0xb8, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xcd, +0xfe, 0xfe, 0x68, 0x3f, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d, +0x3d, 0x3d, 0x3f, 0x3f, 0x3d, 0x3b, 0x4a, 0xfe, 0xdb, 0xbc, +0xb8, 0xba, 0xba, 0xba, 0xba, 0xb8, 0xb8, 0xb8, 0xba, 0xba, +0xba, 0xba, 0xba, 0xc5, 0xfe, 0x54, 0x3f, 0x3f, 0x3f, 0x3f, +0x3f, 0x3f, 0x3d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, +0xfe, 0xe7, 0xdb, 0xbc, 0xba, 0xba, 0xba, 0xba, 0xba, 0xba, +0xba, 0xba, 0xbc, 0xba, 0xba, 0xba, 0xc5, 0xfe, 0xfe, 0x4e, +0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x42, +0x42, 0x42, 0x3f, 0x46, 0xfe, 0xcd, 0xb8, 0xba, 0xbc, 0xbc, +0xbc, 0xba, 0xba, 0xba, 0xba, 0xbc, 0xbc, 0xbc, 0xba, 0xb8, +0xbe, 0xfe, 0x42, 0x3d, 0x3f, 0x42, 0x42, 0x42, 0x3f, 0x3f, +0x3f, 0x42, 0x42, 0x42, 0x42, 0x3f, 0x3f, 0x68, 0xdb, 0xc5, +0xba, 0xbc, 0xbc, 0xbc, 0xbc, 0xba, 0xba, 0xba, 0xbc, 0xbc, +0xbc, 0xbc, 0xba, 0xc1, 0xfe, 0xfe, 0x3f, 0x42, 0x46, 0x46, +0x46, 0x42, 0x42, 0x42, 0x42, 0x42, 0x46, 0x46, 0x42, 0x3f, +0x42, 0x68, 0xbe, 0xba, 0xbc, 0xbe, 0xbe, 0xbe, 0xbc, 0xbc, +0xbc, 0xbc, 0xbe, 0xc1, 0xbe, 0xbc, 0xba, 0xbe, 0x68, 0x3f, +0x42, 0x46, 0x4a, 0x4a, 0x46, 0x42, 0x42, 0x42, 0x46, 0x46, +0x46, 0x46, 0x42, 0x42, 0x68, 0xd3, 0xbc, 0xbc, 0xbe, 0xc1, +0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, 0xc1, 0xbe, 0xbe, +0xc1, 0xfe, 0x4e, 0x42, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, +0x46, 0x46, 0x4a, 0x4a, 0x4a, 0x46, 0x46, 0x68, 0xdb, 0xbe, +0xbe, 0xc1, 0xc5, 0xc1, 0xc1, 0xbe, 0xbe, 0xbe, 0xbe, 0xc1, +0xc5, 0xc5, 0xbe, 0xbc, 0xc1, 0x4e, 0x46, 0x46, 0x4a, 0x4e, +0x4e, 0x4a, 0x46, 0x46, 0x46, 0x4a, 0x4a, 0x4e, 0x4a, 0x46, +0x46, 0xfe, 0xbe, 0xbe, 0xc1, 0xc9, 0xc5, 0xc5, 0xc1, 0xc1, +0xc1, 0xc1, 0xc5, 0xc5, 0xc5, 0xc5, 0xbe, 0xc1, 0xfe, 0x4a, +0x4a, 0x4e, 0x4e, 0x4e, 0x4e, 0x4e, 0x4a, 0x4a, 0x4a, 0x4e, +0x54, 0x4e, 0x4a, 0x4a, 0x4e, 0xcd, 0xc1, 0xc5, 0xc5, 0xc9, +0xc5, 0xc5, 0xc5, 0xc5, 0xc9, 0xcd, 0xcd, 0xcd, 0xcd, 0xc9, +0xc9, 0xd3, 0x68, 0x54, 0x5c, 0x68, 0x68, 0x68, 0x5c, 0x5c, +0x5c, 0x5c, 0x5c, 0x68, 0x68, 0x5c, 0x54, 0x5c, 0xdb, 0xcd, +0xcd, 0xdb, 0xdb, 0xdb, 0xdb, 0xd3, 0xd3, 0xe7, 0xe7, 0xe7, +0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xe7, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, +0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe }; diff --git a/autoconf/ast_c_compile_check.m4 b/autoconf/ast_c_compile_check.m4 index ebdaefa899..48fe77cebe 100644 --- a/autoconf/ast_c_compile_check.m4 +++ b/autoconf/ast_c_compile_check.m4 @@ -20,7 +20,7 @@ AC_DEFUN([AST_C_COMPILE_CHECK], AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.]) m4_ifval([$4], [AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])]) ], - [ AC_MSG_RESULT(no) ] + [ AC_MSG_RESULT(no) ] ) CPPFLAGS="${saved_cppflags}" fi diff --git a/autoconf/ast_c_declare_check.m4 b/autoconf/ast_c_declare_check.m4 index 89fb8063dc..cd4fa033f3 100644 --- a/autoconf/ast_c_declare_check.m4 +++ b/autoconf/ast_c_declare_check.m4 @@ -23,7 +23,7 @@ AC_DEFUN([AST_C_DECLARE_CHECK], AC_DEFINE([HAVE_$1], 1, [Define if your system has $2 declared.]) m4_ifval([$4], [AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])]) ], - [ AC_MSG_RESULT(no) ] + [ AC_MSG_RESULT(no) ] ) CPPFLAGS="${saved_cppflags}" diff --git a/autoconf/ast_c_define_check.m4 b/autoconf/ast_c_define_check.m4 index 52b9791108..f23bdfce86 100644 --- a/autoconf/ast_c_define_check.m4 +++ b/autoconf/ast_c_define_check.m4 @@ -25,7 +25,7 @@ AC_DEFUN([AST_C_DEFINE_CHECK], AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.]) m4_ifval([$4], [AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])]) ], - [ AC_MSG_RESULT(no) ] + [ AC_MSG_RESULT(no) ] ) CPPFLAGS="${saved_cppflags}" fi diff --git a/autoconf/ast_check_osptk.m4 b/autoconf/ast_check_osptk.m4 index e93b2951a4..e42ec0e29f 100644 --- a/autoconf/ast_check_osptk.m4 +++ b/autoconf/ast_check_osptk.m4 @@ -1,4 +1,4 @@ -dnl +dnl dnl @synopsis AST_CHECK_OSPTK([REQ_VER_MAJOR],[REQ_VER_MINOR],[REQ_VER_BUGFIX]) dnl dnl @summary check for existence of OSP Toolkit package @@ -64,4 +64,3 @@ AC_DEFUN([AST_CHECK_OSPTK], fi fi ]) - diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 8ec2d58a0d..510881f3c3 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -234,11 +234,11 @@ AC_DEFUN([AST_CHECK_PWLIB_BUILD], [ AC_LINK_IFELSE( [AC_LANG_PROGRAM([$4],[$5])], - [ AC_MSG_RESULT(yes) - ac_cv_lib_$2="yes" + [ AC_MSG_RESULT(yes) + ac_cv_lib_$2="yes" ], - [ AC_MSG_RESULT(no) - ac_cv_lib_$2="no" + [ AC_MSG_RESULT(no) + ac_cv_lib_$2="no" ] ) diff --git a/autoconf/ast_pkgconfig.m4 b/autoconf/ast_pkgconfig.m4 index 8641f94a94..ae7bbc0865 100644 --- a/autoconf/ast_pkgconfig.m4 +++ b/autoconf/ast_pkgconfig.m4 @@ -14,4 +14,3 @@ AC_DEFUN([AST_PKG_CONFIG_CHECK], ) fi ]) - diff --git a/bridges/Makefile b/bridges/Makefile index 1baf267bac..529994a647 100644 --- a/bridges/Makefile +++ b/bridges/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for bridging modules # # Copyright (C) 2005-2007, Digium, Inc. diff --git a/bridges/bridge_holding.c b/bridges/bridge_holding.c index 5f354c0d58..f667f765d8 100644 --- a/bridges/bridge_holding.c +++ b/bridges/bridge_holding.c @@ -444,4 +444,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Holding bridge module"); - diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 900e984e21..3ba4cb9dda 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -5,7 +5,7 @@ MD5=${MD5:-md5sum} cat << END /* - * buildopts.h + * buildopts.h * Automatically generated */ diff --git a/build_tools/make_defaults_h b/build_tools/make_defaults_h index e6051e5f74..4a9fb55213 100755 --- a/build_tools/make_defaults_h +++ b/build_tools/make_defaults_h @@ -1,7 +1,7 @@ #!/bin/sh cat << END /* - * defaults.h + * defaults.h * Automatically generated from build options, * only used in main/asterisk.c */ diff --git a/build_tools/make_sample_voicemail b/build_tools/make_sample_voicemail index 78062dd708..db0e84774a 100755 --- a/build_tools/make_sample_voicemail +++ b/build_tools/make_sample_voicemail @@ -7,16 +7,16 @@ for lang in /en/ /fr/ /es/ [ ! -f "${1}/sounds${lang}vm-isunavail.${format}" ] && continue mkdir -p "${2}/voicemail/default/1234${lang}" - + : > "${2}/voicemail/default/1234${lang}unavail.${format}" - + for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail do cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}unavail.${format}" done : > "${2}/voicemail/default/1234${lang}busy.${format}" - + for file in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone do cat "${1}/sounds${lang}${file}.${format}" >> "${2}/voicemail/default/1234${lang}busy.${format}" diff --git a/build_tools/make_version b/build_tools/make_version index 3e0f4a0b0f..ce3bf6e130 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -89,13 +89,13 @@ elif [ -d ${1}/.git ]; then if [ -z ${GIT} ]; then GIT="git" fi - + if ! command -v ${GIT} >/dev/null 2>&1; then echo "UNKNOWN__and_probably_unsupported" exit 1 fi - cd ${1} - + cd ${1} + # If the first log commit messages indicates that this is checked into # subversion, we'll just use the SVN- form of the revision. MODIFIED="" diff --git a/build_tools/sha1sum-sh b/build_tools/sha1sum-sh index 33d53f1b59..5fd2a63fbc 100755 --- a/build_tools/sha1sum-sh +++ b/build_tools/sha1sum-sh @@ -68,4 +68,3 @@ else exit 1 fi fi - diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index b7417ac259..d4da850ce8 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -831,4 +831,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Adaptive ODBC CDR bac .reload = reload, .load_pri = AST_MODPRI_CDR_DRIVER, ); - diff --git a/cdr/cdr_beanstalkd.c b/cdr/cdr_beanstalkd.c index 4812c91aa3..8f4863aa52 100644 --- a/cdr/cdr_beanstalkd.c +++ b/cdr/cdr_beanstalkd.c @@ -267,4 +267,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Asterisk Beanstalkd C .reload = reload, .load_pri = AST_MODPRI_CDR_DRIVER, ); - diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index fec20eaa8d..5a5eb9ed07 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -232,4 +232,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Se .reload = reload, .load_pri = AST_MODPRI_CDR_DRIVER, ); - diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index f6b311def5..a43e96cd83 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -194,7 +194,7 @@ static int build_radius_record(VALUE_PAIR **tosend, struct ast_cdr *cdr) } /* Setting Acct-Session-Id & User-Name attributes for proper generation - * of Acct-Unique-Session-Id on server side + * of Acct-Unique-Session-Id on server side */ /* Channel */ if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0)) diff --git a/cel/Makefile b/cel/Makefile index 8e0a0225ec..9e3cb5cea6 100644 --- a/cel/Makefile +++ b/cel/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for CEL backends # # Copyright (C) 1999-2008, Digium, Inc. diff --git a/cel/cel_custom.c b/cel/cel_custom.c index d05a1260c3..9c81ee1d40 100644 --- a/cel/cel_custom.c +++ b/cel/cel_custom.c @@ -224,4 +224,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable Comma Se .reload = reload, .load_pri = AST_MODPRI_CDR_DRIVER, ); - diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c index bdf913cd4c..a289b877ca 100644 --- a/cel/cel_odbc.c +++ b/cel/cel_odbc.c @@ -814,7 +814,7 @@ static int unload_module(void) free_config(); AST_RWLIST_UNLOCK(&odbc_tables); AST_RWLIST_HEAD_DESTROY(&odbc_tables); - + return 0; } @@ -856,4 +856,3 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, ODBC_BACKEND_NAME, .reload = reload, .load_pri = AST_MODPRI_CDR_DRIVER, ); - diff --git a/channels/Makefile b/channels/Makefile index 242d3f46af..9f6f9d6aab 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -36,4 +36,3 @@ misdn_config.o: _ASTCFLAGS+=-Imisdn misdn/isdn_lib.o: _ASTCFLAGS+=-Wno-strict-aliasing $(call MOD_ADD_C,chan_oss,console_video.c vgrabbers.c console_board.c) - diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index c53c1a3449..ed7d5cfe39 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -16,8 +16,8 @@ * at the top of the source tree. */ -/*! \file - * \brief ALSA sound card channel driver +/*! \file + * \brief ALSA sound card channel driver * * \author Matthew Fredrickson * @@ -127,7 +127,7 @@ static struct chan_alsa_pvt { } alsa; /* Number of buffers... Each is FRAMESIZE/8 ms long. For example - with 160 sample frames, and a buffer size of 3, we have a 60ms buffer, + with 160 sample frames, and a buffer size of 3, we have a 60ms buffer, usually plenty. */ #define MAX_BUFFER_SIZE 100 @@ -295,7 +295,7 @@ static int soundcard_init(void) static int alsa_digit(struct ast_channel *c, char digit, unsigned int duration) { ast_mutex_lock(&alsalock); - ast_verbose(" << Console Received digit %c of duration %u ms >> \n", + ast_verbose(" << Console Received digit %c of duration %u ms >> \n", digit, duration); ast_mutex_unlock(&alsalock); @@ -686,7 +686,7 @@ static char *console_answer(struct ast_cli_entry *e, int cmd, struct ast_cli_arg return NULL; case CLI_GENERATE: - return NULL; + return NULL; } if (a->argc != 2) @@ -732,7 +732,7 @@ static char *console_sendtext(struct ast_cli_entry *e, int cmd, struct ast_cli_a " Sends a text message for display on the remote terminal.\n"; return NULL; case CLI_GENERATE: - return NULL; + return NULL; } if (a->argc < 3) @@ -780,9 +780,9 @@ static char *console_hangup(struct ast_cli_entry *e, int cmd, struct ast_cli_arg " Hangs up any call currently placed on the console.\n"; return NULL; case CLI_GENERATE: - return NULL; + return NULL; } - + if (a->argc != 2) return CLI_SHOWUSAGE; @@ -950,8 +950,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/channels/chan_console.c b/channels/chan_console.c index 4720a75768..7c57ec4fff 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -16,9 +16,9 @@ * at the top of the source tree. */ -/*! - * \file - * \brief Cross-platform console channel driver +/*! + * \file + * \brief Cross-platform console channel driver * * \author Russell Bryant * @@ -26,7 +26,7 @@ * chan_oss, Mark Spencer * chan_oss, Luigi Rizzo * chan_alsa, Matthew Fredrickson - * + * * \ingroup channel_drivers * * Portaudio http://www.portaudio.com/ @@ -77,15 +77,15 @@ #include "asterisk/stasis_channels.h" #include "asterisk/format_cache.h" -/*! - * \brief The sample rate to request from PortAudio +/*! + * \brief The sample rate to request from PortAudio * * \todo Make this optional. If this is only going to talk to 8 kHz endpoints, * then it makes sense to use 8 kHz natively. */ #define SAMPLE_RATE 16000 -/*! +/*! * \brief The number of samples to configure the portaudio stream for * * 320 samples (20 ms) is the most common frame size in Asterisk. So, the code @@ -103,7 +103,7 @@ /*! \brief Mono Output */ #define OUTPUT_CHANNELS 1 -/*! +/*! * \brief Maximum text message length * \note This should be changed if there is a common definition somewhere * that defines the maximum length of a text message. @@ -177,8 +177,8 @@ static struct ao2_container *pvts; static struct console_pvt *active_pvt; AST_RWLOCK_DEFINE_STATIC(active_lock); -/*! - * \brief Global jitterbuffer configuration +/*! + * \brief Global jitterbuffer configuration * * \note Disabled by default. * \note Values shown here match the defaults shown in console.conf.sample @@ -203,7 +203,7 @@ static int console_answer(struct ast_channel *c); static struct ast_frame *console_read(struct ast_channel *chan); static int console_call(struct ast_channel *c, const char *dest, int timeout); static int console_write(struct ast_channel *chan, struct ast_frame *f); -static int console_indicate(struct ast_channel *chan, int cond, +static int console_indicate(struct ast_channel *chan, int cond, const void *data, size_t datalen); static int console_fixup(struct ast_channel *oldchan, struct ast_channel *newchan); /*! @} */ @@ -253,7 +253,7 @@ static struct console_pvt *find_pvt(const char *name) } /*! - * \brief Stream monitor thread + * \brief Stream monitor thread * * \arg data A pointer to the console_pvt structure that contains the portaudio * stream that needs to be monitored. @@ -296,19 +296,19 @@ static int open_stream(struct console_pvt *pvt) { int res = paInternalError; - if (!strcasecmp(pvt->input_device, "default") && + if (!strcasecmp(pvt->input_device, "default") && !strcasecmp(pvt->output_device, "default")) { - res = Pa_OpenDefaultStream(&pvt->stream, INPUT_CHANNELS, OUTPUT_CHANNELS, + res = Pa_OpenDefaultStream(&pvt->stream, INPUT_CHANNELS, OUTPUT_CHANNELS, paInt16, SAMPLE_RATE, NUM_SAMPLES, NULL, NULL); } else { - PaStreamParameters input_params = { + PaStreamParameters input_params = { .channelCount = 1, .sampleFormat = paInt16, .suggestedLatency = (1.0 / 50.0), /* 20 ms */ .device = paNoDevice, }; - PaStreamParameters output_params = { - .channelCount = 1, + PaStreamParameters output_params = { + .channelCount = 1, .sampleFormat = paInt16, .suggestedLatency = (1.0 / 50.0), /* 20 ms */ .device = paNoDevice, @@ -321,10 +321,10 @@ static int open_stream(struct console_pvt *pvt) def_input = Pa_GetDefaultInputDevice(); def_output = Pa_GetDefaultOutputDevice(); - for (idx = 0; - idx < num_devices && (input_params.device == paNoDevice - || output_params.device == paNoDevice); - idx++) + for (idx = 0; + idx < num_devices && (input_params.device == paNoDevice + || output_params.device == paNoDevice); + idx++) { const PaDeviceInfo *dev = Pa_GetDeviceInfo(idx); @@ -428,7 +428,7 @@ static struct ast_channel *console_new(struct console_pvt *pvt, const char *ext, return NULL; } - if (!(chan = ast_channel_alloc(1, state, pvt->cid_num, pvt->cid_name, NULL, + if (!(chan = ast_channel_alloc(1, state, pvt->cid_num, pvt->cid_name, NULL, ext, ctx, assignedids, requestor, 0, "Console/%s", pvt->name))) { ao2_ref(caps, -1); return NULL; @@ -511,7 +511,7 @@ static int console_digit_begin(struct ast_channel *c, char digit) static int console_digit_end(struct ast_channel *c, char digit, unsigned int duration) { - ast_verb(1, V_BEGIN "Console Received End of Digit %c (duration %u)" V_END, + ast_verb(1, V_BEGIN "Console Received End of Digit %c (duration %u)" V_END, digit, duration); return -1; /* non-zero to request inband audio */ @@ -556,7 +556,7 @@ static int console_answer(struct ast_channel *c) * Calling this function is harmless. However, if it does get called, it * is an indication that something weird happened that really shouldn't * have and is worth looking into. - * + * * Why should this function not get called? Well, let me explain. There are * a couple of ways to pass on audio that has come from this channel. The way * that this channel driver uses is that once the audio is available, it is @@ -644,7 +644,7 @@ static int console_indicate(struct ast_channel *chan, int cond, const void *data ast_moh_stop(chan); break; default: - ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", + ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast_channel_name(chan)); /* The core will play inband indications for us if appropriate */ res = -1; @@ -701,13 +701,13 @@ static struct console_pvt *get_active_pvt(void) struct console_pvt *pvt; ast_rwlock_rdlock(&active_lock); - pvt = ref_pvt(active_pvt); + pvt = ref_pvt(active_pvt); ast_rwlock_unlock(&active_lock); return pvt; } -static char *cli_console_autoanswer(struct ast_cli_entry *e, int cmd, +static char *cli_console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { struct console_pvt *pvt; @@ -798,7 +798,7 @@ static char *cli_console_flash(struct ast_cli_entry *e, int cmd, struct ast_cli_ static char *cli_console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { char *s = NULL; - const char *mye = NULL, *myc = NULL; + const char *mye = NULL, *myc = NULL; struct console_pvt *pvt; if (cmd == CLI_INIT) { @@ -845,7 +845,7 @@ static char *cli_console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_a if (a->argc == e->args + 1) { char *ext = NULL, *con = NULL; s = ast_ext_ctx(pvt, a->argv[e->args], &ext, &con); - ast_debug(1, "provided '%s', exten '%s' context '%s'\n", + ast_debug(1, "provided '%s', exten '%s' context '%s'\n", a->argv[e->args], mye, myc); mye = ext; myc = con; @@ -945,7 +945,7 @@ static char *cli_console_mute(struct ast_cli_entry *e, int cmd, struct ast_cli_a else res = CLI_SHOWUSAGE; - ast_verb(1, V_BEGIN "The Console is now %s" V_END, + ast_verb(1, V_BEGIN "The Console is now %s" V_END, pvt->muted ? "Muted" : "Unmuted"); unref_pvt(pvt); @@ -1277,7 +1277,7 @@ static void set_pvt_defaults(struct console_pvt *pvt) ast_string_field_set(pvt, cid_num, ""); ast_string_field_set(pvt, cid_name, ""); ast_string_field_set(pvt, parkinglot, ""); - + pvt->overridecontext = 0; pvt->autoanswer = 0; } else { @@ -1303,7 +1303,7 @@ static void store_callerid(struct console_pvt *pvt, const char *value) char cid_name[256]; char cid_num[256]; - ast_callerid_split(value, cid_name, sizeof(cid_name), + ast_callerid_split(value, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num)); ast_string_field_set(pvt, cid_name, cid_name); @@ -1386,7 +1386,7 @@ static void build_device(struct ast_config *cfg, const char *name) ao2_link(pvts, pvt); else console_pvt_unlock(pvt); - + unref_pvt(pvt); } @@ -1442,7 +1442,7 @@ static int load_config(int reload) ast_log(LOG_NOTICE, "Config file %s has an invalid format\n", config_file); return -1; } - + ao2_callback(pvts, OBJ_NODATA, pvt_mark_destroy_cb, NULL); ast_mutex_lock(&globals_lock); @@ -1515,8 +1515,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index be24ce3b5f..469fcda9eb 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -7141,7 +7141,7 @@ static char *complete_iax2_unregister(const char *line, const char *word, int po if (pos == 2) { struct ao2_iterator i = ao2_iterator_init(peers, 0); while ((p = ao2_iterator_next(&i))) { - if (!strncasecmp(p->name, word, wordlen) && + if (!strncasecmp(p->name, word, wordlen) && ++which > state && p->expire > -1) { res = ast_strdup(p->name); peer_unref(p); diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 6e8ce354a1..df1eeb8cef 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -2715,8 +2715,8 @@ static int custom_transport_handler(const struct aco_option *opt, struct ast_var * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index a12470cee8..4a080a75b1 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -19,7 +19,7 @@ /*! \file * * \brief Network broadcast sound support channel driver - * + * * \author Mark Spencer * * \ingroup channel_drivers @@ -27,7 +27,7 @@ /*** MODULEINFO nbs - extended + extended ***/ #include "asterisk.h" @@ -53,7 +53,7 @@ static char context[AST_MAX_EXTENSION] = "default"; static const char type[] = "NBS"; /* NBS creates private structures on demand */ - + struct nbs_pvt { NBS *nbs; struct ast_channel *owner; /* Channel we belong to, possibly NULL */ @@ -138,7 +138,7 @@ static struct nbs_pvt *nbs_alloc(const char *data) flags |= NBS_FLAG_OVERRIDE; } else flags = NBS_FLAG_OVERSPEAK; - + ast_copy_string(p->stream, stream, sizeof(p->stream)); p->nbs = nbs_newstream("asterisk", stream, flags); if (!p->nbs) { @@ -185,7 +185,7 @@ static int nbs_xwrite(struct ast_channel *ast, struct ast_frame *frame) /* Don't try tos end audio on-hook */ return 0; } - if (nbs_write(p->nbs, frame->data.ptr, frame->datalen / 2) < 0) + if (nbs_write(p->nbs, frame->data.ptr, frame->datalen / 2) < 0) return -1; return 0; } @@ -271,4 +271,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Network Broadcast Sound Support"); - diff --git a/channels/chan_oss.c b/channels/chan_oss.c index ec112de388..69863d2710 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -47,7 +47,7 @@ #include /* isalnum() used here */ #include -#include +#include #ifdef __linux #include @@ -580,7 +580,7 @@ static int oss_digit_begin(struct ast_channel *c, char digit) static int oss_digit_end(struct ast_channel *c, char digit, unsigned int duration) { /* no better use for received digits than print them */ - ast_verbose(" << Console Received digit %c of duration %u ms >> \n", + ast_verbose(" << Console Received digit %c of duration %u ms >> \n", digit, duration); return 0; } @@ -890,7 +890,7 @@ static char *console_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args * switch (cmd) { case CLI_INIT: e->command = CONSOLE_VIDEO_CMDS; - e->usage = + e->usage = "Usage: " CONSOLE_VIDEO_CMDS "...\n" " Generic handler for console commands.\n"; return NULL; @@ -1142,7 +1142,7 @@ static char *console_mute(struct ast_cli_entry *e, int cmd, struct ast_cli_args struct chan_oss_pvt *o = find_desc(oss_active); const char *s; int toggle = 0; - + if (cmd == CLI_INIT) { e->command = "console {mute|unmute} [toggle]"; e->usage = @@ -1292,7 +1292,7 @@ static struct ast_cli_entry cli_oss[] = { AST_CLI_DEFINE(console_flash, "Flash a call on the console"), AST_CLI_DEFINE(console_dial, "Dial an extension on the console"), AST_CLI_DEFINE(console_mute, "Disable/Enable mic input"), - AST_CLI_DEFINE(console_transfer, "Transfer a call to a different extension"), + AST_CLI_DEFINE(console_transfer, "Transfer a call to a different extension"), AST_CLI_DEFINE(console_cmd, "Generic console command"), AST_CLI_DEFINE(console_sendtext, "Send text to the remote device"), AST_CLI_DEFINE(console_autoanswer, "Sets/displays autoanswer"), @@ -1466,8 +1466,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) @@ -1520,4 +1520,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "OSS Console Channel Driver"); - diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 832f28b499..c33f27a876 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -21,7 +21,7 @@ * \brief Generic Linux Telephony Interface driver * * \author Mark Spencer - * + * * \ingroup channel_drivers */ @@ -114,7 +114,7 @@ AST_MUTEX_DEFINE_STATIC(monlock); /* Boolean value whether the monitoring thread shall continue. */ static unsigned int monitor; - + /* This is the thread for the monitor which checks for input on the channels which are not currently in use. */ static pthread_t monitor_thread = AST_PTHREADT_NULL; @@ -123,7 +123,7 @@ static int restart_monitor(void); /* The private structures of the Phone Jack channels are linked for selecting outgoing channels */ - + #define MODE_DIALTONE 1 #define MODE_IMMEDIATE 2 #define MODE_FXO 3 @@ -336,7 +336,7 @@ static int phone_call(struct ast_channel *ast, const char *dest, int timeout) start = IXJ_PHONE_RING_START(cid); if (start == -1) return -1; - + if (p->mode == MODE_FXS) { const char *digit = strchr(dest, '/'); if (digit) @@ -346,7 +346,7 @@ static int phone_call(struct ast_channel *ast, const char *dest, int timeout) phone_digit_end(ast, *digit++, 0); } } - + ast_setstate(ast, AST_STATE_RINGING); ast_queue_control(ast, AST_CONTROL_RINGING); return 0; @@ -449,7 +449,7 @@ static int phone_setup(struct ast_channel *ast) if (!p->lastinput || (ast_format_cmp(p->lastinput, ast_channel_rawreadformat(ast)) == AST_FORMAT_CMP_NOT_EQUAL)) { ao2_replace(p->lastinput, ast_channel_rawreadformat(ast)); if (ioctl(p->fd, PHONE_REC_CODEC, ast_channel_rawreadformat(ast))) { - ast_log(LOG_WARNING, "Failed to set codec to %s\n", + ast_log(LOG_WARNING, "Failed to set codec to %s\n", ast_format_get_name(ast_channel_rawreadformat(ast))); return -1; } @@ -515,11 +515,11 @@ static struct ast_frame *phone_exception(struct ast_channel *ast) p->fr.offset = 0; p->fr.mallocd=0; p->fr.delivery = ast_tv(0,0); - + phonee.bytes = ioctl(p->fd, PHONE_EXCEPTION); if (phonee.bits.dtmf_ready) { ast_debug(1, "phone_exception(): DTMF\n"); - + /* We've got a digit -- Just handle this nicely and easily */ digit = ioctl(p->fd, PHONE_GET_DTMF_ASCII); p->fr.subclass.integer = digit; @@ -541,7 +541,7 @@ static struct ast_frame *phone_exception(struct ast_channel *ast) phone_setup(ast); ast_setstate(ast, AST_STATE_UP); return &p->fr; - } else + } else ast_log(LOG_WARNING, "Got off hook in weird state %u\n", ast_channel_state(ast)); } } @@ -564,7 +564,7 @@ static struct ast_frame *phone_read(struct ast_channel *ast) { int res; struct phone_pvt *p = ast_channel_tech_pvt(ast); - + /* Some nice norms */ p->fr.datalen = 0; @@ -645,7 +645,7 @@ static int phone_write_buf(struct phone_pvt *p, const char *buf, int len, int fr } p->obuflen -= frlen; /* Move memory if necessary */ - if (p->obuflen) + if (p->obuflen) memmove(p->obuf, p->obuf + frlen, p->obuflen); } return len; @@ -654,7 +654,7 @@ static int phone_write_buf(struct phone_pvt *p, const char *buf, int len, int fr static int phone_send_text(struct ast_channel *ast, const char *text) { int length = strlen(text); - return phone_write_buf(ast_channel_tech_pvt(ast), text, length, length, 0) == + return phone_write_buf(ast_channel_tech_pvt(ast), text, length, length, 0) == length ? 0 : -1; } @@ -685,7 +685,7 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame) /* Don't try tos end audio on-hook */ return 0; } -#endif +#endif if (ast_format_cmp(frame->subclass.format, ast_format_g729) == AST_FORMAT_CMP_EQUAL) { if (!p->lastformat || (ast_format_cmp(p->lastformat, ast_format_g729) != AST_FORMAT_CMP_EQUAL)) { ioctl(p->fd, PHONE_PLAY_STOP); @@ -812,7 +812,7 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame) expected = frame->datalen - sofar; if (maxfr < expected) expected = maxfr; - /* XXX Internet Phone Jack does not handle the 4-byte VAD frame properly! XXX + /* XXX Internet Phone Jack does not handle the 4-byte VAD frame properly! XXX we have to pad it to 24 bytes still. */ if (frame->datalen == 4) { if (p->silencesupression) { @@ -832,7 +832,7 @@ static int phone_write(struct ast_channel *ast, struct ast_frame *frame) } if (res != expected) { if ((errno != EAGAIN) && (errno != EINTR)) { - if (res < 0) + if (res < 0) ast_log(LOG_WARNING, "Write returned error (%s)\n", strerror(errno)); /* * Card is in non-blocking mode now and it works well now, but there are @@ -1024,8 +1024,8 @@ static void phone_check_exception(struct phone_pvt *i) } if (phonee.bits.caller_id) ast_verbose("We have caller ID\n"); - - + + } static void *do_monitor(void *data) @@ -1191,7 +1191,7 @@ static struct phone_pvt *mkif(const char *iface, int mode, int txgain, int rxgai { /* Make a phone_pvt structure for this interface */ struct phone_pvt *tmp; - + tmp = ast_calloc(1, sizeof(*tmp)); if (tmp) { tmp->fd = open(iface, O_RDWR); @@ -1205,7 +1205,7 @@ static struct phone_pvt *mkif(const char *iface, int mode, int txgain, int rxgai ast_debug(1, "Unable to set port to PSTN\n"); } } else { - if (ioctl(tmp->fd, IXJCTL_PORT, PORT_POTS)) + if (ioctl(tmp->fd, IXJCTL_PORT, PORT_POTS)) if (mode != MODE_FXS) ast_debug(1, "Unable to set port to POTS\n"); } @@ -1217,7 +1217,7 @@ static struct phone_pvt *mkif(const char *iface, int mode, int txgain, int rxgai ast_debug(1, "ioctl(PHONE_PSTN_SET_STATE) failed on %s (%s)\n",iface, strerror(errno)); if (echocancel != AEC_OFF) ioctl(tmp->fd, IXJCTL_AEC_START, echocancel); - if (silencesupression) + if (silencesupression) tmp->silencesupression = 1; #ifdef PHONE_VAD ioctl(tmp->fd, PHONE_VAD, tmp->silencesupression); @@ -1300,7 +1300,7 @@ static int parse_gain_value(const char *gain_type, const char *value) return DEFAULT_GAIN; } - /* multiplicate gain by 1.0 gain value */ + /* multiplicate gain by 1.0 gain value */ gain = gain * (float)DEFAULT_GAIN; /* percentage? */ @@ -1424,7 +1424,7 @@ static int load_module(void) if (tmp) { tmp->next = iflist; iflist = tmp; - + } else { ast_log(LOG_ERROR, "Unable to register channel '%s'\n", v->value); ast_config_destroy(cfg); @@ -1439,7 +1439,7 @@ static int load_module(void) } else if (!strcasecmp(v->name, "callerid")) { ast_callerid_split(v->value, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num)); } else if (!strcasecmp(v->name, "mode")) { - if (!strncasecmp(v->value, "di", 2)) + if (!strncasecmp(v->value, "di", 2)) mode = MODE_DIALTONE; else if (!strncasecmp(v->value, "sig", 3)) mode = MODE_SIGMA; @@ -1483,13 +1483,13 @@ static int load_module(void) echocancel = AEC_MED; } else if (!strcasecmp(v->value, "high")) { echocancel = AEC_HIGH; - } else + } else ast_log(LOG_WARNING, "Unknown echo cancellation '%s'\n", v->value); } else if (!strcasecmp(v->name, "txgain")) { txgain = parse_gain_value(v->name, v->value); } else if (!strcasecmp(v->name, "rxgain")) { rxgain = parse_gain_value(v->name, v->value); - } + } v = v->next; } ast_mutex_unlock(&iflock); @@ -1515,4 +1515,3 @@ static int load_module(void) } AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Linux Telephony API Support"); - diff --git a/channels/chan_phone.h b/channels/chan_phone.h index e71ba0c7da..d15570850f 100644 --- a/channels/chan_phone.h +++ b/channels/chan_phone.h @@ -15,243 +15,243 @@ */ static unsigned char DialTone[] = { -0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, -0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, -0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, -0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, -0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, -0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, -0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, -0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, -0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, -0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, -0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, -0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, -0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, -0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, -0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, -0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, -0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, -0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, -0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, -0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, -0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, -0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, -0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, -0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, -0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, -0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, -0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, -0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, -0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, -0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, -0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, -0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, -0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, -0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, -0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, -0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, -0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, -0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, -0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, -0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, -0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, -0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, -0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, -0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, -0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, -0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, -0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, -0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, -0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, -0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, -0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, -0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, -0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, -0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, -0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, -0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, -0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, -0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, -0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, -0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, -0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, -0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, -0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, -0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, -0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, -0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, -0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, -0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, -0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, -0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, -0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, -0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, -0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, -0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, -0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, -0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, -0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, -0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, -0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, -0x59, 0x2a, 0x1c, 0x16, 0x11, 0x10, 0x11, 0x16, 0x1d, 0x2b, -0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, -0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, -0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, -0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, -0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, -0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, -0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, -0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, -0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, -0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, -0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, -0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, -0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, -0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, -0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, -0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, -0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, -0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, -0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, -0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, -0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, -0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, -0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, -0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, -0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, -0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, -0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, -0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, -0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, -0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, -0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, -0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, -0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, -0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, -0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, -0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, -0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, -0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, -0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, -0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, -0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, -0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, -0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, -0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, -0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, -0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, -0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, -0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, -0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, -0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, -0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, -0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, -0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, -0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, -0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, -0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, -0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, -0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, -0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, -0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, -0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, -0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, -0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, -0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, -0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, -0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, -0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, -0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, -0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, -0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, -0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, -0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, -0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, -0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, -0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, -0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, -0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, -0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, -0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, -0x59, 0x2a, 0x1c, 0x16, 0x11, 0x10, 0x11, 0x16, 0x1d, 0x2b, -0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, -0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, -0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, -0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, -0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, -0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, -0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, -0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, -0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, -0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, -0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, -0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, -0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, -0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, -0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, -0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, -0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, -0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, -0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, -0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, -0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, -0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, -0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, -0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, -0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, -0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, -0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, -0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, -0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, -0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, -0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, -0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, -0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, -0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, -0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, -0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, -0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, -0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, -0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, -0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, -0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, -0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, -0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, -0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, -0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, -0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, -0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, -0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, -0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, -0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, -0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, -0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, -0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, -0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, -0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, -0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, -0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, -0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, -0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, -0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, -0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, -0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, -0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, -0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, -0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, -0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, -0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, -0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, -0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, -0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, -0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, -0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, -0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, -0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, -0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, -0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, -0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, -0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, -0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, +0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, +0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, +0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, +0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, +0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, +0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, +0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, +0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, +0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, +0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, +0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, +0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, +0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, +0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, +0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, +0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, +0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, +0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, +0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, +0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, +0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, +0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, +0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, +0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, +0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, +0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, +0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, +0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, +0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, +0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, +0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, +0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, +0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, +0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, +0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, +0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, +0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, +0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, +0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, +0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, +0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, +0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, +0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, +0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, +0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, +0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, +0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, +0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, +0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, +0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, +0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, +0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, +0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, +0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, +0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, +0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, +0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, +0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, +0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, +0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, +0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, +0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, +0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, +0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, +0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, +0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, +0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, +0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, +0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, +0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, +0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, +0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, +0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, +0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, +0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, +0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, +0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, +0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, +0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, +0x59, 0x2a, 0x1c, 0x16, 0x11, 0x10, 0x11, 0x16, 0x1d, 0x2b, +0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, +0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, +0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, +0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, +0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, +0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, +0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, +0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, +0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, +0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, +0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, +0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, +0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, +0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, +0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, +0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, +0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, +0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, +0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, +0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, +0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, +0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, +0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, +0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, +0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, +0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, +0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, +0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, +0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, +0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, +0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, +0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, +0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, +0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, +0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, +0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, +0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, +0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, +0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, +0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, +0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, +0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, +0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, +0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, +0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, +0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, +0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, +0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, +0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, +0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, +0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, +0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, +0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, +0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, +0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, +0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, +0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, +0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, +0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, +0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, +0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, +0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, +0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, +0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, +0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, +0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, +0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, +0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, +0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, +0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, +0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, +0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, +0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, +0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, +0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, +0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, +0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, +0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, +0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, +0x59, 0x2a, 0x1c, 0x16, 0x11, 0x10, 0x11, 0x16, 0x1d, 0x2b, +0xff, 0xab, 0x9d, 0x96, 0x91, 0x90, 0x91, 0x96, 0x9c, 0xaa, +0xd9, 0x2f, 0x1f, 0x19, 0x15, 0x14, 0x15, 0x19, 0x1f, 0x2c, +0x4e, 0xb9, 0xa7, 0x9f, 0x9c, 0x9b, 0x9c, 0x9f, 0xa7, 0xb3, +0xcf, 0x47, 0x34, 0x2d, 0x2a, 0x2a, 0x2c, 0x31, 0x3a, 0x47, +0x5f, 0xe4, 0xd8, 0xd9, 0xe9, 0x64, 0x4f, 0x49, 0x46, 0x49, +0x58, 0xde, 0xc2, 0xb5, 0xad, 0xa8, 0xa6, 0xa6, 0xa9, 0xaf, +0xbf, 0x56, 0x32, 0x26, 0x1e, 0x1b, 0x19, 0x1a, 0x1d, 0x24, +0x33, 0xdd, 0xad, 0x9f, 0x98, 0x94, 0x92, 0x93, 0x97, 0x9e, +0xac, 0xf8, 0x2c, 0x1d, 0x16, 0x11, 0xf, 0x10, 0x15, 0x1b, +0x29, 0x55, 0xae, 0x9e, 0x97, 0x92, 0x90, 0x91, 0x95, 0x9c, +0xa8, 0xca, 0x35, 0x22, 0x1a, 0x16, 0x15, 0x16, 0x19, 0x1f, +0x2b, 0x47, 0xbe, 0xab, 0xa2, 0x9e, 0x9d, 0x9e, 0xa2, 0xa9, +0xb4, 0xcc, 0x4f, 0x3a, 0x32, 0x2f, 0x2f, 0x32, 0x39, 0x41, +0x4f, 0x67, 0xf5, 0xf5, 0x67, 0x51, 0x46, 0x3e, 0x3b, 0x3b, +0x3f, 0x4d, 0xe2, 0xbe, 0xb0, 0xa9, 0xa4, 0xa1, 0xa1, 0xa5, +0xab, 0xba, 0x64, 0x33, 0x25, 0x1d, 0x19, 0x17, 0x18, 0x1b, +0x20, 0x2e, 0x72, 0xae, 0x9f, 0x98, 0x94, 0x91, 0x92, 0x96, +0x9c, 0xa9, 0xd4, 0x2f, 0x1e, 0x17, 0x11, 0xf, 0x10, 0x14, +0x1a, 0x26, 0x48, 0xb2, 0x9f, 0x98, 0x93, 0x91, 0x92, 0x95, +0x9b, 0xa7, 0xc1, 0x3a, 0x25, 0x1c, 0x18, 0x16, 0x17, 0x1a, +0x1f, 0x2b, 0x42, 0xc6, 0xae, 0xa6, 0xa0, 0x9f, 0xa0, 0xa5, +0xab, 0xb6, 0xcb, 0x5a, 0x40, 0x39, 0x36, 0x37, 0x3b, 0x43, +0x4e, 0x60, 0x7b, 0x7c, 0x60, 0x4e, 0x41, 0x3a, 0x34, 0x32, +0x33, 0x39, 0x45, 0xed, 0xbd, 0xae, 0xa6, 0xa0, 0x9e, 0x9e, +0xa0, 0xa8, 0xb4, 0xef, 0x34, 0x24, 0x1c, 0x18, 0x16, 0x16, +0x19, 0x1e, 0x2b, 0x54, 0xb1, 0x9f, 0x98, 0x93, 0x91, 0x91, +0x95, 0x9b, 0xa6, 0xc6, 0x33, 0x1f, 0x17, 0x12, 0xf, 0x10, +0x13, 0x1a, 0x24, 0x3e, 0xb8, 0xa2, 0x99, 0x94, 0x92, 0x92, +0x96, 0x9b, 0xa6, 0xbc, 0x40, 0x29, 0x1e, 0x1a, 0x18, 0x19, +0x1b, 0x20, 0x2b, 0x3f, 0xcf, 0xb3, 0xa9, 0xa5, 0xa3, 0xa4, +0xa8, 0xae, 0xb9, 0xcc, 0x67, 0x49, 0x40, 0x3f, 0x42, 0x4a, +0x59, 0x79, 0xe5, 0xe4, 0x7a, 0x54, 0x43, 0x39, 0x31, 0x2d, +0x2c, 0x2d, 0x32, 0x3e, 0x71, 0xbd, 0xad, 0xa4, 0x9e, 0x9c, +0x9c, 0x9e, 0xa4, 0xaf, 0xd7, 0x36, 0x24, 0x1c, 0x17, 0x15, +0x15, 0x17, 0x1d, 0x28, 0x47, 0xb5, 0xa1, 0x98, 0x93, 0x90, +0x90, 0x93, 0x99, 0xa4, 0xbd, 0x38, 0x21, 0x18, 0x13, 0x10, +0x10, 0x13, 0x19, 0x22, 0x39, 0xbe, 0xa5, 0x9b, 0x96, 0x93, +0x93, 0x96, 0x9b, 0xa5, 0xb9, 0x4a, 0x2c, 0x20, 0x1c, 0x1a, +0x1a, 0x1d, 0x22, 0x2c, 0x3d, 0xdc, 0xb8, 0xad, 0xa9, 0xa8, +0xa9, 0xac, 0xb2, 0xbd, 0xce, 0x78, 0x54, 0x4d, 0x4f, 0x5a, +0xff, 0xda, 0xcf, 0xcd, 0xd4, 0xf8, 0x4e, 0x3d, 0x32, 0x2c, +0x29, 0x28, 0x29, 0x2d, 0x38, 0x5c, 0xbd, 0xac, 0xa2, 0x9d, +0x9a, 0x9a, 0x9c, 0xa0, 0xac, 0xca, 0x39, 0x25, 0x1b, 0x16, +0x13, 0x13, 0x16, 0x1b, 0x25, 0x3e, 0xb9, 0xa2, 0x99, 0x93, +0x90, 0x90, 0x93, 0x98, 0xa1, 0xb8, 0x3d, 0x24, 0x19, 0x13, +0x10, 0x10, 0x13, 0x18, 0x21, 0x35, 0xc7, 0xa8, 0x9d, 0x97, +0x95, 0x95, 0x97, 0x9c, 0xa4, 0xb6, 0x57, 0x2f, 0x24, 0x1e, +0x1c, 0x1c, 0x1e, 0x24, 0x2d, 0x3d, 0xf1, 0xbe, 0xb2, 0xad, +0xac, 0xad, 0xb1, 0xb9, 0xc3, 0xd4, 0xfa, 0x64, 0x65, 0xf9, +0xd9, 0xca, 0xc2, 0xbf, 0xc0, 0xc9, 0xe7, 0x4c, 0x39, 0x2e, +0x28, 0x24, 0x23, 0x25, 0x29, 0x33, 0x4f, 0xbf, 0xab, 0xa0, +0x9b, 0x99, 0x98, 0x9a, 0x9e, 0xa9, 0xc0, 0x3c, 0x26, 0x1b, +0x16, 0x12, 0x12, 0x14, 0x19, 0x22, 0x38, 0xbe, 0xa4, 0x9a, +0x93, 0x90, 0x8f, 0x92, 0x97, 0x9f, 0xb3, 0x46, 0x26, 0x1b, +0x15, 0x11, 0x11, 0x13, 0x18, 0x1f, 0x31, 0xd4, 0xab, 0x9e, +0x99, 0x96, 0x96, 0x98, 0x9c, 0xa4, 0xb4, 0x6f, 0x34, 0x28, +0x20, 0x1e, 0x1e, 0x20, 0x26, 0x2e, 0x3d, 0x6d, 0xc5, 0xb9, +0xb3, 0xb2, 0xb4, 0xba, 0xc1, 0xcd, 0xe0, 0xfc, 0xfb, 0xe0, +0xce, 0xc3, 0xbb, 0xb7, 0xb6, 0xb9, 0xc0, 0xda, 0x4b, 0x36, +0x2b, 0x25, 0x20, 0x1f, 0x20, 0x26, 0x2e, 0x46, 0xc2, 0xab, +0x9f, 0x9a, 0x97, 0x96, 0x98, 0x9c, 0xa5, 0xba, 0x41, 0x27, +0x1b, 0x15, 0x12, 0x11, 0x13, 0x18, 0x1f, 0x32, 0xc8, 0xa6, +0x9a, 0x94, 0x90, 0x8f, 0x91, 0x97, 0x9e, 0xaf, 0x54, 0x29, +0x1c, 0x16, 0x12, 0x11, 0x14, 0x18, 0x1f, 0x2e, 0xf2, 0xae, +0xa0, 0x9b, 0x98, 0x97, 0x99, 0x9d, 0xa5, 0xb3, 0xe4, 0x3a, +0x2b, 0x25, 0x21, 0x21, 0x24, 0x29, 0x30, 0x3e, 0x62, 0xcd, +0xbf, 0xbb, 0xbb, 0xbe, 0xc6, 0xd1, 0xe7, 0x76, 0x75, 0xe7, +0xcf, 0xc1, 0xb9, 0xb2, 0xaf, 0xaf, 0xb2, 0xba, 0xcf, 0x4c, +0x34, 0x29, 0x22, 0x1e, 0x1d, 0x1e, 0x22, 0x2b, 0x3e, 0xc7, +0xab, 0x9f, 0x99, 0x96, 0x95, 0x96, 0x9a, 0xa2, 0xb5, 0x4a, +0x28, 0x1c, 0x15, 0x11, 0x10, 0x12, 0x17, 0x1e, 0x2e, 0xd5, +0xa9, 0x9b, 0x95, 0x90, 0x8f, 0x91, 0x96, 0x9d, 0xac, 0x78, +0x2c, 0x1e, 0x17, 0x13, 0x12, 0x14, 0x18, 0x1f, 0x2d, 0x5d, +0xb3, 0xa4, 0x9d, 0x9a, 0x99, 0x9b, 0x9e, 0xa6, 0xb2, 0xd6, +0x3f, 0x2f, 0x29, 0x26, 0x26, 0x28, 0x2d, 0x35, 0x42, 0x5e, +0xd8, 0xca, 0xc6, 0xc9, 0xcf, 0xe4, 0x69, 0x59, 0x58, 0x64, +0xdf, 0xc7, 0xba, 0xb1, 0xac, 0xaa, 0xaa, 0xad, 0xb4, 0xc7, +0x4f, 0x33, 0x27, 0x1f, 0x1c, 0x1b, 0x1c, 0x1f, 0x27, 0x39, +0xce, 0xac, 0x9f, 0x99, 0x95, 0x94, 0x95, 0x99, 0x9f, 0xaf, 0x59, 0x2a, 0x1c, 0x16, 0x11, 0x10, 0x11, 0x16, 0x1d, 0x2b }; diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 10f45a4cc0..4c30d335b2 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -791,7 +791,7 @@ static struct ast_frame *chan_pjsip_cng_tone_detected(struct ast_sip_session *se } /*! - * \brief Function called by core to read any waiting frames + * \brief Function called by core to read any waiting frames * * \note The channel is already locked. */ diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index fff7601fb0..fe947ed936 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -4484,7 +4484,7 @@ static void process_request(int size, unsigned char *buf, struct unistimsession } if (!memcmp(buf + SIZE_HEADER, packet_recv_expansion_pressed_key, sizeof(packet_recv_expansion_pressed_key))) { char keycode = buf[13]; - + if (unistimdebug) { ast_verb(0, "Expansion key pressed: keycode = 0x%02hhx - current state: %s\n", (unsigned char)keycode, ptestate_tostr(pte->state)); @@ -6515,7 +6515,7 @@ static struct unistim_device *build_device(const char *cat, const struct ast_var } ast_mutex_init(&d->lock); ast_copy_string(d->name, cat, sizeof(d->name)); - + ast_copy_string(d->context, DEFAULTCONTEXT, sizeof(d->context)); d->contrast = -1; d->output = OUTPUT_HANDSET; @@ -7032,7 +7032,7 @@ static int unistim_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instanc if (!rtp) { return 0; } - + sub = (struct unistim_subchannel *) ast_channel_tech_pvt(chan); if (!sub) { ast_log(LOG_ERROR, "No Private Structure, this is bad\n"); @@ -7045,9 +7045,9 @@ static int unistim_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instanc ast_rtp_instance_get_local_address(rtp, &tmp); ast_sockaddr_to_sin(&tmp, &us); } - + /* TODO: Set rtp on phone in case of direct rtp (not implemented) */ - + return 0; } diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index 6e77dc2724..1736cc6b26 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -6,7 +6,7 @@ * Copyright (C) 2004 - 2005, Ben Kramer * Ben Kramer * - * Daniel Bichara - Brazilian CallerID detection (c)2004 + * Daniel Bichara - Brazilian CallerID detection (c)2004 * * Welber Silveira - welberms@magiclink.com.br - (c)2004 * Copying CLID string to propper structure after detection @@ -25,7 +25,7 @@ /*! \file * * \brief VoiceTronix Interface driver - * + * * \ingroup channel_drivers */ @@ -87,8 +87,8 @@ extern "C" { #define DEFAULT_GAIN 0 #define DEFAULT_ECHO_CANCEL 1 - -#define VPB_SAMPLES 160 + +#define VPB_SAMPLES 160 #define VPB_MAX_BUF VPB_SAMPLES*4 + AST_FRIENDLY_OFFSET #define VPB_NULL_EVENT 200 @@ -98,7 +98,7 @@ extern "C" { #define MAX_VPB_GAIN 12.0 #define MIN_VPB_GAIN -12.0 -#define DTMF_CALLERID +#define DTMF_CALLERID #define DTMF_CID_START 'D' #define DTMF_CID_STOP 'C' @@ -136,9 +136,9 @@ static int mthreadactive = -1; /* Flag for monitoring monitorthread.*/ static int restart_monitor(void); -/* The private structures of the VPB channels are +/* The private structures of the VPB channels are linked for selecting outgoing channels */ - + #define MODE_DIALTONE 1 #define MODE_IMMEDIATE 2 #define MODE_FXO 3 @@ -198,7 +198,7 @@ static int dtmf_idd = 3000; #define TIMER_PERIOD_BUSY 700 #define TIMER_PERIOD_RING 4000 static int timer_period_ring = TIMER_PERIOD_RING; - + #define VPB_EVENTS_ALL (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP \ |VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \ |VPB_MRING_OFF|VPB_MDROP|VPB_MSTATION_FLASH) @@ -260,7 +260,7 @@ static int max_bridges = MAX_BRIDGES_V4PCI; AST_MUTEX_DEFINE_STATIC(bridge_lock); typedef enum { - vpb_model_unknown = 0, + vpb_model_unknown = 0, vpb_model_v4pci, vpb_model_v12pci } vpb_model_t; @@ -428,7 +428,7 @@ static struct ast_channel_tech vpb_tech_indicate = { }; #if defined(VPB_NATIVE_BRIDGING) -/* Can't get ast_vpb_bridge() working on v4pci without either a horrible +/* Can't get ast_vpb_bridge() working on v4pci without either a horrible * high pitched feedback noise or bad hiss noise depending on gain settings * Get asterisk to do the bridging */ @@ -469,7 +469,7 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ /* Bridge channels, check if we can. I believe we always can, so find a slot.*/ ast_mutex_lock(&bridge_lock); - for (i = 0; i < max_bridges; i++) + for (i = 0; i < max_bridges; i++) if (!bridges[i].inuse) break; if (i < max_bridges) { @@ -480,8 +480,8 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ bridges[i].fo = fo; bridges[i].c0 = c0; bridges[i].c1 = c1; - } - ast_mutex_unlock(&bridge_lock); + } + ast_mutex_unlock(&bridge_lock); if (i == max_bridges) { ast_log(LOG_WARNING, "%s: vpb_bridge: Failed to bridge %s and %s!\n", p0->dev, ast_channel_name(c0), ast_channel_name(c1)); @@ -562,18 +562,18 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ } f = ast_read(who); if (!f || ((f->frametype == AST_FRAME_DTMF) && - (((who == c0) && (flags & AST_BRIDGE_DTMF_CHANNEL_0)) || + (((who == c0) && (flags & AST_BRIDGE_DTMF_CHANNEL_0)) || ((who == c1) && (flags & AST_BRIDGE_DTMF_CHANNEL_1))))) { *fo = f; *rc = who; ast_debug(1, "%s: vpb_bridge: Got a [%s]\n", p0->dev, f ? "digit" : "hangup"); #if 0 if ((c0->tech_pvt == pvt0) && (!ast_check_hangup(c0))) { - if (pr0->set_rtp_peer(c0, NULL, NULL, 0)) + if (pr0->set_rtp_peer(c0, NULL, NULL, 0)) ast_log(LOG_WARNING, "Channel '%s' failed to revert\n", c0->name); } if ((c1->tech_pvt == pvt1) && (!ast_check_hangup(c1))) { - if (pr1->set_rtp_peer(c1, NULL, NULL, 0)) + if (pr1->set_rtp_peer(c1, NULL, NULL, 0)) ast_log(LOG_WARNING, "Channel '%s' failed to revert back\n", c1->name); } /* That's all we needed */ @@ -586,9 +586,9 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ break; } } else { - if ((f->frametype == AST_FRAME_DTMF) || - (f->frametype == AST_FRAME_VOICE) || - (f->frametype == AST_FRAME_VIDEO)) + if ((f->frametype == AST_FRAME_DTMF) || + (f->frametype == AST_FRAME_VOICE) || + (f->frametype == AST_FRAME_VIDEO)) { /* Forward voice or DTMF frames if they happen upon us */ /* Actually I dont think we want to forward on any frames! @@ -606,14 +606,14 @@ static enum ast_bridge_result ast_vpb_bridge(struct ast_channel *c0, struct ast_ cs[0] = cs[1]; cs[1] = cs[2]; }; - vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF); + vpb_bridge(p0->handle, p1->handle, VPB_BRIDGE_OFF); } #endif ast_mutex_lock(&bridge_lock); bridges[i].inuse = 0; - ast_mutex_unlock(&bridge_lock); + ast_mutex_unlock(&bridge_lock); p0->bridge = NULL; p1->bridge = NULL; @@ -644,7 +644,7 @@ static void get_callerid(struct vpb_pvt *p) int rc; struct ast_channel *owner = p->owner; /* - char callerid[AST_MAX_EXTENSION] = ""; + char callerid[AST_MAX_EXTENSION] = ""; */ #ifdef ANALYSE_CID void * ws; @@ -699,7 +699,7 @@ static void get_callerid(struct vpb_pvt *p) ast_free(owner->cid.cid_name); owner->cid.cid_name=NULL; */ - + if (cli_struct->ra_cldn[0] == '\0') { /* owner->cid.cid_num = ast_strdup(cli_struct->cldn); @@ -725,7 +725,7 @@ static void get_callerid(struct vpb_pvt *p) } delete cli_struct; - } else + } else ast_log(LOG_ERROR, "CID record - Failed to set record mode for caller id on %s\n", p->dev); } @@ -767,9 +767,9 @@ static void get_callerid_ast(struct vpb_pvt *p) cs = callerid_new(which_cid); if (cs) { #ifdef ANALYSE_CID - vpb_wave_open_write(&ws, file, VPB_MULAW); - vpb_record_set_gain(p->handle, 3.0); - vpb_record_set_hw_gain(p->handle, 12.0); + vpb_wave_open_write(&ws, file, VPB_MULAW); + vpb_record_set_gain(p->handle, 3.0); + vpb_record_set_hw_gain(p->handle, 12.0); #endif vpb_record_buf_start(p->handle, VPB_MULAW); while ((rc == 0) && (sam_count < 8000 * 3)) { @@ -778,7 +778,7 @@ static void get_callerid_ast(struct vpb_pvt *p) ast_log(LOG_ERROR, "%s: Caller ID couldn't read audio buffer!\n", p->dev); rc = callerid_feed(cs, (unsigned char *)buf, sizeof(buf), ast_format_ulaw); #ifdef ANALYSE_CID - vpb_wave_write(ws, (char *)buf, sizeof(buf)); + vpb_wave_write(ws, (char *)buf, sizeof(buf)); #endif sam_count += sizeof(buf); ast_verb(4, "Collecting Caller ID samples [%d][%d]...\n", sam_count, rc); @@ -886,7 +886,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) vpb_timer_stop(p->ring_timer); f.frametype = AST_FRAME_NULL; } - + } else { f.frametype = AST_FRAME_NULL; /* Ignore. */ } @@ -938,7 +938,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) /* Nothing heard on line for a very long time * Timeout connection */ ast_verb(3, "grunt timeout\n"); - ast_log(LOG_NOTICE, "%s: Line hangup due of lack of conversation\n", p->dev); + ast_log(LOG_NOTICE, "%s: Line hangup due of lack of conversation\n", p->dev); f.subclass.integer = AST_CONTROL_HANGUP; } else { p->lastgrunt = ast_tvnow(); @@ -961,7 +961,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) f.subclass.integer = AST_CONTROL_HANGUP; } #else - ast_log(LOG_NOTICE, "%s: Got call progress callback but blind dialing \n", p->dev); + ast_log(LOG_NOTICE, "%s: Got call progress callback but blind dialing \n", p->dev); f.frametype = AST_FRAME_NULL; #endif break; @@ -1023,15 +1023,15 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) /* ast_verb(4, "%s: LOCKING in handle_owned [%d]\n", p->dev,res); - res = ast_mutex_lock(&p->lock); + res = ast_mutex_lock(&p->lock); ast_verb(4, "%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner); */ if (p->bridge) { /* Check what happened, see if we need to report it. */ switch (f.frametype) { case AST_FRAME_DTMF: - if ( !(p->bridge->c0 == p->owner && + if ( !(p->bridge->c0 == p->owner && (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_0) ) && - !(p->bridge->c1 == p->owner && + !(p->bridge->c1 == p->owner && (p->bridge->flags & AST_BRIDGE_DTMF_CHANNEL_1) )) { /* Kill bridge, this is interesting. */ endbridge = 1; @@ -1058,8 +1058,8 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) ast_mutex_lock(&p->bridge->lock); p->bridge->endbridge = 1; ast_cond_signal(&p->bridge->cond); - ast_mutex_unlock(&p->bridge->lock); - } + ast_mutex_unlock(&p->bridge->lock); + } } if (endbridge) { @@ -1170,7 +1170,7 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e) else if (p->state == VPB_STATE_PLAYBUSY) { playtone(p->handle, &Busytone); p->wantdtmf = 1; - p->ext[0] = 0; + p->ext[0] = 0; } else if (p->state == VPB_STATE_PLAYRING) { playtone(p->handle, &Ringbacktone); p->wantdtmf = 1; @@ -1206,7 +1206,7 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e) /* No owner any more, Assume caller has hung up */ vpb_timer_stop(p->ring_timer); } - } + } break; case VPB_DTMF: @@ -1259,7 +1259,7 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e) if (ast_pickup_call(c)) { /* Call pickup wasnt possible */ } - } else + } else #endif if (ast_exists_extension(NULL, p->context, p->ext, 1, p->callerid)) { if (ast_canmatch_extension(NULL, p->context, p->ext, 1, p->callerid)) { @@ -1354,15 +1354,15 @@ static void *do_monitor(void *unused) } } - ast_mutex_unlock(&monlock); + ast_mutex_unlock(&monlock); if (!p) { if (e.type != VPB_NULL_EVENT) { - ast_log(LOG_WARNING, "Got event [%s][%d], no matching iface!\n", str, e.type); + ast_log(LOG_WARNING, "Got event [%s][%d], no matching iface!\n", str, e.type); ast_verb(4, "vpb/ERR: No interface for Event [%d=>%s] \n", e.type, str); } continue; - } + } /* flush the event from the channel event Q */ vpb_get_event_ch_async(e.handle, &je); @@ -1432,7 +1432,7 @@ static int restart_monitor(void) vpb_put_event(&e); } else { /* Start a new monitor */ - int pid = ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL); + int pid = ast_pthread_create(&monitor_thread, NULL, do_monitor, NULL); ast_verb(4, "Created new monitor thread %d\n", pid); if (pid < 0) { ast_log(LOG_ERROR, "Unable to start monitor thread.\n"); @@ -1502,13 +1502,13 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t tmp->handle = vpb_open(board, channel); - if (tmp->handle < 0) { - ast_log(LOG_WARNING, "Unable to create channel vpb/%d-%d: %s\n", + if (tmp->handle < 0) { + ast_log(LOG_WARNING, "Unable to create channel vpb/%d-%d: %s\n", board, channel, strerror(errno)); ast_free(tmp); return NULL; } - + snprintf(tmp->dev, sizeof(tmp->dev), "vpb/%d-%d", board, channel); tmp->mode = mode; @@ -1524,7 +1524,7 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t ast_copy_string(tmp->context, context, sizeof(tmp->context)); tmp->callerid_type = 0; - if (callerid) { + if (callerid) { if (strcasecmp(callerid, "on") == 0) { tmp->callerid_type = 1; ast_copy_string(tmp->callerid, "unknown", sizeof(tmp->callerid)); @@ -1561,7 +1561,7 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t } else { tmp->txgain = txgain; } - + ast_log(LOG_NOTICE, "VPB setting Tx Hw gain to [%f]\n", tmp->txgain); vpb_play_set_hw_gain(tmp->handle, tmp->txgain); } @@ -1607,7 +1607,7 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t /* set default read state */ tmp->read_state = 0; - + tmp->golock = 0; tmp->busy_timer_id = vpb_timer_get_unique_timer_id(); @@ -1618,10 +1618,10 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t tmp->ring_timer_id = vpb_timer_get_unique_timer_id(); vpb_timer_open(&tmp->ring_timer, tmp->handle, tmp->ring_timer_id, timer_period_ring); - + tmp->dtmfidd_timer_id = vpb_timer_get_unique_timer_id(); vpb_timer_open(&tmp->dtmfidd_timer, tmp->handle, tmp->dtmfidd_timer_id, dtmf_idd); - + if (mode == MODE_FXO){ if (use_ast_dtmfdet) vpb_set_event_mask(tmp->handle, VPB_EVENTS_NODTMF); @@ -1689,8 +1689,8 @@ static int vpb_indicate(struct ast_channel *ast, int condition, const void *data if (ast_channel_state(ast) == AST_STATE_UP) { playtone(p->handle, &Busytone); p->state = VPB_STATE_PLAYBUSY; - vpb_timer_stop(p->busy_timer); - vpb_timer_start(p->busy_timer); + vpb_timer_stop(p->busy_timer); + vpb_timer_start(p->busy_timer); } break; case AST_CONTROL_RINGING: @@ -1702,7 +1702,7 @@ static int vpb_indicate(struct ast_channel *ast, int condition, const void *data vpb_timer_stop(p->ringback_timer); vpb_timer_start(p->ringback_timer); } - break; + break; case AST_CONTROL_ANSWER: case -1: /* -1 means stop playing? */ vpb_timer_stop(p->ringback_timer); @@ -1860,7 +1860,7 @@ static int vpb_call(struct ast_channel *ast, const char *dest, int timeout) call.answer_timeout); for (j = 0; !call.tone_map[j].terminate; j++) { ast_verb(2, "%s: Dial parms for %s tone %d->%d\n", p->dev, - ast_channel_name(ast), call.tone_map[j].tone_id, call.tone_map[j].call_id); + ast_channel_name(ast), call.tone_map[j].tone_id, call.tone_map[j].call_id); } ast_verb(4, "%s: Disabling Loop Drop detection\n", p->dev); @@ -1930,7 +1930,7 @@ static int vpb_hangup(struct ast_channel *ast) /* Stop record */ p->stopreads = 1; if (p->readthread) { - pthread_join(p->readthread, NULL); + pthread_join(p->readthread, NULL); ast_verb(4, "%s: stopped record thread \n", ast_channel_name(ast)); } @@ -1959,7 +1959,7 @@ static int vpb_hangup(struct ast_channel *ast) vpb_ring_station_async(p->handle, 0); if (p->state != VPB_STATE_ONHOOK) { /* This is causing a "dial end" "play tone" loop - playtone(p->handle, &Busytone); + playtone(p->handle, &Busytone); p->state = VPB_STATE_PLAYBUSY; ast_verb(5, "%s: Station offhook[%d], playing busy tone\n", ast->name,p->state); @@ -2064,8 +2064,8 @@ static int vpb_answer(struct ast_channel *ast) static struct ast_frame *vpb_read(struct ast_channel *ast) { - struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast); - static struct ast_frame f = { AST_FRAME_NULL }; + struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast); + static struct ast_frame f = { AST_FRAME_NULL }; f.src = "vpb"; ast_log(LOG_NOTICE, "%s: vpb_read: should never be called!\n", p->dev); @@ -2115,7 +2115,7 @@ static inline int astformatbits(struct ast_format *format) } } -int a_gain_vector(float g, short *v, int n) +int a_gain_vector(float g, short *v, int n) { int i; float tmp; @@ -2125,15 +2125,15 @@ int a_gain_vector(float g, short *v, int n) tmp = 32767.0; if (tmp < -32768.0) tmp = -32768.0; - v[i] = (short)tmp; - } + v[i] = (short)tmp; + } return i; } /* Writes a frame of voice data to a VPB channel */ static int vpb_write(struct ast_channel *ast, struct ast_frame *frame) { - struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast); + struct vpb_pvt *p = (struct vpb_pvt *)ast_channel_tech_pvt(ast); int res = 0; AudioCompress fmt = VPB_RAW; struct timeval play_buf_time_start; @@ -2164,20 +2164,20 @@ static int vpb_write(struct ast_channel *ast, struct ast_frame *frame) } tdiff = ast_tvdiff_ms(ast_tvnow(), p->lastplay); - ast_debug(1, "%s: vpb_write: time since last play(%d) \n", p->dev, tdiff); + ast_debug(1, "%s: vpb_write: time since last play(%d) \n", p->dev, tdiff); if (tdiff < (VPB_SAMPLES / 8 - 1)) { - ast_debug(1, "%s: vpb_write: Asked to play too often (%d) (%d)\n", p->dev, tdiff, frame->datalen); + ast_debug(1, "%s: vpb_write: Asked to play too often (%d) (%d)\n", p->dev, tdiff, frame->datalen); /* return 0; */ } p->lastplay = ast_tvnow(); /* - ast_debug(1, "%s: vpb_write: Checked frame format..\n", p->dev); + ast_debug(1, "%s: vpb_write: Checked frame format..\n", p->dev); */ ast_mutex_lock(&p->play_lock); /* - ast_debug(1, "%s: vpb_write: Got play lock..\n", p->dev); + ast_debug(1, "%s: vpb_write: Got play lock..\n", p->dev); */ /* Check if we have set up the play_buf */ @@ -2251,7 +2251,7 @@ static void *do_chanreads(void *pvt) ast_verb(3, "%s: chanreads: starting thread\n", p->dev); ast_mutex_lock(&p->record_lock); - p->stopreads = 0; + p->stopreads = 0; p->read_state = 1; while (!p->stopreads && p->owner) { @@ -2291,7 +2291,7 @@ static void *do_chanreads(void *pvt) } p->last_ignore_dtmf = ignore_dtmf; - /* Play DTMF digits here to avoid problem you get if playing a digit during + /* Play DTMF digits here to avoid problem you get if playing a digit during * a record operation */ ast_verb(6, "%s: chanreads: Checking dtmf's \n", p->dev); @@ -2311,7 +2311,7 @@ static void *do_chanreads(void *pvt) p->play_dtmf[0] = '\0'; ast_mutex_unlock(&p->play_dtmf_lock); vpb_sleep(700); /* Long enough to miss echo and DTMF event */ - if( !ignore_dtmf) + if( !ignore_dtmf) vpb_set_event_mask(p->handle, VPB_EVENTS_ALL); continue; } @@ -2423,13 +2423,13 @@ static void *do_chanreads(void *pvt) ast_mutex_unlock(&p->record_lock); ast_verb(2, "%s: Ending record mode (%d/%s)\n", - p->dev, p->stopreads, p->owner ? "yes" : "no"); + p->dev, p->stopreads, p->owner ? "yes" : "no"); return NULL; } static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state state, const char *context, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor) { - struct ast_channel *tmp; + struct ast_channel *tmp; char cid_num[256]; char cid_name[256]; @@ -2449,7 +2449,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st ast_channel_callgroup_set(tmp, me->callgroup); ast_channel_pickupgroup_set(tmp, me->pickupgroup); - + /* Linear is the preferred format. Although Voicetronix supports other formats * they are all converted to/from linear in the vpb code. Best for us to use * linear since we can then adjust volume in this modules. @@ -2465,7 +2465,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st ast_set_callerid(tmp, cid_num, cid_name, cid_num); } ast_channel_tech_pvt_set(tmp, me); - + ast_channel_context_set(tmp, context); if (!ast_strlen_zero(me->ext)) ast_channel_exten_set(tmp, me->ext); @@ -2484,7 +2484,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st me->readthread = 0; me->play_dtmf[0] = '\0'; me->faxhandled = 0; - + me->lastgrunt = ast_tvnow(); /* Assume at least one grunt tone seen now. */ me->lastplay = ast_tvnow(); /* Assume at least one grunt tone seen now. */ @@ -2503,7 +2503,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st return tmp; } -static struct ast_channel *vpb_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause) +static struct ast_channel *vpb_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause) { struct vpb_pvt *p; struct ast_channel *tmp = NULL; @@ -2612,7 +2612,7 @@ static int unload_module(void) /* Destroy all the interfaces and free their memory */ while (iflist) { - p = iflist; + p = iflist; ast_mutex_destroy(&p->lock); pthread_cancel(p->readthread); ast_mutex_destroy(&p->owner_lock); @@ -2654,8 +2654,8 @@ static int unload_module(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static enum ast_module_load_result load_module() @@ -2668,14 +2668,14 @@ static enum ast_module_load_result load_module() ast_group_t callgroup = 0; ast_group_t pickupgroup = 0; int mode = MODE_IMMEDIATE; - float txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; - float txswgain = 0, rxswgain = 0; + float txgain = DEFAULT_GAIN, rxgain = DEFAULT_GAIN; + float txswgain = 0, rxswgain = 0; int got_gain=0; int first_channel = 1; int echo_cancel = DEFAULT_ECHO_CANCEL; enum ast_module_load_result error = AST_MODULE_LOAD_SUCCESS; /* Error flag */ int bal1 = -1; /* Special value - means do not set */ - int bal2 = -1; + int bal2 = -1; int bal3 = -1; char * callerid = NULL; int num_cards = 0; @@ -2707,7 +2707,7 @@ static enum ast_module_load_result load_module() if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "Unable to load config %s\n", config); return AST_MODULE_LOAD_DECLINE; - } + } ast_mutex_lock(&iflock); v = ast_variable_browse(cfg, "general"); @@ -2743,7 +2743,7 @@ static enum ast_module_load_result load_module() } v = v->next; } - + v = ast_variable_browse(cfg, "interfaces"); while (v) { /* Create the interface list */ @@ -2864,7 +2864,7 @@ static enum ast_module_load_result load_module() if (error != AST_MODULE_LOAD_SUCCESS) unload_module(); - else + else restart_monitor(); /* And start the monitor for the first time */ return error; diff --git a/channels/console_board.c b/channels/console_board.c index e5ff1fcbda..6d24d16170 100644 --- a/channels/console_board.c +++ b/channels/console_board.c @@ -16,7 +16,7 @@ * $Revision$ */ -/* +/* * Message board implementation. * * A message board is a region of the SDL screen where @@ -28,7 +28,7 @@ * of fixed size (rows and cols). A portion of the buffer is * visible on the screen, and the visible window can be moved up and * down by dragging (not yet!) - * + * * TODO: font dynamic allocation * * The region where the text is displayed on the screen is defined @@ -135,7 +135,7 @@ struct board *board_setup(SDL_Surface *screen, SDL_Rect *dest, screen->format->Rmask, screen->format->Gmask, screen->format->Bmask, screen->format->Amask); - if (b->blank == NULL) { + if (b->blank == NULL) { ast_log(LOG_WARNING, "Unable to allocate board virtual screen: %s\n", SDL_GetError()); ast_free(b->text); diff --git a/channels/console_gui.c b/channels/console_gui.c index 916c408013..312da396b9 100644 --- a/channels/console_gui.c +++ b/channels/console_gui.c @@ -6,7 +6,7 @@ /* * GUI layout, structure and management - + For the GUI we use SDL to create a large surface (gui->screen) with 4 areas: remote video on the left, local video on the right, keypad with all controls and text windows in the center, and source device thumbnails on the top. @@ -148,7 +148,7 @@ struct gui_info { int outfd; /* fd for output */ SDL_Surface *keypad; /* the skin for the keypad */ SDL_Rect kp_rect; /* portion of the skin to display - default all */ - SDL_Surface *font; /* font to be used */ + SDL_Surface *font; /* font to be used */ SDL_Rect font_rects[96]; /* only printable chars */ /* each of the following board has two rectangles, @@ -189,10 +189,10 @@ static struct gui_info *cleanup_sdl(struct gui_info *gui, int device_num) if (gui == NULL) return NULL; - /* unload font file */ + /* unload font file */ if (gui->font) { SDL_FreeSurface(gui->font); - gui->font = NULL; + gui->font = NULL; } if (gui->outfd > -1) @@ -221,7 +221,7 @@ static struct gui_info *cleanup_sdl(struct gui_info *gui, int device_num) if (gui->thumb_bd_array[i].board) /* may be useless */ delete_board(gui->thumb_bd_array[i].board); } - + ast_free(gui); SDL_Quit(); return NULL; @@ -290,7 +290,7 @@ static void show_frame(struct video_desc *env, int out) return; p_in = NULL; b_out = &env->src_dpy[i]; - } + } bmp = gui->win[out].bmp; SDL_LockYUVOverlay(bmp); /* output picture info - this is sdl, YUV420P */ @@ -372,7 +372,7 @@ enum skin_area { /* accumulate digits, possibly call dial if in connected mode */ static void keypad_digit(struct video_desc *env, int digit) -{ +{ if (env->owner) { /* we have a call, send the digit */ struct ast_frame f = { AST_FRAME_DTMF, 0 }; @@ -457,7 +457,7 @@ static void keypad_pick_up(struct video_desc *env) * * To generate a font we can use the 'fly' command with the * following script (3 lines with 32 chars each) - + size 320,64 name font.png transparent 0,0,0 @@ -473,7 +473,7 @@ static int gui_output(struct video_desc *env, const char *text) { return 1; /* error, not supported */ } -#endif +#endif static int video_geom(struct fbuf_t *b, const char *s); static void sdl_setup(struct video_desc *env); @@ -495,23 +495,23 @@ static int update_device_info(struct video_desc *env, int i) } /*! \brief Changes the video output (local video) source, controlling if - * it is already using that video device, + * it is already using that video device, * and switching the correct fields of env->out. * grabbers are always open and saved in the device table. * The secondary or the primary device can be changed, * according to the "button" parameter: * the primary device is changed if button = SDL_BUTTON_LEFT; * the secondary device is changed if button = not SDL_BUTTON_LEFT; - * + * * the correct message boards of the sources are also updated * with the new status - * + * * \param env = pointer to the video environment descriptor * \param index = index of the device the caller wants to use are primary or secondary device * \param button = button clicked on the mouse * * returns 0 on success, - * returns 1 on error + * returns 1 on error */ static int switch_video_out(struct video_desc *env, int index, Uint8 button) { @@ -532,7 +532,7 @@ static int switch_video_out(struct video_desc *env, int index, Uint8 button) ast_log(LOG_WARNING, "switching to %s...\n", env->out.devices[index].name); /* already open */ if (env->out.devices[index].grabber) { - /* we also have to update the messages in the source + /* we also have to update the messages in the source message boards below the source windows */ /* first we update the board of the previous source */ if (p == &env->out.device_primary) @@ -607,7 +607,7 @@ static int turn_on_off(int index, struct video_desc *env) /* print the new message in the message board */ update_device_info(env, index); return 2; /* closed */ - } + } } /* @@ -620,24 +620,24 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button { uint8_t index = KEY_OUT_OF_KEYPAD; /* the key or region of the display we clicked on */ struct gui_info *gui = env->gui; - + int i; /* integer variable used as iterator */ int x; /* integer variable usable as a container */ - + /* total width of source device thumbnails */ int src_wins_tot_w = env->out.device_num*(SRC_WIN_W+BORDER)+BORDER; /* x coordinate of the center of the keypad */ int x0 = MAX(env->rem_dpy.w+gui->keypad->w/2+2*BORDER, src_wins_tot_w/2); - + #if 0 ast_log(LOG_WARNING, "event %d %d have %d/%d regions at %p\n", button.x, button.y, gui->kp_used, gui->kp_size, gui->kp); #endif /* for each mousedown we end previous drag */ gui->drag.drag_window = DRAG_NONE; - + /* define keypad boundary */ /* XXX this should be extended for clicks on different audio device markers */ if (button.y >= (env->out.device_num ? SRC_WIN_H+2*BORDER+SRC_MSG_BD_H : 0)) { @@ -662,7 +662,7 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button else if (button.x >= x0 + gui->keypad->w/2) index = KEY_OUT_OF_KEYPAD; else if (gui->kp) { - /* we have to calculate the first coordinate + /* we have to calculate the first coordinate inside the keypad before calling the kp_match_area*/ int x_keypad = button.x - (x0 - gui->keypad->w/2); /* find the key clicked (if one was clicked) */ @@ -682,7 +682,7 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button else if (button.x < x) index = KEY_OUT_OF_KEYPAD; else if (button.x < x + src_wins_tot_w - BORDER) { - /* note that the additional device windows + /* note that the additional device windows are numbered from left to right starting from 0, with a maximum of 8, the index associated on a click is: KEY_SRCS_WIN + number_of_the_window */ @@ -779,7 +779,7 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button if (index == KEY_LOC_DPY && env->out.picture_in_picture && button.x >= x0+gui->keypad->w/2+BORDER+pip_loc_x && button.x < x0+gui->keypad->w/2+BORDER+pip_loc_x+env->loc_dpy.w/3 && - button.y >= BORDER+pip_loc_y && + button.y >= BORDER+pip_loc_y && button.y < BORDER+pip_loc_y+env->loc_dpy.h/3) { /* set the y cordinate to his previous value */ button.y += (env->out.device_num ? SRC_WIN_H+2*BORDER+SRC_MSG_BD_H : 0); @@ -800,14 +800,14 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button fb->w, fb->h); video_geom(fb, buf); sdl_setup(env); - /* writes messages in the source boards, those can be - modified during the execution, because of the events + /* writes messages in the source boards, those can be + modified during the execution, because of the events this must be done here, otherwise the status of sources will not be shown after sdl_setup */ for (i = 0; i < env->out.device_num; i++) { update_device_info(env, i); } - /* we also have to refresh other boards, + /* we also have to refresh other boards, to avoid messages to disappear after video resize */ print_message(gui->bd_msg, " \b"); print_message(gui->bd_dialed, " \b"); @@ -1043,7 +1043,7 @@ static void eventhandler(struct video_desc *env, const char *caption) static SDL_Surface *load_image(const char *file) { SDL_Surface *temp; - + #ifdef HAVE_SDL_IMAGE temp = IMG_Load(file); #else @@ -1223,7 +1223,7 @@ static void sdl_setup(struct video_desc *env) const SDL_VideoInfo *info; int kp_w = 0, kp_h = 0; /* keypad width and height */ struct gui_info *gui = env->gui; - + /* Some helper variables used for filling the SDL window */ int x0; /* the x coordinate of the center of the keypad */ int x1; /* userful for calculating of the size of the parent window */ @@ -1231,7 +1231,7 @@ static void sdl_setup(struct video_desc *env) int src_wins_tot_w; /* total width of the source windows */ int i; int x; /* useful for the creation of the source windows; */ - + #ifdef HAVE_X11 const char *e = getenv("SDL_WINDOWID"); @@ -1247,7 +1247,7 @@ static void sdl_setup(struct video_desc *env) ast_log(LOG_WARNING, "%s error in window\n", __FUNCTION__); return; } - } + } #endif /* * initialize the SDL environment. We have one large window @@ -1294,23 +1294,23 @@ static void sdl_setup(struct video_desc *env) kp_h = gui->keypad->h; } } - + /* total width of the thumbnails */ src_wins_tot_w = env->out.device_num*(SRC_WIN_W+BORDER)+BORDER; - + /* x coordinate of the center of the keypad */ x0 = MAX(env->rem_dpy.w+kp_w/2+2*BORDER, src_wins_tot_w/2); - + /* from center of the keypad to right border */ x1 = MAX(env->loc_dpy.w+kp_w/2+2*BORDER, src_wins_tot_w/2); - + /* total width of the SDL window to create */ maxw = x0+x1; - + /* total height of the mother window to create */ maxh = MAX( MAX(env->rem_dpy.h, env->loc_dpy.h), kp_h)+2*BORDER; maxh += env->out.device_num ? (2*BORDER+SRC_WIN_H+SRC_MSG_BD_H) : 0; - + gui->screen = SDL_SetVideoMode(maxw, maxh, depth, 0); if (!gui->screen) { ast_log(LOG_ERROR, "SDL: could not set video mode - exiting\n"); @@ -1411,9 +1411,9 @@ static void sdl_setup(struct video_desc *env) #endif /* HAVE_X11 */ y0 = env->out.device_num ? (3*BORDER+SRC_WIN_H+SRC_MSG_BD_H) : BORDER; - + SDL_WM_SetCaption("Asterisk console Video Output", NULL); - + /* intialize the windows for local and remote video */ if (set_win(gui->screen, &gui->win[WIN_REMOTE], dpy_fmt, env->rem_dpy.w, env->rem_dpy.h, x0-kp_w/2-BORDER-env->rem_dpy.w, y0)) @@ -1425,7 +1425,7 @@ static void sdl_setup(struct video_desc *env) env->loc_dpy.w, env->loc_dpy.h, x0+kp_w/2+BORDER, y0)) goto no_sdl; - + /* initialize device_num source windows (thumbnails) and boards (for a maximum of 9 additional windows and boards) */ x = x0 - src_wins_tot_w/2 + BORDER; diff --git a/channels/console_video.c b/channels/console_video.c index de81a8a904..4bf29189a3 100644 --- a/channels/console_video.c +++ b/channels/console_video.c @@ -150,7 +150,7 @@ int console_video_formats = 0; #else /* defined(HAVE_FFMPEG) && defined(HAVE_SDL) */ /*! The list of video formats we support. */ -int console_video_formats = +int console_video_formats = AST_FORMAT_H263_PLUS | AST_FORMAT_H263 | AST_FORMAT_MP4_VIDEO | AST_FORMAT_H264 | AST_FORMAT_H261 ; @@ -186,7 +186,7 @@ struct video_codec_desc; /* forward declaration */ * + the encoding and RTP info, including timestamps to generate * frames at the correct rate; * + source-specific info, i.e. fd for /dev/video, dpy-image for x11, etc, - * filled in by grabber_open, part of source_specific information are in + * filled in by grabber_open, part of source_specific information are in * the device table (devices member), others are shared; * NOTE: loc_src.data == NULL means the rest of the struct is invalid, and * the video source is not available. @@ -213,18 +213,18 @@ struct video_out_desc { AVFrame *enc_in_frame; /* enc_in mapped into avcodec format. */ /* The initial part of AVFrame is an AVPicture */ int mtu; - + /* Table of devices specified with "videodevice=" in oss.conf. * Static size as we have a limited number of entries. */ - struct video_device devices[MAX_VIDEO_SOURCES]; + struct video_device devices[MAX_VIDEO_SOURCES]; int device_num; /*number of devices in table*/ int device_primary; /*index of the actual primary device in the table*/ int device_secondary; /*index of the actual secondary device in the table*/ int picture_in_picture; /*Is the PiP mode activated? 0 = NO | 1 = YES*/ - /* these are the coordinates of the picture inside the picture (visible if PiP mode is active) + /* these are the coordinates of the picture inside the picture (visible if PiP mode is active) these coordinates are valid considering the containing buffer with cif geometry*/ int pip_x; int pip_y; @@ -307,7 +307,7 @@ used_mem(const char *msg) return 0; } #endif - + #include "vcodecs.c" #include "console_gui.c" @@ -321,7 +321,7 @@ used_mem(const char *msg) * * \param v = video out environment descriptor * - * returns 0 on success, 1 on error + * returns 0 on success, 1 on error */ static int grabber_open(struct video_out_desc *v) { @@ -347,7 +347,7 @@ static int grabber_open(struct video_out_desc *v) } /* the first working device is selected as the primary one and the secondary one */ for (i = 0; i < v->device_num; i++) { - if (!v->devices[i].grabber) + if (!v->devices[i].grabber) continue; v->device_primary = i; v->device_secondary = i; @@ -373,7 +373,7 @@ static struct fbuf_t *grabber_read(struct video_device *dev, int fps) if (dev->grabber == NULL) /* not initialized */ return NULL; - + /* the last_frame field in this row of the device table (dev) is always initialized, it is set during the parsing of the config file, and never unset, function fill_device_table(). */ @@ -421,7 +421,7 @@ static int video_out_uninit(struct video_desc *env) { struct video_out_desc *v = &env->out; int i; /* integer variable used as iterator */ - + /* XXX this should be a codec callback */ if (v->enc_ctx) { AVCodecContext *enc_ctx = (AVCodecContext *)v->enc_ctx; @@ -589,7 +589,7 @@ static AVPicture *fill_pict(struct fbuf_t *b, AVPicture *p) int len = b->w; /* Y linesize, bytes */ int luv = b->w/2; /* U/V linesize, bytes */ int sample_size = 1; - + memset(p, '\0', sizeof(*p)); switch (b->pix_fmt) { case PIX_FMT_RGB555: @@ -607,7 +607,7 @@ static AVPicture *fill_pict(struct fbuf_t *b, AVPicture *p) break; } len *= sample_size; - + p->data[0] = b->data; p->linesize[0] = len; /* these are only valid for component images */ @@ -615,11 +615,11 @@ static AVPicture *fill_pict(struct fbuf_t *b, AVPicture *p) p->data[2] = luv ? b->data + 5*l4 : b->data+len; p->linesize[1] = luv; p->linesize[2] = luv; - - /* add the offsets to the pointers previously calculated, + + /* add the offsets to the pointers previously calculated, it is necessary for the picture in picture mode */ p->data[0] += len*b->win_y + b->win_x*sample_size; - if (luv) { + if (luv) { p->data[1] += luv*(b->win_y/2) + (b->win_x/2) * sample_size; p->data[2] += luv*(b->win_y/2) + (b->win_x/2) * sample_size; } @@ -832,7 +832,7 @@ static struct ast_frame *get_video_frames(struct video_desc *env, struct ast_fra } } show_frame(env, WIN_LOCAL); /* local rendering */ - for (i = 0; i < env->out.device_num; i++) + for (i = 0; i < env->out.device_num; i++) show_frame(env, i+WIN_SRC1); /* rendering of every source device in thumbnails */ if (tail == NULL) tail = &dummy; @@ -926,7 +926,7 @@ static void *video_thread(void *arg) /* manage keypad events */ /* XXX here we should always check for events, - * otherwise the drag will not work */ + * otherwise the drag will not work */ if (env->gui) eventhandler(env, caption); @@ -1254,7 +1254,7 @@ int console_video_config(struct video_desc **penv, if (env == NULL) { ast_log(LOG_WARNING, "fail to allocate video_desc\n"); return 1; /* error */ - + } /* set default values - 0's are already there */ env->out.device_primary = 0; diff --git a/channels/console_video.h b/channels/console_video.h index f88e5fa1d8..1c945e48e8 100644 --- a/channels/console_video.h +++ b/channels/console_video.h @@ -64,7 +64,7 @@ struct fbuf_t { /* frame buffers, dynamically allocated */ int ebit; /* bits to ignore at the end */ int x; /* origin, if necessary */ int y; - int w; /* size */ + int w; /* size */ int h; int pix_fmt; /* offsets and size of the copy in Picture-in-Picture mode */ diff --git a/channels/iax2/include/iax2.h b/channels/iax2/include/iax2.h index ca9ab74ddf..3deb5dbcd8 100644 --- a/channels/iax2/include/iax2.h +++ b/channels/iax2/include/iax2.h @@ -2,7 +2,7 @@ * Asterisk -- An open source telephony toolkit. * * Implementation of Inter-Asterisk eXchange - * + * * Copyright (C) 2003, Digium * * Mark Spencer @@ -19,7 +19,7 @@ * \ref iax2-parser.h * \ref chan_iax2.c */ - + #ifndef _IAX2_H #define _IAX2_H diff --git a/channels/iax2/include/parser.h b/channels/iax2/include/parser.h index 7c9ba2ab52..d8edc4b2aa 100644 --- a/channels/iax2/include/parser.h +++ b/channels/iax2/include/parser.h @@ -2,7 +2,7 @@ * Asterisk -- An open source telephony toolkit. * * Implementation of Inter-Asterisk eXchange - * + * * Copyright (C) 2003, Digium * * Mark Spencer @@ -14,7 +14,7 @@ /*!\file * \brief Implementation of the IAX2 protocol */ - + #ifndef _IAX2_PARSER_H #define _IAX2_PARSER_H diff --git a/channels/iax2/parser.c b/channels/iax2/parser.c index 6eda982607..8880b9280e 100644 --- a/channels/iax2/parser.c +++ b/channels/iax2/parser.c @@ -20,7 +20,7 @@ * * \brief Implementation of Inter-Asterisk eXchange Protocol, v 2 * - * \author Mark Spencer + * \author Mark Spencer */ /*** MODULEINFO @@ -136,7 +136,7 @@ static void dump_prefs(char *output, int maxlen, void *value, int len) strncpy(output, value, maxlen); output[maxlen] = '\0'; - + iax2_codec_pref_convert(&pref, output, total_len, 0); memset(output,0,total_len); iax2_codec_pref_string(&pref, output, total_len); @@ -147,7 +147,7 @@ static void dump_int(char *output, int maxlen, void *value, int len) if (len == (int)sizeof(unsigned int)) snprintf(output, maxlen, "%lu", (unsigned long)ntohl(get_unaligned_uint32(value))); else - ast_copy_string(output, "Invalid INT", maxlen); + ast_copy_string(output, "Invalid INT", maxlen); } static void dump_short(char *output, int maxlen, void *value, int len) @@ -177,7 +177,7 @@ static void dump_datetime(char *output, int maxlen, void *value, int len) tm.tm_mday = (val >> 16) & 0x1f; tm.tm_mon = ((val >> 21) & 0x0f) - 1; tm.tm_year = ((val >> 25) & 0x7f) + 100; - ast_strftime(output, maxlen, "%Y-%m-%d %T", &tm); + ast_strftime(output, maxlen, "%Y-%m-%d %T", &tm); } else ast_copy_string(output, "Invalid DATETIME format!", maxlen); } @@ -366,7 +366,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l char tmp[256]; if (len < 2) return; - strcpy(output, "\n"); + strcpy(output, "\n"); maxlen -= strlen(output); output += strlen(output); while(len > 2) { ie = iedata[0]; @@ -748,14 +748,14 @@ int iax_ie_append_versioned_uint64(struct iax_ie_data *ied, unsigned char ie, un return iax_ie_append_raw(ied, ie, &newval, (int) sizeof(newval)); } -int iax_ie_append_int(struct iax_ie_data *ied, unsigned char ie, unsigned int value) +int iax_ie_append_int(struct iax_ie_data *ied, unsigned char ie, unsigned int value) { unsigned int newval; newval = htonl(value); return iax_ie_append_raw(ied, ie, &newval, (int)sizeof(newval)); } -int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned short value) +int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned short value) { unsigned short newval; newval = htons(value); @@ -772,7 +772,7 @@ int iax_ie_append_byte(struct iax_ie_data *ied, unsigned char ie, unsigned char return iax_ie_append_raw(ied, ie, &dat, 1); } -int iax_ie_append(struct iax_ie_data *ied, unsigned char ie) +int iax_ie_append(struct iax_ie_data *ied, unsigned char ie) { return iax_ie_append_raw(ied, ie, NULL, 0); } @@ -978,7 +978,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expecting msgcount to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->msgcount = ntohs(get_unaligned_uint16(data + 2)); + ies->msgcount = ntohs(get_unaligned_uint16(data + 2)); break; case IAX_IE_AUTOANSWER: ies->autoanswer = 1; @@ -1005,7 +1005,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expecting firmwarever to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->firmwarever = ntohs(get_unaligned_uint16(data + 2)); + ies->firmwarever = ntohs(get_unaligned_uint16(data + 2)); break; case IAX_IE_DEVICETYPE: ies->devicetype = (char *)data + 2; @@ -1058,7 +1058,7 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen) snprintf(tmp, (int)sizeof(tmp), "Expecting callingtns to be %d bytes long but was %d\n", (int)sizeof(unsigned short), len); errorf(tmp); } else - ies->calling_tns = ntohs(get_unaligned_uint16(data + 2)); + ies->calling_tns = ntohs(get_unaligned_uint16(data + 2)); break; case IAX_IE_RR_JITTER: if (len != (int)sizeof(unsigned int)) { @@ -1267,12 +1267,12 @@ struct iax_frame *iax_frame_new(int direction, int datalen, unsigned int cacheab fr->direction = direction; fr->retrans = -1; - + if (fr->direction == DIRECTION_INGRESS) ast_atomic_fetchadd_int(&iframes, 1); else ast_atomic_fetchadd_int(&oframes, 1); - + ast_atomic_fetchadd_int(&frames, 1); return fr; diff --git a/channels/iax2/provision.c b/channels/iax2/provision.c index 6bd06faf93..f21c4e6e7d 100644 --- a/channels/iax2/provision.c +++ b/channels/iax2/provision.c @@ -17,8 +17,8 @@ */ /*! \file - * - * \brief IAX Provisioning Protocol + * + * \brief IAX Provisioning Protocol * * \author Mark Spencer */ @@ -93,7 +93,7 @@ char *iax_provflags2str(char *buf, int buflen, unsigned int flags) if (!buf || buflen < 1) return NULL; - + buf[0] = '\0'; for (x = 0; x < ARRAY_LEN(iax_flags); x++) { @@ -103,7 +103,7 @@ char *iax_provflags2str(char *buf, int buflen, unsigned int flags) } } - if (!ast_strlen_zero(buf)) + if (!ast_strlen_zero(buf)) buf[strlen(buf) - 1] = '\0'; else strncpy(buf, "none", buflen - 1); @@ -239,7 +239,7 @@ int iax_provision_build(struct iax_ie_data *provdata, unsigned int *signature, c iax_ie_append_int(provdata, PROV_IE_FORMAT, cur->format); if (force || cur->tos) iax_ie_append_byte(provdata, PROV_IE_TOS, cur->tos); - + /* Calculate checksum of message so far */ sig = prov_ver_calc(provdata); if (signature) @@ -299,7 +299,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, ast_log(LOG_WARNING, "Unable to find base template '%s' for creating '%s'. Trying '%s'\n", t, s, def); else def = t; - } + } if (!src) { src = iax_template_find(def, 0); if (!src) @@ -342,7 +342,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, cur->server = ntohl(ia.s_addr); else cur->altserver = ntohl(ia.s_addr); - } else + } else ast_log(LOG_WARNING, "Ignoring invalid %s '%s' for '%s' at line %d\n", v->name, v->value, s, v->lineno); } else if (!strcasecmp(v->name, "codec")) { struct ast_format *tmpfmt; @@ -425,10 +425,10 @@ static const char *ifthere(const char *s) static const char *iax_server(unsigned int addr) { struct in_addr ia; - + if (!addr) return ""; - + ia.s_addr = htonl(addr); return ast_inet_ntoa(ia); @@ -461,7 +461,7 @@ static char *iax_show_provisioning(struct ast_cli_entry *e, int cmd, struct ast_ ast_mutex_lock(&provlock); AST_LIST_TRAVERSE(&templates, cur, list) { if ((a->argc == 3) || (!strcasecmp(a->argv[3], cur->name))) { - if (found) + if (found) ast_cli(a->fd, "\n"); ast_copy_string(server, iax_server(cur->server), sizeof(server)); ast_copy_string(alternate, iax_server(cur->altserver), sizeof(alternate)); @@ -535,7 +535,7 @@ int iax_provision_reload(int reload) struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; if (!provinit) iax_provision_init(); - + cfg = ast_config_load2("iaxprov.conf", "chan_iax2", config_flags); if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID) { /* Mark all as dead. No need for locking */ diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c index df5df9afed..67fc9585e8 100644 --- a/channels/misdn/ie.c +++ b/channels/misdn/ie.c @@ -1412,4 +1412,3 @@ static void enc_ie_restart_ind(unsigned char **ntmode, msg_t *msg, unsigned char p[2] = rind; } - diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 8dcf41faab..cb64106b9f 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -4817,5 +4817,3 @@ void misdn_lib_reinit_nt_stack(int port) misdn_lib_get_l1_up(stack); } } - - diff --git a/channels/sig_analog.h b/channels/sig_analog.h index 6415b6eb8c..42e00c029a 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -93,7 +93,7 @@ enum analog_event { ANALOG_EVENT_EC_NLP_ENABLED, ANALOG_EVENT_ERROR, /* not a DAHDI event */ ANALOG_EVENT_DTMFCID, /* not a DAHDI event */ - ANALOG_EVENT_PULSEDIGIT = (1 << 16), + ANALOG_EVENT_PULSEDIGIT = (1 << 16), ANALOG_EVENT_DTMFDOWN = (1 << 17), ANALOG_EVENT_DTMFUP = (1 << 18), }; @@ -231,7 +231,7 @@ struct analog_callback { int (* const check_confirmanswer)(void *pvt); void (* const set_callwaiting)(void *pvt, int callwaiting_enable); void (* const cancel_cidspill)(void *pvt); - int (* const confmute)(void *pvt, int mute); + int (* const confmute)(void *pvt, int mute); void (* const set_pulsedial)(void *pvt, int flag); void (* const set_new_owner)(void *pvt, struct ast_channel *new_owner); diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c index 4674901bee..211f600167 100644 --- a/channels/sip/config_parser.c +++ b/channels/sip/config_parser.c @@ -924,4 +924,3 @@ void sip_config_parser_unregister_tests(void) AST_TEST_UNREGISTER(sip_parse_host_line_test); AST_TEST_UNREGISTER(sip_parse_nat_test); } - diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c index 36d4ea9e40..09804ce8a2 100644 --- a/channels/sip/dialplan_functions.c +++ b/channels/sip/dialplan_functions.c @@ -134,7 +134,7 @@ int sip_acf_channel_read(struct ast_channel *chan, const char *funcname, char *p AST_APP_ARG(type); AST_APP_ARG(field); ); - + /* Check for zero arguments */ if (ast_strlen_zero(parse)) { ast_log(LOG_ERROR, "Cannot call %s without arguments\n", funcname); @@ -509,4 +509,3 @@ void sip_dialplan_function_unregister_tests(void) { AST_TEST_UNREGISTER(test_sip_rtpqos_1); } - diff --git a/channels/sip/include/config_parser.h b/channels/sip/include/config_parser.h index fd055b145b..811f8951c1 100644 --- a/channels/sip/include/config_parser.h +++ b/channels/sip/include/config_parser.h @@ -35,7 +35,7 @@ int sip_parse_register_line(struct sip_registry *reg, int default_expiry, const /*! * \brief parses a config line for a host with a transport * - * An example input would be: + * An example input would be: * tls://www.google.com:8056 * * \retval 0 on success diff --git a/channels/sip/include/globals.h b/channels/sip/include/globals.h index d7c9f13d08..3c3ba47bd3 100644 --- a/channels/sip/include/globals.h +++ b/channels/sip/include/globals.h @@ -39,4 +39,3 @@ extern struct ast_channel_tech sip_tech; extern struct ast_channel_tech sip_tech_info; #endif /* !defined(SIP_GLOBALS_H) */ - diff --git a/channels/sip/include/reqresp_parser.h b/channels/sip/include/reqresp_parser.h index eb2eb1eb7b..338824a53a 100644 --- a/channels/sip/include/reqresp_parser.h +++ b/channels/sip/include/reqresp_parser.h @@ -60,7 +60,7 @@ AST_LIST_HEAD_NOLOCK(contactliststruct, contact); * - If the URI contains a port number, hostport will return with both * parts, host:port. * - This function overwrites the URI string. - * + * * \retval 0 on success * \retval -1 on error. * diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c index 86ab6c2f51..86ba413d3c 100644 --- a/channels/sip/security_events.c +++ b/channels/sip/security_events.c @@ -356,4 +356,3 @@ int sip_report_security_event(const char *peer, struct ast_sockaddr *addr, const return result; } - diff --git a/channels/vcodecs.c b/channels/vcodecs.c index 76aeb671f8..e55c5fef97 100644 --- a/channels/vcodecs.c +++ b/channels/vcodecs.c @@ -154,7 +154,7 @@ static void check_h261(struct fbuf_t *b) { struct bitbuf a = bitbuf_init(b->data, b->used * 8, 0); uint32_t x, y; - + x = getbits(&a, 20); /* PSC, 0000 0000 0000 0001 0000 */ if (x != 0x10) { ast_log(LOG_WARNING, "bad PSC 0x%x\n", x); @@ -386,7 +386,7 @@ static struct ast_frame *h263p_encap(struct fbuf_t *b, int mtu, ast_log(LOG_WARNING, "--- frame error l %d\n", l); break; } - + if (d[0] == 0 && d[1] == 0) { /* we start with a psc */ h = 0; } else { /* no psc, create a header */ @@ -568,8 +568,8 @@ static int h263_enc_init(AVCodecContext *enc_ctx) * TR:8 .... .... temporal reference * PTYPE:13 or more ptype... * If we don't fragment a GOB SBIT and EBIT = 0. - * reference, 8 bit) - * + * reference, 8 bit) + * * The assumption below is that we start with a PSC. */ static struct ast_frame *h263_encap(struct fbuf_t *b, int mtu, @@ -695,7 +695,7 @@ static struct video_codec_desc h263_codec = { .dec_init = NULL, .dec_decap = h263_decap, .dec_run = ffmpeg_decode - + }; /*---- h261 support -----*/ @@ -947,7 +947,7 @@ static int h264_dec_init(AVCodecContext *dec_ctx) * - 0..n 0-byte(s), unused, optional. one zero-byte is always present * in the first NAL before the start code prefix. * - start code prefix (3 bytes): 0x000001 - * (the first bytestream has a + * (the first bytestream has a * like these 0x00000001!) * - NAL header byte ( F[1] | NRI[2] | Type[5] ) where type != 0 * - byte-stream @@ -1127,7 +1127,7 @@ static const struct _cm video_formats[] = { { AST_FORMAT_MP4_VIDEO, CODEC_ID_MPEG4, CM_RDWR }, { 0, 0, 0 }, }; - + /*! \brief map an asterisk format into an ffmpeg one */ static enum CodecID map_video_format(uint32_t ast_format, int rw) diff --git a/channels/vgrabbers.c b/channels/vgrabbers.c index 169e59c5db..bcccece4dc 100644 --- a/channels/vgrabbers.c +++ b/channels/vgrabbers.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright 2007, Luigi Rizzo + * Copyright 2007, Luigi Rizzo * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact @@ -208,7 +208,7 @@ static void *grab_v4l1_open(const char *dev, struct fbuf_t *geom, int fps) struct fbuf_t *b; /* name should be something under /dev/ */ - if (strncmp(dev, "/dev/", 5)) + if (strncmp(dev, "/dev/", 5)) return NULL; fd = open(dev, O_RDONLY | O_NONBLOCK); if (fd < 0) { diff --git a/codecs/Makefile b/codecs/Makefile index 64f77ebaa2..86a7dec303 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- An open source telephony toolkit. -# +# # Makefile for codec modules # # Copyright (C) 1999-2006, Digium, Inc. diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index 0b2f90f398..9c202a5e84 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -23,7 +23,7 @@ /*! \file * * \brief codec_adpcm.c - translate between signed linear and Dialogic ADPCM - * + * * \ingroup codecs */ @@ -50,7 +50,7 @@ #include "ex_adpcm.h" /* - * Step size index shift table + * Step size index shift table */ static int indsft[8] = { -1, -1, -1, -1, 2, 4, 6, 8 }; @@ -167,7 +167,7 @@ static inline int adpcm(short csig, struct adpcm_state *state) int step; int encoded; - /* + /* * Clip csig if too large or too small */ csig >>= 4; @@ -208,7 +208,7 @@ static inline int adpcm(short csig, struct adpcm_state *state) /* feedback to state */ decode(encoded, state); - + return encoded; } @@ -259,7 +259,7 @@ static struct ast_frame *lintoadpcm_frameout(struct ast_trans_pvt *pvt) struct ast_frame *f; int i; int samples = pvt->samples; /* save original number */ - + if (samples < 2) return NULL; diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index ebaca74c55..873a59e3ee 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -19,7 +19,7 @@ /*! \file * * \brief codec_alaw.c - translate between signed linear and alaw - * + * * \ingroup codecs */ @@ -50,7 +50,7 @@ static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) pvt->samples += i; pvt->datalen += i * 2; /* 2 bytes/sample */ - + while (i--) *dst++ = AST_ALAW(*src++); @@ -67,7 +67,7 @@ static int lintoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) pvt->samples += i; pvt->datalen += i; /* 1 byte/sample */ - while (i--) + while (i--) *dst++ = AST_LIN2A(*src++); return 0; diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index 48b5e4a27a..6046dd382f 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -109,7 +109,7 @@ static int g722tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) /* g722_decode expects the samples to be in the invalid samples / 2 format */ in_samples = f->samples / 2; - out_samples = g722_decode(&tmp->g722, &pvt->outbuf.i16[pvt->samples * sizeof(int16_t)], + out_samples = g722_decode(&tmp->g722, &pvt->outbuf.i16[pvt->samples * sizeof(int16_t)], (uint8_t *) f->data.ptr, in_samples); pvt->samples += out_samples; @@ -124,7 +124,7 @@ static int lintog722_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) struct g722_encoder_pvt *tmp = pvt->pvt; int outlen; - outlen = g722_encode(&tmp->g722, (&pvt->outbuf.ui8[pvt->datalen]), + outlen = g722_encode(&tmp->g722, (&pvt->outbuf.ui8[pvt->datalen]), (int16_t *) f->data.ptr, f->samples); pvt->samples += outlen * 2; @@ -242,7 +242,7 @@ static int load_module(void) if (res) { unload_module(); return AST_MODULE_LOAD_DECLINE; - } + } return AST_MODULE_LOAD_SUCCESS; } diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index 3b76628d52..249e4f448c 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -891,7 +891,7 @@ static int load_module(void) if (res) { unload_module(); return AST_MODULE_LOAD_DECLINE; - } + } return AST_MODULE_LOAD_SUCCESS; } diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index 296747ee3c..e5367a558f 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -64,7 +64,7 @@ struct gsm_translator_pvt { /* both gsm2lin and lin2gsm */ static int gsm_new(struct ast_trans_pvt *pvt) { struct gsm_translator_pvt *tmp = pvt->pvt; - + return (tmp->gsm = gsm_create()) ? 0 : -1; } @@ -95,7 +95,7 @@ static int gsmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) src = f->data.ptr + x; } /* XXX maybe we don't need to check */ - if (pvt->samples + len > BUFFER_SAMPLES) { + if (pvt->samples + len > BUFFER_SAMPLES) { ast_log(LOG_WARNING, "Out of buffer space\n"); return -1; } diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index 00e3022674..dd9d649a50 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -7,7 +7,7 @@ * * The lpc10 code is from a library used by nautilus, modified to be a bit * nicer to the compiler. - * See http://www.arl.wustl.edu/~jaf/ + * See http://www.arl.wustl.edu/~jaf/ * * See http://www.asterisk.org for more information about * the Asterisk project. Please do not directly contact @@ -137,7 +137,7 @@ static int lpc10tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) pvt->datalen += 2*LPC10_SAMPLES_PER_FRAME; len += LPC10_BYTES_IN_COMPRESSED_FRAME; } - if (len != f->datalen) + if (len != f->datalen) printf("Decoded %d, expected %d\n", len, f->datalen); return 0; } diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c index e0d530d857..7cb4391b37 100644 --- a/codecs/codec_resample.c +++ b/codecs/codec_resample.c @@ -17,11 +17,11 @@ * at the top of the source tree. */ -/*! +/*! * \file * * \brief Resample slinear audio - * + * * \ingroup codecs */ diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 72ac220232..0a93596206 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -21,7 +21,7 @@ * * \brief Translate between signed linear and Speex (Open Codec) * - * \note This work was motivated by Jeremy McNamara + * \note This work was motivated by Jeremy McNamara * hacked to be configurable by anthm and bkw 9/28/2004 * * \ingroup codecs @@ -43,7 +43,7 @@ /* We require a post 1.1.8 version of Speex to enable preprocessing * and better type handling - */ + */ #ifdef _SPEEX_TYPES_H #include #endif @@ -143,7 +143,7 @@ static int speex_encoder_construct(struct ast_trans_pvt *pvt, const SpeexMode *p if (abr) speex_encoder_ctl(tmp->speex, SPEEX_SET_ABR, &abr); if (dtx) - speex_encoder_ctl(tmp->speex, SPEEX_SET_DTX, &dtx); + speex_encoder_ctl(tmp->speex, SPEEX_SET_DTX, &dtx); tmp->silent_state = 0; tmp->fraction_lost = 0; @@ -172,7 +172,7 @@ static int lin32tospeexuwb_new(struct ast_trans_pvt *pvt) static int speex_decoder_construct(struct ast_trans_pvt *pvt, const SpeexMode *profile) { struct speex_coder_pvt *tmp = pvt->pvt; - + if (!(tmp->speex = speex_decoder_init(profile))) return -1; @@ -462,7 +462,7 @@ static struct ast_translator speextolin = { }; static struct ast_translator lintospeex = { - .name = "lintospeex", + .name = "lintospeex", .src_codec = { .name = "slin", .type = AST_MEDIA_TYPE_AUDIO, @@ -496,7 +496,7 @@ static struct ast_translator speexwbtolin16 = { .name = "slin", .type = AST_MEDIA_TYPE_AUDIO, .sample_rate = 16000, - }, + }, .format = "slin16", .newpvt = speexwbtolin16_new, .framein = speextolin_framein, @@ -577,7 +577,7 @@ static struct ast_translator lin32tospeexuwb = { .buf_size = BUFFER_SAMPLES * 2, /* XXX maybe a lot less ? */ }; -static int parse_config(int reload) +static int parse_config(int reload) { struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); @@ -594,14 +594,14 @@ static int parse_config(int reload) if (res > -1 && res < 11) { ast_verb(3, "CODEC SPEEX: Setting Quality to %d\n",res); quality = res; - } else + } else ast_log(LOG_ERROR,"Error Quality must be 0-10\n"); } else if (!strcasecmp(var->name, "complexity")) { res = abs(atoi(var->value)); if (res > -1 && res < 11) { ast_verb(3, "CODEC SPEEX: Setting Complexity to %d\n",res); complexity = res; - } else + } else ast_log(LOG_ERROR,"Error! Complexity must be 0-10\n"); } else if (!strcasecmp(var->name, "vbr_quality")) { if (sscanf(var->value, "%30f", &res_f) == 1 && res_f >= 0 && res_f <= 10) { @@ -625,7 +625,7 @@ static int parse_config(int reload) else ast_verb(3, "CODEC SPEEX: Disabling ABR\n"); abr = res; - } else + } else ast_log(LOG_ERROR,"Error! ABR target bitrate must be >= 0\n"); } else if (!strcasecmp(var->name, "vad")) { vad = ast_true(var->value) ? 1 : 0; @@ -675,7 +675,7 @@ static int parse_config(int reload) return 0; } -static int reload(void) +static int reload(void) { if (parse_config(1)) return AST_MODULE_LOAD_DECLINE; diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index e0a4f6841f..609d06d60d 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -19,7 +19,7 @@ /*! \file * * \brief codec_ulaw.c - translate between signed linear and ulaw - * + * * \ingroup codecs */ diff --git a/codecs/ex_ilbc.h b/codecs/ex_ilbc.h index 3fe2749dde..18c7983ce1 100644 --- a/codecs/ex_ilbc.h +++ b/codecs/ex_ilbc.h @@ -11,10 +11,10 @@ #include "asterisk/frame.h" /* for ast_frame, etc */ static uint8_t ex_ilbc[] = { - 0xff, 0xa0, 0xff, 0xfa, 0x0f, 0x60, 0x12, 0x11, 0xa2, 0x47, - 0x22, 0x8c, 0x00, 0x00, 0x01, 0x02, 0x80, 0x43, 0xa0, 0x40, - 0x33, 0xff, 0xcf, 0xc0, 0xf3, 0xf3, 0x3f, 0x8f, 0x3f, 0xff, - 0xff, 0xff, 0xff, 0xfc, 0xf9, 0xe5, 0x55, 0x78, 0x0b, 0xca, + 0xff, 0xa0, 0xff, 0xfa, 0x0f, 0x60, 0x12, 0x11, 0xa2, 0x47, + 0x22, 0x8c, 0x00, 0x00, 0x01, 0x02, 0x80, 0x43, 0xa0, 0x40, + 0x33, 0xff, 0xcf, 0xc0, 0xf3, 0xf3, 0x3f, 0x8f, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0xfc, 0xf9, 0xe5, 0x55, 0x78, 0x0b, 0xca, 0xe1, 0x27, 0x94, 0x7b, 0xa8, 0x91, 0x2c, 0x36, 0x08, 0x56, }; diff --git a/codecs/g722/g722.h b/codecs/g722/g722.h index f57b1c8825..1a1e4f9de3 100644 --- a/codecs/g722/g722.h +++ b/codecs/g722/g722.h @@ -7,7 +7,7 @@ * * Copyright (C) 2005 Steve Underwood * - * Despite my general liking of the GPL, I place my own contributions + * Despite my general liking of the GPL, I place my own contributions * to this code in the public domain for the benefit of all mankind - * even the slimy ones who might try to proprietize my work and use it * to my detriment. @@ -122,7 +122,7 @@ typedef struct int nb; int det; } band[2]; - + unsigned int in_buffer; int in_bits; unsigned int out_buffer; diff --git a/codecs/g722/g722_decode.c b/codecs/g722/g722_decode.c index 3e8f7d0c60..47e63eb17a 100644 --- a/codecs/g722/g722_decode.c +++ b/codecs/g722/g722_decode.c @@ -7,7 +7,7 @@ * * Copyright (C) 2005 Steve Underwood * - * Despite my general liking of the GPL, I place my own contributions + * Despite my general liking of the GPL, I place my own contributions * to this code in the public domain for the benefit of all mankind - * even the slimy ones who might try to proprietize my work and use it * to my detriment. @@ -121,7 +121,7 @@ static void block4(g722_decode_state_t *s, int band, int d) s->band[band].d[i] = s->band[band].d[i - 1]; s->band[band].b[i] = s->band[band].bp[i]; } - + for (i = 2; i > 0; i--) { s->band[band].r[i] = s->band[band].r[i - 1]; @@ -198,9 +198,9 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[] static const int wh[3] = {0, -214, 798}; static const int rh2[4] = {2, 1, 2, 1}; static const int qm2[4] = {-7408, -1616, 7408, 1616}; - static const int qm4[16] = + static const int qm4[16] = { - 0, -20456, -12896, -8968, + 0, -20456, -12896, -8968, -6288, -4240, -2584, -1200, 20456, 12896, 8968, 6288, 4240, 2584, 1200, 0 @@ -320,7 +320,7 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[] else if (wd1 > 18432) wd1 = 18432; s->band[0].nb = wd1; - + /* Block 3L, SCALEL */ wd1 = (s->band[0].nb >> 6) & 31; wd2 = 8 - (s->band[0].nb >> 11); @@ -328,7 +328,7 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[] s->band[0].det = wd3 << 2; block4(s, 0, dlowt); - + if (!s->eight_k) { /* Block 2H, INVQAH */ @@ -351,7 +351,7 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[] else if (wd1 > 22528) wd1 = 22528; s->band[1].nb = wd1; - + /* Block 3H, SCALEH */ wd1 = (s->band[1].nb >> 6) & 31; wd2 = 10 - (s->band[1].nb >> 11); diff --git a/codecs/g722/g722_encode.c b/codecs/g722/g722_encode.c index 5890fbf24e..cf53c74eb6 100644 --- a/codecs/g722/g722_encode.c +++ b/codecs/g722/g722_encode.c @@ -9,7 +9,7 @@ * * All rights reserved. * - * Despite my general liking of the GPL, I place my own contributions + * Despite my general liking of the GPL, I place my own contributions * to this code in the public domain for the benefit of all mankind - * even the slimy ones who might try to proprietize my work and use it * to my detriment. @@ -120,7 +120,7 @@ static void block4(g722_encode_state_t *s, int band, int d) s->band[band].d[i] = s->band[band].d[i - 1]; s->band[band].b[i] = s->band[band].bp[i]; } - + for (i = 2; i > 0; i--) { s->band[band].r[i] = s->band[band].r[i - 1]; @@ -289,7 +289,7 @@ int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[] s->x[i] = s->x[i + 2]; s->x[22] = amp[j++]; s->x[23] = amp[j++]; - + /* Discard every other QMF output */ sumeven = 0; sumodd = 0; @@ -337,7 +337,7 @@ int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[] s->band[0].det = wd3 << 2; block4(s, 0, dlow); - + if (s->eight_k) { /* Just leave the high bits as zero */ diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 06f0829839..489a0f3771 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -17,14 +17,14 @@ SASR = -DSASR # LTP_CUT = -DLTP_CUT LTP_CUT = -######### Define to enable the GSM library's long-term correlation +######### Define to enable the GSM library's long-term correlation ######### approximation option---faster, but worse; works for ######### both integer and floating point multiplications. ######### This flag is still in the experimental stage. WAV49 = -DWAV49 #WAV49 = -######### Define to enable the GSM library's option to pack GSM frames +######### Define to enable the GSM library's option to pack GSM frames ######### in the style used by the WAV #49 format. If you want to write ######### a tool that produces .WAV files which contain GSM-encoded data, ######### define this, and read about the GSM_OPT_WAV49 option in the @@ -35,7 +35,7 @@ WAV49 = -DWAV49 ######### Define 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. The compile will -######### probably require gcc. +######### probably require gcc. # Due to the gsm codec beeing broken when compiled with gcc version 4.2 # and optimization higher than -O2 we are checking for that version and @@ -48,7 +48,7 @@ endif PG = #PG = -g -pg ######### Profiling flags. If you don't know what that means, leave it blank. - + # Choose a compiler. The code works both with ANSI and K&R-C. # Use -DNeedFunctionPrototypes to compile with, -UNeedFunctionPrototypes to # compile without, function prototypes in the header files. @@ -119,13 +119,13 @@ ARFLAGS = cr RMFLAGS = -f FIND = find COMPRESS = compress -COMPRESSFLAGS = +COMPRESSFLAGS = # RANLIB = true RANLIB = ranlib # # You shouldn't have to configure below this line if you're porting. -# +# # Local Directories @@ -484,7 +484,7 @@ $(ADDTST)/add: $(ADDTST)/add_test.o # format used by the tests we ran (.cod). We paid for the test data, # so I guess we can't just provide them with this package. Still, # if you happen to have them lying around, here's the code. -# +# # You can use gsm2cod | cod2txt independently to look at what's # coded inside the compressed frames, although this shouldn't be # hard to roll on your own using the gsm_print() function from @@ -492,7 +492,7 @@ $(ADDTST)/add: $(ADDTST)/add_test.o $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run - ( cd $(TST); ./run ) + ( cd $(TST); ./run ) $(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) $(LD) $(LFLAGS) -o $(TST)/lin2txt \ diff --git a/codecs/gsm/README b/codecs/gsm/README index cb6af85cf0..10470e04ea 100644 --- a/codecs/gsm/README +++ b/codecs/gsm/README @@ -17,7 +17,7 @@ rate, i.e. a frame rate of 50 Hz) into 260 bits; for compatibility with typical UNIX applications, our implementation turns frames of 160 16-bit linear samples into 33-byte frames (1650 Bytes/s). The quality of the algorithm is good enough for reliable speaker -recognition; even music often survives transcoding in recognizable +recognition; even music often survives transcoding in recognizable form (given the bandwidth limitations of 8 kHz sampling rate). The interfaces offered are a front end modelled after compress(1), and diff --git a/codecs/gsm/inc/gsm.h b/codecs/gsm/inc/gsm.h index 81065e5129..c98b06fd4f 100644 --- a/codecs/gsm/inc/gsm.h +++ b/codecs/gsm/inc/gsm.h @@ -55,7 +55,7 @@ typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */ #define GSM_OPT_FRAME_CHAIN 6 extern gsm gsm_create GSM_P((void)); -extern void gsm_destroy GSM_P((gsm)); +extern void gsm_destroy GSM_P((gsm)); extern int gsm_print GSM_P((FILE *, gsm, gsm_byte *)); extern int gsm_option GSM_P((gsm, int, int *)); diff --git a/codecs/gsm/inc/private.h b/codecs/gsm/inc/private.h index 80ecbc59fb..21634337c3 100644 --- a/codecs/gsm/inc/private.h +++ b/codecs/gsm/inc/private.h @@ -82,10 +82,10 @@ extern longword gsm_L_asr P((longword a, int n)); extern word gsm_asr P((word a, int n)); /* - * Inlined functions from add.h + * Inlined functions from add.h */ -/* +/* * #define GSM_MULT_R(a, b) (* word a, word b, !(a == b == MIN_WORD) *) \ * (0x0FFFF & SASR(((longword)(a) * (longword)(b) + 16384), 15)) */ @@ -103,7 +103,7 @@ extern word gsm_asr P((word a, int n)); static __inline__ int GSM_L_ADD(int a, int b) { __asm__ __volatile__( - + "addl %2,%0; jno 0f; movl $0x7fffffff,%0; adcl $0,%0; 0:" : "=&r" (a) : "0" (a), "ir" (b) @@ -139,7 +139,7 @@ static __inline__ short GSM_SUB(short a, short b) #ifdef WIN32 #define inline __inline #define __inline__ __inline -#endif +#endif # define GSM_L_ADD(a, b) \ ( (a) < 0 ? ( (b) >= 0 ? (a) + (b) \ @@ -214,10 +214,10 @@ extern void Gsm_Preprocess P(( extern void Gsm_Encoding P(( struct gsm_state * S, - word * e, - word * ep, + word * e, + word * ep, word * xmaxc, - word * Mc, + word * Mc, word * xMc)); extern void Gsm_Short_Term_Analysis_Filter P(( diff --git a/codecs/gsm/inc/proto.h b/codecs/gsm/inc/proto.h index 68e1ecf052..20682c35d8 100644 --- a/codecs/gsm/inc/proto.h +++ b/codecs/gsm/inc/proto.h @@ -40,7 +40,7 @@ # define P1(x, a) (a) # define P2(x, a, b) (a, b) # define P3(x, a, b, c) (a, b, c) -# define P4(x, a, b, c, d) (a, b, c, d) +# define P4(x, a, b, c, d) (a, b, c, d) # define P5(x, a, b, c, d, e) (a, b, c, d, e) # define P6(x, a, b, c, d, e, f) (a, b, c, d, e, f) # define P7(x, a, b, c, d, e, f, g) (a, b, c, d, e, f, g) diff --git a/codecs/gsm/src/add.c b/codecs/gsm/src/add.c index f23d27f160..d3e722de6f 100644 --- a/codecs/gsm/src/add.c +++ b/codecs/gsm/src/add.c @@ -88,7 +88,7 @@ longword gsm_L_sub P2((a,b), longword a, longword b) } else if (b <= 0) return a - b; else { - /* a<0, b>0 */ + /* a<0, b>0 */ ulongword A = (ulongword)-(a + 1) + b; return A >= MAX_LONGWORD ? MIN_LONGWORD : -(longword)A - 1; @@ -120,7 +120,7 @@ word gsm_norm P1((a), longword a ) * variable L_var1 for positive values on the interval * * with minimum of - * minimum of 1073741824 (01000000000000000000000000000000) and + * minimum of 1073741824 (01000000000000000000000000000000) and * maximum of 2147483647 (01111111111111111111111111111111) * * @@ -141,7 +141,7 @@ word gsm_norm P1((a), longword a ) a = ~a; } - return a & 0xffff0000 + return a & 0xffff0000 ? ( a & 0xff000000 ? -1 + bitoff[ 0xFF & (a >> 24) ] : 7 + bitoff[ 0xFF & (a >> 16) ] ) @@ -194,7 +194,7 @@ word gsm_asr P2((a,n), word a, int n) # endif } -/* +/* * (From p. 46, end of section 4.2.5) * * NOTE: The following lines gives [sic] one correct implementation diff --git a/codecs/gsm/src/code.c b/codecs/gsm/src/code.c index 9f6b00f430..dd7e6190e6 100644 --- a/codecs/gsm/src/code.c +++ b/codecs/gsm/src/code.c @@ -19,8 +19,8 @@ #include "gsm.h" #include "proto.h" -/* - * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER +/* + * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER */ void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc), @@ -33,7 +33,7 @@ void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc), * The RPE-LTD coder works on a frame by frame basis. The length of * the frame is equal to 160 samples. Some computations are done * once per frame to produce at the output of the coder the - * LARc[1..8] parameters which are the coded LAR coefficients and + * LARc[1..8] parameters which are the coded LAR coefficients and * also to realize the inverse filtering operation for the entire * frame (160 samples of signal d[0..159]). These parts produce at * the output of the coder: diff --git a/codecs/gsm/src/debug.c b/codecs/gsm/src/debug.c index 22dfa80827..c2469df1a0 100644 --- a/codecs/gsm/src/debug.c +++ b/codecs/gsm/src/debug.c @@ -18,7 +18,7 @@ #include #include "proto.h" -void gsm_debug_words P4( (name, from, to, ptr), +void gsm_debug_words P4( (name, from, to, ptr), char * name, int from, int to, diff --git a/codecs/gsm/src/gsm_decode.c b/codecs/gsm/src/gsm_decode.c index 7318ba2d4d..7ebf35dd07 100644 --- a/codecs/gsm/src/gsm_decode.c +++ b/codecs/gsm/src/gsm_decode.c @@ -206,7 +206,7 @@ int gsm_decode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target) xmaxc[2] = sr & 0x3f; sr >>= 6; xmc[26] = sr & 0x7; sr >>= 3; xmc[27] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; xmc[28] = sr & 0x7; sr >>= 3; xmc[29] = sr & 0x7; sr >>= 3; xmc[30] = sr & 0x7; sr >>= 3; @@ -223,7 +223,7 @@ int gsm_decode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target) xmc[38] = sr & 0x7; sr >>= 3; sr = *c++; Nc[3] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; bc[3] = sr & 0x3; sr >>= 2; Mc[3] = sr & 0x3; sr >>= 2; sr |= (uword)*c++ << 5; diff --git a/codecs/gsm/src/gsm_explode.c b/codecs/gsm/src/gsm_explode.c index a906fc2ed8..744ded5af1 100644 --- a/codecs/gsm/src/gsm_explode.c +++ b/codecs/gsm/src/gsm_explode.c @@ -228,7 +228,7 @@ int gsm_explode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target) #define xmc (target + 46 - 26) xmc[26] = sr & 0x7; sr >>= 3; xmc[27] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; xmc[28] = sr & 0x7; sr >>= 3; xmc[29] = sr & 0x7; sr >>= 3; xmc[30] = sr & 0x7; sr >>= 3; @@ -245,7 +245,7 @@ int gsm_explode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target) xmc[38] = sr & 0x7; sr >>= 3; sr = *c++; Nc[3] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; bc[3] = sr & 0x3; sr >>= 2; Mc[3] = sr & 0x3; sr >>= 2; sr |= (uword)*c++ << 5; @@ -273,7 +273,7 @@ int gsm_explode P3((s, c, target), gsm s, gsm_byte * c, gsm_signal * target) xmc[51] = sr & 0x7; sr >>= 3; } } - else + else #endif { /* GSM_MAGIC = (*c >> 4) & 0xF; */ diff --git a/codecs/gsm/src/gsm_implode.c b/codecs/gsm/src/gsm_implode.c index 453b8cf390..08ebf58532 100644 --- a/codecs/gsm/src/gsm_implode.c +++ b/codecs/gsm/src/gsm_implode.c @@ -316,7 +316,7 @@ void gsm_implode P3((s, source, c), gsm s, gsm_signal * source, gsm_byte * c) #define xmc (source + 46 - 26) xmc[26] = sr & 0x7; sr >>= 3; xmc[27] = sr & 0x7; sr >>= 3; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; xmc[28] = sr & 0x7; sr >>= 3; xmc[29] = sr & 0x7; sr >>= 3; xmc[30] = sr & 0x7; sr >>= 3; @@ -333,7 +333,7 @@ void gsm_implode P3((s, source, c), gsm s, gsm_signal * source, gsm_byte * c) xmc[38] = sr & 0x7; sr >>= 3; sr = *c++; Nc[3] = sr & 0x7f; sr >>= 7; - sr |= (uword)*c++ << 1; + sr |= (uword)*c++ << 1; bc[3] = sr & 0x3; sr >>= 2; Mc[3] = sr & 0x3; sr >>= 2; sr |= (uword)*c++ << 5; @@ -361,7 +361,7 @@ void gsm_implode P3((s, source, c), gsm s, gsm_signal * source, gsm_byte * c) } } else -#endif +#endif { *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ diff --git a/codecs/gsm/src/gsm_option.c b/codecs/gsm/src/gsm_option.c index 2807801328..303170a9c2 100644 --- a/codecs/gsm/src/gsm_option.c +++ b/codecs/gsm/src/gsm_option.c @@ -56,7 +56,7 @@ int gsm_option P3((r, opt, val), gsm r, int opt, int * val) case GSM_OPT_WAV49: -#ifdef WAV49 +#ifdef WAV49 result = r->wav_fmt; if (val) r->wav_fmt = !!*val; #endif diff --git a/codecs/gsm/src/k6opt.h b/codecs/gsm/src/k6opt.h index 16ea2ac8dc..5c65b378ce 100644 --- a/codecs/gsm/src/k6opt.h +++ b/codecs/gsm/src/k6opt.h @@ -1,7 +1,7 @@ /* k6opt.h vector functions optimized for MMX extensions to x86 * * Copyright (C) 1999 by Stanley J. Brooks - * + * * Any use of this software is permitted provided that this notice is not * removed and that neither the authors nor the Technische Universitaet Berlin * are deemed to have made any representations as to the suitability of this @@ -9,7 +9,7 @@ * this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE; * not even the implied warranty of MERCHANTABILITY or FITNESS FOR * A PARTICULAR PURPOSE. - * + * * Chicago, 03.12.1999 * Stanley J. Brooks */ @@ -22,7 +22,7 @@ extern void Weighting_filter P2((e, x), extern longword k6maxcc P3((wt,dp,Nc_out), const word *wt, - const word *dp, + const word *dp, word * Nc_out /* OUT */ ) ; @@ -34,7 +34,7 @@ extern longword k6maxcc P3((wt,dp,Nc_out), */ extern longword k6maxmin P3((p,n,out), const word *p, - int n, + int n, word *out /* out[0] is max, out[1] is min */ ) ; @@ -53,7 +53,7 @@ extern longword k6iprod P3((p,q,n), */ extern void k6vsraw P3((p,n,bits), const word *p, - int n, + int n, int bits ) ; @@ -65,7 +65,7 @@ extern void k6vsraw P3((p,n,bits), */ extern void k6vsllw P3((p,n,bits), const word *p, - int n, + int n, int bits ) ; diff --git a/codecs/gsm/src/long_term.c b/codecs/gsm/src/long_term.c index 83b6fdf857..571d9c7db6 100644 --- a/codecs/gsm/src/long_term.c +++ b/codecs/gsm/src/long_term.c @@ -338,7 +338,7 @@ static void Cut_Calculation_of_the_LTP_parameters P5((st, d,dp,bc_out,Nc_out), else scal = 6 - temp; assert(scal >= 0); - ltp_cut = (longword)SASR(dmax, scal) * st->ltp_cut / 100; + ltp_cut = (longword)SASR(dmax, scal) * st->ltp_cut / 100; /* Initialization of a working array wt @@ -370,7 +370,7 @@ static void Cut_Calculation_of_the_LTP_parameters P5((st, d,dp,bc_out,Nc_out), register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -536,7 +536,7 @@ static void Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out), register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -750,7 +750,7 @@ static void Fast_Calculation_of_the_LTP_parameters P4((d,dp,bc_out,Nc_out), register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -867,7 +867,7 @@ static void Long_term_analysis_filtering P6((bc,Nc,dp,d,dpp,e), case 0: STEP( 3277 ); break; case 1: STEP( 11469 ); break; case 2: STEP( 21299 ); break; - case 3: STEP( 32767 ); break; + case 3: STEP( 32767 ); break; } } @@ -888,7 +888,7 @@ void Gsm_Long_Term_Predictor P7((S,d,dp,e,dpp,Nc,bc), /* 4x for 160 samples */ assert( dpp); assert( Nc ); assert( bc ); #if defined(FAST) && defined(USE_FLOAT_MUL) - if (S->fast) + if (S->fast) #if defined (LTP_CUT) if (S->ltp_cut) Cut_Fast_Calculation_of_the_LTP_parameters(S, @@ -896,7 +896,7 @@ void Gsm_Long_Term_Predictor P7((S,d,dp,e,dpp,Nc,bc), /* 4x for 160 samples */ else #endif /* LTP_CUT */ Fast_Calculation_of_the_LTP_parameters(d, dp, bc, Nc ); - else + else #endif /* FAST & USE_FLOAT_MUL */ #ifdef LTP_CUT if (S->ltp_cut) @@ -936,7 +936,7 @@ void Gsm_Long_Term_Synthesis_Filtering P5((S,Ncr,bcr,erp,drp), */ brp = gsm_QLB[ bcr ]; - /* Computation of the reconstructed short term residual + /* Computation of the reconstructed short term residual * signal drp[0..39] */ assert(brp != MIN_WORD); diff --git a/codecs/gsm/src/lpc.c b/codecs/gsm/src/lpc.c index 744149e02c..7ce2c2ff3b 100644 --- a/codecs/gsm/src/lpc.c +++ b/codecs/gsm/src/lpc.c @@ -84,7 +84,7 @@ static void Autocorrelation P2((s, L_ACF), float_s[k] = (float) \ (s[k] = GSM_MULT_R(s[k], 16384 >> (n-1)));\ break; -# else +# else # define SCALE(n) \ case n: for (k = 0; k <= 159; k++) \ s[k] = (word)GSM_MULT_R( s[k], 16384 >> (n-1) );\ @@ -153,7 +153,7 @@ static void Autocorrelation P2((s, L_ACF), STEP(5); STEP(6); STEP(7); STEP(8); } - for (k = 9; k--; L_ACF[k] <<= 1) ; + for (k = 9; k--; L_ACF[k] <<= 1) ; } @@ -168,7 +168,7 @@ static void Autocorrelation P2((s, L_ACF), /* Rescaling of the array s[0..159] */ if (scalauto > 0) { - assert(scalauto <= 4); + assert(scalauto <= 4); #ifndef K6OPT for (k = 160; k--; *s++ <<= scalauto) ; # else /* K6OPT */ @@ -256,7 +256,7 @@ static void Reflection_coefficients P2( (L_ACF, r), assert(*r >= 0); if (P[1] > 0) *r = -*r; /* r[n] = sub(0, r[n]) */ assert (*r != MIN_WORD); - if (n == 8) return; + if (n == 8) return; /* Schur recursion */ @@ -325,7 +325,7 @@ static void Quantization_and_coding P1((LAR), /* This procedure needs four tables; the following equations * give the optimum scaling for the constants: - * + * * A[0..7] = integer( real_A[0..7] * 1024 ) * B[0..7] = integer( real_B[0..7] * 512 ) * MAC[0..7] = maximum of the LARc[0..7] diff --git a/codecs/gsm/src/preprocess.c b/codecs/gsm/src/preprocess.c index eacdac8513..da7baae135 100644 --- a/codecs/gsm/src/preprocess.c +++ b/codecs/gsm/src/preprocess.c @@ -15,7 +15,7 @@ #include "proto.h" /* 4.2.0 .. 4.2.3 PREPROCESSING SECTION - * + * * After A-law to linear conversion (or directly from the * Ato D converter) the following scaling is assumed for * input to the RPE-LTP algorithm: @@ -26,7 +26,7 @@ * Where S is the sign bit, v a valid bit, and * a "don't care" bit. * The original signal is called sop[..] * - * out: 0.1................... 12 + * out: 0.1................... 12 * S.S.v.v.v.v.v.v.v.v.v.v.v.v.0.0 */ @@ -59,7 +59,7 @@ void Gsm_Preprocess P3((S, s, so), /* 4.2.2 Offset compensation - * + * * This part implements a high-pass filter and requires extended * arithmetic precision for the recursive part of this filter. * The input of this procedure is the array so[0...159] and the @@ -82,15 +82,15 @@ void Gsm_Preprocess P3((S, s, so), */ { word msp; -#ifndef __GNUC__ +#ifndef __GNUC__ word lsp; #endif longword L_s2; longword L_temp; - + L_s2 = s1; L_s2 <<= 15; -#ifndef __GNUC__ +#ifndef __GNUC__ msp = (word)SASR( L_z2, 15 ); lsp = (word)(L_z2 & 0x7fff); /* gsm_L_sub(L_z2,(msp<<15)); */ diff --git a/codecs/gsm/src/rpe.c b/codecs/gsm/src/rpe.c index 1c354795d3..2ace69f2f8 100644 --- a/codecs/gsm/src/rpe.c +++ b/codecs/gsm/src/rpe.c @@ -29,7 +29,7 @@ static void Weighting_filter P2((e, x), * The coefficients of the weighting filter are stored in a table * (see table 4.4). The following scaling is used: * - * H[0..10] = integer( real_H[ 0..10] * 8192 ); + * H[0..10] = integer( real_H[ 0..10] * 8192 ); */ { /* word wt[ 50 ]; */ @@ -50,7 +50,7 @@ static void Weighting_filter P2((e, x), e -= 5; /* Compute the signal x[0..39] - */ + */ for (k = 0; k <= 39; k++) { L_result = 8192 >> 1; @@ -65,7 +65,7 @@ static void Weighting_filter P2((e, x), #define STEP( i, H ) (e[ k + i ] * (longword)H) /* Every one of these multiplications is done twice -- - * but I don't see an elegant way to optimize this. + * but I don't see an elegant way to optimize this. * Do you? */ @@ -83,16 +83,16 @@ static void Weighting_filter P2((e, x), L_result += STEP( 10, -134 ) ; #else L_result += - STEP( 0, -134 ) - + STEP( 1, -374 ) + STEP( 0, -134 ) + + STEP( 1, -374 ) /* + STEP( 2, 0 ) */ - + STEP( 3, 2054 ) - + STEP( 4, 5741 ) - + STEP( 5, 8192 ) - + STEP( 6, 5741 ) - + STEP( 7, 2054 ) + + STEP( 3, 2054 ) + + STEP( 4, 5741 ) + + STEP( 5, 8192 ) + + STEP( 6, 5741 ) + + STEP( 7, 2054 ) /* + STEP( 8, 0 ) */ - + STEP( 9, -374 ) + + STEP( 9, -374 ) + STEP(10, -134 ) ; #endif @@ -117,7 +117,7 @@ static void Weighting_filter P2((e, x), /* 4.2.14 */ static void RPE_grid_selection P3((x,xM,Mc_out), - word * x, /* [0..39] IN */ + word * x, /* [0..39] IN */ word * xM, /* [0..12] OUT */ word * Mc_out /* OUT */ ) @@ -150,7 +150,7 @@ static void RPE_grid_selection P3((x,xM,Mc_out), * L_temp = GSM_L_MULT( temp1, temp1 ); * L_result = GSM_L_ADD( L_temp, L_result ); * } - * + * * if (L_result > EM) { * Mc = m; * EM = L_result; @@ -313,7 +313,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out), * can be calculated by using the exponent and the mantissa part of * xmaxc (logarithmic table). * So, this method avoids any division and uses only a scaling - * of the RPE samples by a function of the exponent. A direct + * of the RPE samples by a function of the exponent. A direct * multiplication by the inverse of the mantissa (NRFAC[0..7] * found in table 4.5) gives the 3 bit coded version xMc[0..12] * of the RPE samples. @@ -324,7 +324,7 @@ static void APCM_quantization P5((xM,xMc,mant_out,exp_out,xmaxc_out), */ assert( exp <= 4096 && exp >= -4096); - assert( mant >= 0 && mant <= 7 ); + assert( mant >= 0 && mant <= 7 ); temp1 = 6 - exp; /* normalization by the exponent */ temp2 = gsm_NRFAC[ mant ]; /* inverse mantissa */ @@ -354,7 +354,7 @@ static void APCM_inverse_quantization P4((xMc,mant,exp,xMp), word mant, word exp, register word * xMp) /* [0..12] OUT */ -/* +/* * This part is for decoding the RPE sequence of coded xMc[0..12] * samples to obtain the xMp[0..12] array. Table 4.6 is used to get * the mantissa of xmaxc (FAC[0..7]). @@ -363,7 +363,7 @@ static void APCM_inverse_quantization P4((xMc,mant,exp,xMp), int i; word temp, temp1, temp2, temp3; - assert( mant >= 0 && mant <= 7 ); + assert( mant >= 0 && mant <= 7 ); temp1 = gsm_FAC[ mant ]; /* see 4.2-15 for mant */ temp2 = gsm_sub( 6, exp ); /* see 4.2-15 for exp */ @@ -440,7 +440,7 @@ void Gsm_Update_of_reconstructed_short_time_residual_signal P3((dpp, ep, dp), { int k; - for (k = 0; k <= 79; k++) + for (k = 0; k <= 79; k++) dp[ -120 + k ] = dp[ -80 + k ]; for (k = 0; k <= 39; k++) diff --git a/codecs/gsm/src/short_term.c b/codecs/gsm/src/short_term.c index 43c592c04d..4172d322c6 100644 --- a/codecs/gsm/src/short_term.c +++ b/codecs/gsm/src/short_term.c @@ -77,7 +77,7 @@ static void Decoding_of_the_coded_Log_Area_Ratios P2((LARc,LARpp), } /* 4.2.9 */ -/* Computation of the quantized reflection coefficients +/* Computation of the quantized reflection coefficients */ /* 4.2.9.1 Interpolation of the LARpp[1..8] to get the LARp[1..8] @@ -401,7 +401,7 @@ void Gsm_Short_Term_Analysis_Filter P3((S,LARc,s), Coefficients_40_159( LARpp_j, LARp); LARp_to_rp( LARp ); FILTER( S->u, LARp, 120, s + 40); - + } void Gsm_Short_Term_Synthesis_Filter P4((S, LARcr, wt, s), diff --git a/codecs/gsm/src/table.c b/codecs/gsm/src/table.c index 16a04118c1..d8366931e8 100644 --- a/codecs/gsm/src/table.c +++ b/codecs/gsm/src/table.c @@ -51,7 +51,7 @@ word gsm_QLB[4] = { 3277, 11469, 21299, 32767 }; word gsm_H[11] = {-134, -374, 0, 2054, 5741, 8192, 5741, 2054, 0, -374, -134 }; -/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax +/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax */ /* i 0 1 2 3 4 5 6 7 */ word gsm_NRFAC[8] = { 29128, 26215, 23832, 21846, 20165, 18725, 17476, 16384 }; diff --git a/codecs/ilbc/FrameClassify.c b/codecs/ilbc/FrameClassify.c index 80d72d917d..f4e73ccf2a 100644 --- a/codecs/ilbc/FrameClassify.c +++ b/codecs/ilbc/FrameClassify.c @@ -111,4 +111,3 @@ return max_ssqEn_n; } - diff --git a/codecs/ilbc/FrameClassify.h b/codecs/ilbc/FrameClassify.h index 018ddbe5da..6997a0d32f 100644 --- a/codecs/ilbc/FrameClassify.h +++ b/codecs/ilbc/FrameClassify.h @@ -24,4 +24,3 @@ #endif - diff --git a/codecs/ilbc/LPCdecode.c b/codecs/ilbc/LPCdecode.c index 81bab90485..a0d77ff24c 100644 --- a/codecs/ilbc/LPCdecode.c +++ b/codecs/ilbc/LPCdecode.c @@ -150,9 +150,3 @@ length*sizeof(float)); } - - - - - - diff --git a/codecs/ilbc/LPCdecode.h b/codecs/ilbc/LPCdecode.h index abe1d7b3b1..fc23ab7ab3 100644 --- a/codecs/ilbc/LPCdecode.h +++ b/codecs/ilbc/LPCdecode.h @@ -38,15 +38,3 @@ ); #endif - - - - - - - - - - - - diff --git a/codecs/ilbc/LPCencode.c b/codecs/ilbc/LPCencode.c index 09c6909586..7ef6204e0b 100644 --- a/codecs/ilbc/LPCencode.c +++ b/codecs/ilbc/LPCencode.c @@ -236,4 +236,3 @@ lsf, lsfdeq, iLBCenc_inst->lsfold, iLBCenc_inst->lsfdeqold, LPC_FILTERORDER, iLBCenc_inst); } - diff --git a/codecs/ilbc/LPCencode.h b/codecs/ilbc/LPCencode.h index 39a9b04037..c9cdfd471c 100644 --- a/codecs/ilbc/LPCencode.h +++ b/codecs/ilbc/LPCencode.h @@ -25,4 +25,3 @@ ); #endif - diff --git a/codecs/ilbc/StateConstructW.c b/codecs/ilbc/StateConstructW.c index 1d3e65fa63..9fd45251d2 100644 --- a/codecs/ilbc/StateConstructW.c +++ b/codecs/ilbc/StateConstructW.c @@ -72,15 +72,3 @@ out[k] = fout[len-1-k]+fout[2*len-1-k]; } } - - - - - - - - - - - - diff --git a/codecs/ilbc/StateConstructW.h b/codecs/ilbc/StateConstructW.h index 08f93d2815..19ec6cf86e 100644 --- a/codecs/ilbc/StateConstructW.h +++ b/codecs/ilbc/StateConstructW.h @@ -28,4 +28,3 @@ ); #endif - diff --git a/codecs/ilbc/StateSearchW.c b/codecs/ilbc/StateSearchW.c index 1eeee936c1..7320dded91 100644 --- a/codecs/ilbc/StateSearchW.c +++ b/codecs/ilbc/StateSearchW.c @@ -198,14 +198,3 @@ AbsQuantW(iLBCenc_inst, fout,syntDenum, weightDenum,idxVec, len, state_first); } - - - - - - - - - - - diff --git a/codecs/ilbc/StateSearchW.h b/codecs/ilbc/StateSearchW.h index 9036daa892..730e039608 100644 --- a/codecs/ilbc/StateSearchW.h +++ b/codecs/ilbc/StateSearchW.h @@ -42,11 +42,3 @@ #endif - - - - - - - - diff --git a/codecs/ilbc/anaFilter.c b/codecs/ilbc/anaFilter.c index c161f98a5b..3ac2127a17 100644 --- a/codecs/ilbc/anaFilter.c +++ b/codecs/ilbc/anaFilter.c @@ -69,4 +69,3 @@ memcpy(mem, &In[len-LPC_FILTERORDER], LPC_FILTERORDER*sizeof(float)); } - diff --git a/codecs/ilbc/anaFilter.h b/codecs/ilbc/anaFilter.h index 91367f95e0..df741bfb85 100644 --- a/codecs/ilbc/anaFilter.h +++ b/codecs/ilbc/anaFilter.h @@ -27,4 +27,3 @@ ); #endif - diff --git a/codecs/ilbc/constants.c b/codecs/ilbc/constants.c index d43dac4d4e..bedfc3971d 100644 --- a/codecs/ilbc/constants.c +++ b/codecs/ilbc/constants.c @@ -767,4 +767,3 @@ (float)1.786499, (float)2.041748, (float)2.290405, (float)2.650757, (float)1.938232, (float)2.264404, (float)2.529053, (float)2.796143 }; - diff --git a/codecs/ilbc/constants.h b/codecs/ilbc/constants.h index 3487d529db..da84a9d477 100644 --- a/codecs/ilbc/constants.h +++ b/codecs/ilbc/constants.h @@ -77,4 +77,3 @@ #endif - diff --git a/codecs/ilbc/createCB.c b/codecs/ilbc/createCB.c index aefacf200a..31d6eab195 100644 --- a/codecs/ilbc/createCB.c +++ b/codecs/ilbc/createCB.c @@ -228,4 +228,3 @@ } - diff --git a/codecs/ilbc/createCB.h b/codecs/ilbc/createCB.h index eda547c669..6689cc27d0 100644 --- a/codecs/ilbc/createCB.h +++ b/codecs/ilbc/createCB.h @@ -55,4 +55,3 @@ ); #endif - diff --git a/codecs/ilbc/doCPLC.c b/codecs/ilbc/doCPLC.c index 9fa4584fe8..c655c6df9b 100644 --- a/codecs/ilbc/doCPLC.c +++ b/codecs/ilbc/doCPLC.c @@ -267,4 +267,3 @@ memcpy(iLBCdec_inst->prevResidual, PLCresidual, iLBCdec_inst->blockl*sizeof(float)); } - diff --git a/codecs/ilbc/doCPLC.h b/codecs/ilbc/doCPLC.h index 2bda7a1441..9bbb519eec 100644 --- a/codecs/ilbc/doCPLC.h +++ b/codecs/ilbc/doCPLC.h @@ -26,4 +26,3 @@ ); #endif - diff --git a/codecs/ilbc/enhancer.c b/codecs/ilbc/enhancer.c index 1770207dd3..681ec2a636 100644 --- a/codecs/ilbc/enhancer.c +++ b/codecs/ilbc/enhancer.c @@ -698,4 +698,3 @@ return (lag*2); } - diff --git a/codecs/ilbc/enhancer.h b/codecs/ilbc/enhancer.h index 8a081fb1bc..80a494e091 100644 --- a/codecs/ilbc/enhancer.h +++ b/codecs/ilbc/enhancer.h @@ -33,4 +33,3 @@ ); #endif - diff --git a/codecs/ilbc/extract-cfile.awk b/codecs/ilbc/extract-cfile.awk index e4b07bc089..54fd2bbf76 100644 --- a/codecs/ilbc/extract-cfile.awk +++ b/codecs/ilbc/extract-cfile.awk @@ -5,7 +5,7 @@ BEGIN { srcname = "nothing"; } srcname = $2; printf("creating source file %s\n", srcname); }else if (srcname != "nothing") { - if (/Andersen,* *et* *al\./) + if (/Andersen,* *et* *al\./) printf("skipping %s\n", $0); else if (/ /) printf("skipping2 %s\n", $0); diff --git a/codecs/ilbc/filter.c b/codecs/ilbc/filter.c index 6565c2beee..322a9612f7 100644 --- a/codecs/ilbc/filter.c +++ b/codecs/ilbc/filter.c @@ -172,4 +172,3 @@ *Out_ptr++ = o; } } - diff --git a/codecs/ilbc/filter.h b/codecs/ilbc/filter.h index 4c512cd937..9c13ec66bd 100644 --- a/codecs/ilbc/filter.h +++ b/codecs/ilbc/filter.h @@ -77,4 +77,3 @@ ); #endif - diff --git a/codecs/ilbc/gainquant.c b/codecs/ilbc/gainquant.c index 0e74ff8270..7b2052f6cb 100644 --- a/codecs/ilbc/gainquant.c +++ b/codecs/ilbc/gainquant.c @@ -108,9 +108,3 @@ return 0.0; } - - - - - - diff --git a/codecs/ilbc/gainquant.h b/codecs/ilbc/gainquant.h index 0d024246d7..543e7e3242 100644 --- a/codecs/ilbc/gainquant.h +++ b/codecs/ilbc/gainquant.h @@ -27,4 +27,3 @@ ); #endif - diff --git a/codecs/ilbc/getCBvec.c b/codecs/ilbc/getCBvec.c index 4f2d291417..c0faf5f91c 100644 --- a/codecs/ilbc/getCBvec.c +++ b/codecs/ilbc/getCBvec.c @@ -190,4 +190,3 @@ } } } - diff --git a/codecs/ilbc/getCBvec.h b/codecs/ilbc/getCBvec.h index 0080907c02..6ac63d7435 100644 --- a/codecs/ilbc/getCBvec.h +++ b/codecs/ilbc/getCBvec.h @@ -22,4 +22,3 @@ ); #endif - diff --git a/codecs/ilbc/helpfun.c b/codecs/ilbc/helpfun.c index b79ac4f393..15189c3a11 100644 --- a/codecs/ilbc/helpfun.c +++ b/codecs/ilbc/helpfun.c @@ -321,4 +321,3 @@ return change; } - diff --git a/codecs/ilbc/helpfun.h b/codecs/ilbc/helpfun.h index 931ca68a64..21ff9c0235 100644 --- a/codecs/ilbc/helpfun.h +++ b/codecs/ilbc/helpfun.h @@ -103,4 +103,3 @@ ); #endif - diff --git a/codecs/ilbc/hpInput.c b/codecs/ilbc/hpInput.c index 7ceee09643..93986d6533 100644 --- a/codecs/ilbc/hpInput.c +++ b/codecs/ilbc/hpInput.c @@ -62,4 +62,3 @@ } } - diff --git a/codecs/ilbc/hpInput.h b/codecs/ilbc/hpInput.h index 3b020d11df..70fa35392e 100644 --- a/codecs/ilbc/hpInput.h +++ b/codecs/ilbc/hpInput.h @@ -21,4 +21,3 @@ ); #endif - diff --git a/codecs/ilbc/hpOutput.c b/codecs/ilbc/hpOutput.c index 756160a657..4d2128ee0e 100644 --- a/codecs/ilbc/hpOutput.c +++ b/codecs/ilbc/hpOutput.c @@ -58,4 +58,3 @@ po++; } } - diff --git a/codecs/ilbc/hpOutput.h b/codecs/ilbc/hpOutput.h index b213a19348..b192e36967 100644 --- a/codecs/ilbc/hpOutput.h +++ b/codecs/ilbc/hpOutput.h @@ -21,4 +21,3 @@ ); #endif - diff --git a/codecs/ilbc/iCBConstruct.c b/codecs/ilbc/iCBConstruct.c index ee9a73ca58..4d4330ff78 100644 --- a/codecs/ilbc/iCBConstruct.c +++ b/codecs/ilbc/iCBConstruct.c @@ -109,4 +109,3 @@ } } } - diff --git a/codecs/ilbc/iCBConstruct.h b/codecs/ilbc/iCBConstruct.h index 143501ed64..8ff82cb613 100644 --- a/codecs/ilbc/iCBConstruct.h +++ b/codecs/ilbc/iCBConstruct.h @@ -37,4 +37,3 @@ ); #endif - diff --git a/codecs/ilbc/iCBSearch.c b/codecs/ilbc/iCBSearch.c index 78d67df178..85c9ceca24 100644 --- a/codecs/ilbc/iCBSearch.c +++ b/codecs/ilbc/iCBSearch.c @@ -501,12 +501,3 @@ } gain_index[0]=j; } - - - - - - - - - diff --git a/codecs/ilbc/iCBSearch.h b/codecs/ilbc/iCBSearch.h index a61db15403..b8bdf68b08 100644 --- a/codecs/ilbc/iCBSearch.h +++ b/codecs/ilbc/iCBSearch.h @@ -34,4 +34,3 @@ ); #endif - diff --git a/codecs/ilbc/iLBC_decode.c b/codecs/ilbc/iLBC_decode.c index e7bda11644..b607f41d06 100644 --- a/codecs/ilbc/iLBC_decode.c +++ b/codecs/ilbc/iLBC_decode.c @@ -648,4 +648,3 @@ iLBCdec_inst->prev_enh_pl=1; } } - diff --git a/codecs/ilbc/iLBC_decode.h b/codecs/ilbc/iLBC_decode.h index 5f4384dcde..7af2fd76f0 100644 --- a/codecs/ilbc/iLBC_decode.h +++ b/codecs/ilbc/iLBC_decode.h @@ -39,4 +39,3 @@ ); #endif - diff --git a/codecs/ilbc/iLBC_define.h b/codecs/ilbc/iLBC_define.h index 480c834b97..09b120e982 100644 --- a/codecs/ilbc/iLBC_define.h +++ b/codecs/ilbc/iLBC_define.h @@ -214,4 +214,3 @@ } iLBC_Dec_Inst_t; #endif - diff --git a/codecs/ilbc/iLBC_encode.c b/codecs/ilbc/iLBC_encode.c index 4c2e6f714c..ff3205d0bf 100644 --- a/codecs/ilbc/iLBC_encode.c +++ b/codecs/ilbc/iLBC_encode.c @@ -540,4 +540,3 @@ will treat it as a lost frame) */ dopack( &pbytes, 0, 1, &pos); } - diff --git a/codecs/ilbc/iLBC_encode.h b/codecs/ilbc/iLBC_encode.h index a3ab55f9dc..2c2cd3fea7 100644 --- a/codecs/ilbc/iLBC_encode.h +++ b/codecs/ilbc/iLBC_encode.h @@ -31,9 +31,3 @@ ); #endif - - - - - - diff --git a/codecs/ilbc/iLBC_test.c b/codecs/ilbc/iLBC_test.c index 92d6c0ddc7..6ca7afa7e4 100644 --- a/codecs/ilbc/iLBC_test.c +++ b/codecs/ilbc/iLBC_test.c @@ -311,4 +311,3 @@ } return(0); } - diff --git a/codecs/ilbc/lsf.c b/codecs/ilbc/lsf.c index b4fe0eda3d..861e4f93b7 100644 --- a/codecs/ilbc/lsf.c +++ b/codecs/ilbc/lsf.c @@ -274,10 +274,3 @@ a_coef[0] = 1.0; } - - - - - - - diff --git a/codecs/ilbc/lsf.h b/codecs/ilbc/lsf.h index caff77ec0d..27d8dfb4ce 100644 --- a/codecs/ilbc/lsf.h +++ b/codecs/ilbc/lsf.h @@ -24,4 +24,3 @@ ); #endif - diff --git a/codecs/ilbc/packing.c b/codecs/ilbc/packing.c index b7496a48ea..10f1c50680 100644 --- a/codecs/ilbc/packing.c +++ b/codecs/ilbc/packing.c @@ -179,4 +179,3 @@ } } } - diff --git a/codecs/ilbc/packing.h b/codecs/ilbc/packing.h index cbb9f82dfd..96d390e19d 100644 --- a/codecs/ilbc/packing.h +++ b/codecs/ilbc/packing.h @@ -65,4 +65,3 @@ ); #endif - diff --git a/codecs/ilbc/rfc3951.txt b/codecs/ilbc/rfc3951.txt index d4fba08e4a..320651b7bc 100644 --- a/codecs/ilbc/rfc3951.txt +++ b/codecs/ilbc/rfc3951.txt @@ -56,7 +56,7 @@ Abstract Andersen, et al. Experimental [Page 1] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -112,7 +112,7 @@ Table of Contents Andersen, et al. Experimental [Page 2] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -168,7 +168,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 3] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -224,7 +224,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 4] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -280,7 +280,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 5] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -336,7 +336,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 6] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -392,7 +392,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 7] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -448,7 +448,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 8] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -504,7 +504,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 9] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -560,7 +560,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 10] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -616,7 +616,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 11] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -672,7 +672,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 12] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -728,7 +728,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 13] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -784,7 +784,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 14] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -840,7 +840,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 15] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -896,7 +896,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 16] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -952,7 +952,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 17] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1008,7 +1008,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 18] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1064,7 +1064,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 19] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1120,7 +1120,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 20] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1176,7 +1176,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 21] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1232,7 +1232,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 22] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1288,7 +1288,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 23] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1344,7 +1344,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 24] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1400,7 +1400,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 25] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1456,7 +1456,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 26] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1512,7 +1512,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 27] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1568,7 +1568,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 28] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1624,7 +1624,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 29] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1680,7 +1680,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 30] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1736,7 +1736,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 31] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1792,7 +1792,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 32] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1848,7 +1848,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 33] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1904,7 +1904,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 34] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -1960,7 +1960,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 35] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2016,7 +2016,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 36] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2072,7 +2072,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 37] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2128,7 +2128,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 38] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2184,7 +2184,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 39] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2240,7 +2240,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 40] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2296,7 +2296,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 41] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2352,7 +2352,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 42] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2408,7 +2408,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 43] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2464,7 +2464,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 44] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2520,7 +2520,7 @@ APPENDIX A. Reference Implementation Andersen, et al. Experimental [Page 45] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2576,7 +2576,7 @@ A.1. iLBC_test.c Andersen, et al. Experimental [Page 46] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2632,7 +2632,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 47] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2688,7 +2688,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 48] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2744,7 +2744,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 49] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2800,7 +2800,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 50] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2856,7 +2856,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 51] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2912,7 +2912,7 @@ A.2. iLBC_encode.h Andersen, et al. Experimental [Page 52] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -2968,7 +2968,7 @@ A.3. iLBC_encode.c Andersen, et al. Experimental [Page 53] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3024,7 +3024,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 54] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3080,7 +3080,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 55] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3136,7 +3136,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 56] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3192,7 +3192,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 57] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3248,7 +3248,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 58] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3304,7 +3304,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 59] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3360,7 +3360,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 60] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3416,7 +3416,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 61] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3472,7 +3472,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 62] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3528,7 +3528,7 @@ A.4. iLBC_decode.h Andersen, et al. Experimental [Page 63] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3584,7 +3584,7 @@ A.5. iLBC_decode.c Andersen, et al. Experimental [Page 64] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3640,7 +3640,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 65] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3696,7 +3696,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 66] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3752,7 +3752,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 67] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3808,7 +3808,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 68] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3864,7 +3864,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 69] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3920,7 +3920,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 70] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -3976,7 +3976,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 71] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4032,7 +4032,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 72] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4088,7 +4088,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 73] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4144,7 +4144,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 74] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4200,7 +4200,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 75] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4256,7 +4256,7 @@ A.6. iLBC_define.h Andersen, et al. Experimental [Page 76] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4312,7 +4312,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 77] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4368,7 +4368,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 78] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4424,7 +4424,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 79] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4480,7 +4480,7 @@ A.7. constants.h Andersen, et al. Experimental [Page 80] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4536,7 +4536,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 81] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4592,7 +4592,7 @@ A.8. constants.c Andersen, et al. Experimental [Page 82] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4648,7 +4648,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 83] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4704,7 +4704,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 84] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4760,7 +4760,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 85] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4816,7 +4816,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 86] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4872,7 +4872,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 87] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4928,7 +4928,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 88] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -4984,7 +4984,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 89] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5040,7 +5040,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 90] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5096,7 +5096,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 91] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5152,7 +5152,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 92] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5208,7 +5208,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 93] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5264,7 +5264,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 94] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5320,7 +5320,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 95] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5376,7 +5376,7 @@ A.9. anaFilter.h Andersen, et al. Experimental [Page 96] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5432,7 +5432,7 @@ A.10. anaFilter.c Andersen, et al. Experimental [Page 97] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5488,7 +5488,7 @@ A.11. createCB.h Andersen, et al. Experimental [Page 98] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5544,7 +5544,7 @@ A.12. createCB.c Andersen, et al. Experimental [Page 99] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5600,7 +5600,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 100] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5656,7 +5656,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 101] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5712,7 +5712,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 102] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5768,7 +5768,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 103] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5824,7 +5824,7 @@ A.14. doCPLC.c Andersen, et al. Experimental [Page 104] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5880,7 +5880,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 105] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5936,7 +5936,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 106] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -5992,7 +5992,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 107] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6048,7 +6048,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 108] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6104,7 +6104,7 @@ A.15. enhancer.h Andersen, et al. Experimental [Page 109] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6160,7 +6160,7 @@ A.16. enhancer.c Andersen, et al. Experimental [Page 110] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6216,7 +6216,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 111] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6272,7 +6272,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 112] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6328,7 +6328,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 113] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6384,7 +6384,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 114] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6440,7 +6440,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 115] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6496,7 +6496,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 116] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6552,7 +6552,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 117] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6608,7 +6608,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 118] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6664,7 +6664,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 119] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6720,7 +6720,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 120] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6776,7 +6776,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 121] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6832,7 +6832,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 122] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6888,7 +6888,7 @@ A.17. filter.h Andersen, et al. Experimental [Page 123] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -6944,7 +6944,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 124] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7000,7 +7000,7 @@ A.18. filter.c Andersen, et al. Experimental [Page 125] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7056,7 +7056,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 126] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7112,7 +7112,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 127] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7168,7 +7168,7 @@ A.19. FrameClassify.h Andersen, et al. Experimental [Page 128] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7224,7 +7224,7 @@ A.20. FrameClassify.c Andersen, et al. Experimental [Page 129] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7280,7 +7280,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 130] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7336,7 +7336,7 @@ A.22. gainquant.c Andersen, et al. Experimental [Page 131] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7392,7 +7392,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 132] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7448,7 +7448,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 133] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7504,7 +7504,7 @@ A.24. getCBvec.c Andersen, et al. Experimental [Page 134] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7560,7 +7560,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 135] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7616,7 +7616,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 136] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7672,7 +7672,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 137] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7728,7 +7728,7 @@ A.25. helpfun.h Andersen, et al. Experimental [Page 138] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7784,7 +7784,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 139] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7840,7 +7840,7 @@ A.26. helpfun.c Andersen, et al. Experimental [Page 140] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7896,7 +7896,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 141] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -7952,7 +7952,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 142] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8008,7 +8008,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 143] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8064,7 +8064,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 144] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8120,7 +8120,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 145] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8176,7 +8176,7 @@ A.28. hpInput.c Andersen, et al. Experimental [Page 146] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8232,7 +8232,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 147] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8288,7 +8288,7 @@ A.30. hpOutput.c Andersen, et al. Experimental [Page 148] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8344,7 +8344,7 @@ A.31. iCBConstruct.h Andersen, et al. Experimental [Page 149] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8400,7 +8400,7 @@ A.32. iCBConstruct.c Andersen, et al. Experimental [Page 150] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8456,7 +8456,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 151] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8512,7 +8512,7 @@ A.33. iCBSearch.h Andersen, et al. Experimental [Page 152] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8568,7 +8568,7 @@ A.34. iCBSearch.c Andersen, et al. Experimental [Page 153] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8624,7 +8624,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 154] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8680,7 +8680,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 155] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8736,7 +8736,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 156] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8792,7 +8792,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 157] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8848,7 +8848,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 158] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8904,7 +8904,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 159] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -8960,7 +8960,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 160] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9016,7 +9016,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 161] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9072,7 +9072,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 162] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9128,7 +9128,7 @@ A.35. LPCdecode.h Andersen, et al. Experimental [Page 163] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9184,7 +9184,7 @@ A.36. LPCdecode.c Andersen, et al. Experimental [Page 164] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9240,7 +9240,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 165] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9296,7 +9296,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 166] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9352,7 +9352,7 @@ A.38. LPCencode.c Andersen, et al. Experimental [Page 167] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9408,7 +9408,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 168] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9464,7 +9464,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 169] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9520,7 +9520,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 170] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9576,7 +9576,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 171] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9632,7 +9632,7 @@ A.40. lsf.c Andersen, et al. Experimental [Page 172] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9688,7 +9688,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 173] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9744,7 +9744,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 174] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9800,7 +9800,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 175] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9856,7 +9856,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 176] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9912,7 +9912,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 177] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -9968,7 +9968,7 @@ A.41. packing.h Andersen, et al. Experimental [Page 178] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10024,7 +10024,7 @@ A.42. packing.c Andersen, et al. Experimental [Page 179] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10080,7 +10080,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 180] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10136,7 +10136,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 181] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10192,7 +10192,7 @@ A.43. StateConstructW.h Andersen, et al. Experimental [Page 182] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10248,7 +10248,7 @@ A.44. StateConstructW.c Andersen, et al. Experimental [Page 183] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10304,7 +10304,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 184] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10360,7 +10360,7 @@ A.45. StateSearchW.h Andersen, et al. Experimental [Page 185] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10416,7 +10416,7 @@ A.46. StateSearchW.c Andersen, et al. Experimental [Page 186] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10472,7 +10472,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 187] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10528,7 +10528,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 188] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10584,7 +10584,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 189] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10640,7 +10640,7 @@ A.48. syntFilter.c Andersen, et al. Experimental [Page 190] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10696,7 +10696,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 191] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10752,7 +10752,7 @@ Authors' Addresses Andersen, et al. Experimental [Page 192] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10808,7 +10808,7 @@ RFC 3951 Internet Low Bit Rate Codec December 2004 Andersen, et al. Experimental [Page 193] - + RFC 3951 Internet Low Bit Rate Codec December 2004 @@ -10864,4 +10864,3 @@ Acknowledgement Andersen, et al. Experimental [Page 194] - diff --git a/codecs/ilbc/syntFilter.c b/codecs/ilbc/syntFilter.c index 190eb009db..db5bb66736 100644 --- a/codecs/ilbc/syntFilter.c +++ b/codecs/ilbc/syntFilter.c @@ -64,17 +64,3 @@ memcpy(mem, &Out[len-LPC_FILTERORDER], LPC_FILTERORDER*sizeof(float)); } - - - - - - - - - - - - - - diff --git a/codecs/ilbc/syntFilter.h b/codecs/ilbc/syntFilter.h index 8865b8917f..586ab2bd0b 100644 --- a/codecs/ilbc/syntFilter.h +++ b/codecs/ilbc/syntFilter.h @@ -21,4 +21,3 @@ ); #endif - diff --git a/codecs/log2comp.h b/codecs/log2comp.h index 6dc59c3073..aa43103cb0 100644 --- a/codecs/log2comp.h +++ b/codecs/log2comp.h @@ -1,6 +1,6 @@ -/*! \file +/*! \file * \brief log2comp.h - various base 2 log computation versions - * + * * Asterisk -- An open source telephony toolkit. * * \author Alex Volkov @@ -53,8 +53,8 @@ static inline int ilog2(int val) static inline int ilog2(int val) { int a; - __asm__ ("cntlzw %0,%1" - : "=r" (a) + __asm__ ("cntlzw %0,%1" + : "=r" (a) : "r" (val) ); return 31-a; diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index b414fd77d7..04b106b665 100644 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -1,25 +1,25 @@ -# +# # Makefile for LPC-10 speech coder library (unix) -# +# # default C compiler CC?= gcc -# +# # These definitions for CFLAGS and LIB_TARGET_DIR are used when one # runs make in the lpc10 directory, without environment variables that # override them. When make is run in this directory from a makefile # for an application that uses the LPC10 coder, there are environment # variables set for CFLAGS and LIB_TARGET_DIR that override these # definitions. -# +# LIB_TARGET_DIR = . -# +# # -I$(LIB_TARGET_DIR) option needed so that #include "machine.h" # directives can find the machine.h file. -# +# CFLAGS+= -fPIC -Wno-comment diff --git a/codecs/lpc10/analys.c b/codecs/lpc10/analys.c index 50e95703df..5ea0a2d397 100644 --- a/codecs/lpc10/analys.c +++ b/codecs/lpc10/analys.c @@ -203,7 +203,7 @@ static integer c__1 = 1; /* This entry has no local state. It accesses a "constant" array */ /* declared in ANALYS. */ -/* Subroutine */ int analys_(real *speech, integer *voice, integer +/* Subroutine */ int analys_(real *speech, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_encoder_state *st) { /* Initialized data */ @@ -243,8 +243,8 @@ static integer c__1 = 1; extern int dcbias_(integer *, real *, real *); integer ipitch; integer *obound; - extern /* Subroutine */ int preemp_(real *, real *, integer *, real *, - real *), voicin_(integer *, real *, real *, integer *, integer *, + extern /* Subroutine */ int preemp_(real *, real *, integer *, real *, + real *), voicin_(integer *, real *, real *, integer *, integer *, real *, real *, integer *, real *, integer *, integer *, integer *, struct lpc10_encoder_state *); integer *voibuf; @@ -252,10 +252,10 @@ static integer c__1 = 1; real *rmsbuf; extern /* Subroutine */ int lpfilt_(real *, real *, integer *, integer *), ivfilt_(real *, real *, integer *, integer *, real *), energy_( - integer *, real *, real *), invert_(integer *, real *, real *, + integer *, real *, real *), invert_(integer *, real *, real *, real *); integer minptr, maxptr; - extern /* Subroutine */ int dyptrk_(real *, integer *, integer *, integer + extern /* Subroutine */ int dyptrk_(real *, integer *, integer *, integer *, integer *, integer *, struct lpc10_encoder_state *); real phi[100] /* was [10][10] */, psi[10]; @@ -355,13 +355,13 @@ static integer c__1 = 1; /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -371,35 +371,35 @@ static integer c__1 = 1; /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -426,7 +426,7 @@ static integer c__1 = 1; /* The tables TAU and BUFLIM, and the variable PRECOEF, are not */ /* Fortran PARAMETER's, but they are initialized with DATA */ /* statements, and never modified. Thus, they need not have SAVE */ -/* statements for them to keep their values from one invocation to +/* statements for them to keep their values from one invocation to */ /* the next. */ /* Local variables that need not be saved */ @@ -512,13 +512,13 @@ static integer c__1 = 1; vwin[(i__ << 1) - 1] = vwin[((i__ + 1) << 1) - 1] - contrl_1.lframe; awin[(i__ << 1) - 2] = awin[((i__ + 1) << 1) - 2] - contrl_1.lframe; awin[(i__ << 1) - 1] = awin[((i__ + 1) << 1) - 1] - contrl_1.lframe; -/* EWIN(*,J) is unused for J .NE. AF, so the following shift is +/* EWIN(*,J) is unused for J .NE. AF, so the following shift is */ /* unnecessary. It also causes error messages when the C versio n */ -/* of the code created from this by f2c is run with Purify. It +/* of the code created from this by f2c is run with Purify. It */ -/* correctly complains that uninitialized memory is being read. +/* correctly complains that uninitialized memory is being read. */ /* EWIN(1,I) = EWIN(1,I+1) - LFRAME */ /* EWIN(2,I) = EWIN(2,I+1) - LFRAME */ @@ -533,17 +533,17 @@ n */ } /* Copy input speech, scale to sign+12 bit integers */ /* Remove long term DC bias. */ -/* If the average value in the frame was over 1/4096 (after current +/* If the average value in the frame was over 1/4096 (after current */ /* BIAS correction), then subtract that much more from samples in */ /* next frame. If the average value in the frame was under */ -/* -1/4096, add 1/4096 more to samples in next frame. In all other +/* -1/4096, add 1/4096 more to samples in next frame. In all other */ /* cases, keep BIAS the same. */ temp = 0.f; i__1 = contrl_1.lframe; for (i__ = 1; i__ <= i__1; ++i__) { - inbuf[720 - contrl_1.lframe + i__ - 181] = speech[i__] * 4096.f - + inbuf[720 - contrl_1.lframe + i__ - 181] = speech[i__] * 4096.f - (*bias); temp += inbuf[720 - contrl_1.lframe + i__ - 181]; } @@ -555,7 +555,7 @@ n */ } /* Place Voicing Window */ i__ = 721 - contrl_1.lframe; - preemp_(&inbuf[i__ - 181], &pebuf[i__ - 181], &contrl_1.lframe, &precoef, + preemp_(&inbuf[i__ - 181], &pebuf[i__ - 181], &contrl_1.lframe, &precoef, zpre); onset_(pebuf, osbuf, osptr, &c__10, &c__181, &c__720, &contrl_1.lframe, st); @@ -563,39 +563,39 @@ n */ /* MAXOSP = MAX( MAXOSP, OSPTR ) */ - placev_(osbuf, osptr, &c__10, &obound[2], vwin, &c__3, &contrl_1.lframe, + placev_(osbuf, osptr, &c__10, &obound[2], vwin, &c__3, &contrl_1.lframe, &c__90, &c__156, &c__307, &c__462); -/* The Pitch Extraction algorithm estimates the pitch for a frame +/* The Pitch Extraction algorithm estimates the pitch for a frame */ /* of speech by locating the minimum of the average magnitude difference */ /* function (AMDF). The AMDF operates on low-pass, inverse filtered */ -/* speech. (The low-pass filter is an 800 Hz, 19 tap, equiripple, FIR +/* speech. (The low-pass filter is an 800 Hz, 19 tap, equiripple, FIR */ -/* filter and the inverse filter is a 2nd-order LPC filter.) The pitch +/* filter and the inverse filter is a 2nd-order LPC filter.) The pitch */ -/* estimate is later refined by dynamic programming (DYPTRK). However, +/* estimate is later refined by dynamic programming (DYPTRK). However, */ /* since some of DYPTRK's parameters are a function of the voicing */ /* decisions, a voicing decision must precede the final pitch estimation. */ /* See subroutines LPFILT, IVFILT, and TBDM. */ /* LPFILT reads indices LBUFH-LFRAME-29 = 511 through LBUFH = 720 */ -/* of INBUF, and writes indices LBUFH+1-LFRAME = 541 through LBUFH +/* of INBUF, and writes indices LBUFH+1-LFRAME = 541 through LBUFH */ /* = 720 of LPBUF. */ lpfilt_(&inbuf[228], &lpbuf[384], &c__312, &contrl_1.lframe); -/* IVFILT reads indices (PWINH-LFRAME-7) = 353 through PWINH = 540 +/* IVFILT reads indices (PWINH-LFRAME-7) = 353 through PWINH = 540 */ /* of LPBUF, and writes indices (PWINH-LFRAME+1) = 361 through */ /* PWINH = 540 of IVBUF. */ ivfilt_(&lpbuf[204], ivbuf, &c__312, &contrl_1.lframe, ivrc); /* TBDM reads indices PWINL = 229 through */ -/* (PWINL-1)+MAXWIN+(TAU(LTAU)-TAU(1))/2 = 452 of IVBUF, and writes +/* (PWINL-1)+MAXWIN+(TAU(LTAU)-TAU(1))/2 = 452 of IVBUF, and writes */ /* indices 1 through LTAU = 60 of AMDF. */ tbdm_(ivbuf, &c__156, tau, &c__60, amdf, &minptr, &maxptr, &mintau); -/* Voicing decisions are made for each half frame of input speech. +/* Voicing decisions are made for each half frame of input speech. */ /* An initial voicing classification is made for each half of the */ /* analysis frame, and the voicing decisions for the present frame */ @@ -605,9 +605,9 @@ n */ /* maximum-to-minimum ratio, the zero crossing rate, energy measures, */ /* reflection coefficients, and prediction gains. */ /* The pitch and voicing rules apply smoothing and isolated */ -/* corrections to the pitch and voicing estimates and, in the process, +/* corrections to the pitch and voicing estimates and, in the process, */ -/* introduce two frames of delay into the corrected pitch estimates and +/* introduce two frames of delay into the corrected pitch estimates and */ /* voicing decisions. */ for (half = 1; half <= 2; ++half) { diff --git a/codecs/lpc10/bsynz.c b/codecs/lpc10/bsynz.c index daf9105d66..de43b43d65 100644 --- a/codecs/lpc10/bsynz.c +++ b/codecs/lpc10/bsynz.c @@ -119,7 +119,7 @@ extern struct { /* reinitialize its state for any other reason, call the ENTRY */ /* INITBSYNZ. */ -/* Subroutine */ int bsynz_(real *coef, integer *ip, integer *iv, +/* Subroutine */ int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st) { @@ -245,13 +245,13 @@ extern struct { /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -261,35 +261,35 @@ extern struct { /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -301,11 +301,11 @@ extern struct { /* common /contrl/ nframe, nunsfm, iclip, maxosp, listl, lincnt */ /* Function return value definitions */ /* Parameters/constants */ -/* KEXC is not a Fortran PARAMETER, but it is an array initialized +/* KEXC is not a Fortran PARAMETER, but it is an array initialized */ /* with a DATA statement that is never modified. */ /* Local variables that need not be saved */ -/* NOISE is declared with range (1:MAXPIT+MAXORD), but only indices +/* NOISE is declared with range (1:MAXPIT+MAXORD), but only indices */ /* ORDER+1 through ORDER+IP are ever used, and I think that IP */ /* .LE. MAXPIT. Why not declare it to be in the range (1:MAXPIT) */ @@ -357,7 +357,7 @@ extern struct { /* Impulse doublet excitation for plosives */ /* (RANDOM()+32768) is in the range 0 to 2**16-1. Therefore the */ -/* following expression should be evaluated using integers with +/* following expression should be evaluated using integers with at */ /* least 32 bits (16 isn't enough), and PX should be in the rang e */ diff --git a/codecs/lpc10/chanwr.c b/codecs/lpc10/chanwr.c index b7a9c722ed..280cd68935 100644 --- a/codecs/lpc10/chanwr.c +++ b/codecs/lpc10/chanwr.c @@ -129,7 +129,7 @@ Some OSS fixes and a few lpc changes to make it actually work /* R5-1, R6-1, R7-2, R9-0, P-5, */ /* R5-2, R6-2,R10-1, R8-2, P-6, R9-1, */ /* R5-3, R6-3, R7-3, R9-2, R8-3, SYNC */ -/* Subroutine */ int chanwr_0_(int n__, integer *order, integer *ipitv, +/* Subroutine */ int chanwr_0_(int n__, integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st) { @@ -150,7 +150,7 @@ Some OSS fixes and a few lpc changes to make it actually work /* Arguments */ /* Parameters/constants */ /* These arrays are not Fortran PARAMETER's, but they are defined */ -/* by DATA statements below, and their contents are never altered. +/* by DATA statements below, and their contents are never altered. */ /* Local variables that need not be saved */ /* Local state */ @@ -220,13 +220,13 @@ L_chanrd: return 0; } /* chanwr_ */ -/* Subroutine */ int chanwr_(integer *order, integer *ipitv, integer *irms, +/* Subroutine */ int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st) { return chanwr_0_(0, order, ipitv, irms, irc, ibits, st); } -/* Subroutine */ int chanrd_(integer *order, integer *ipitv, integer *irms, +/* Subroutine */ int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits) { return chanwr_0_(1, order, ipitv, irms, irc, ibits, NULL); diff --git a/codecs/lpc10/dcbias.c b/codecs/lpc10/dcbias.c index d5a7d644fc..2fb07cf2b9 100644 --- a/codecs/lpc10/dcbias.c +++ b/codecs/lpc10/dcbias.c @@ -104,4 +104,3 @@ extern int dcbias_(integer *len, real *speech, real *sigout); } return 0; } /* dcbias_ */ - diff --git a/codecs/lpc10/decode.c b/codecs/lpc10/decode.c index 08b8b91924..d58cd08747 100644 --- a/codecs/lpc10/decode.c +++ b/codecs/lpc10/decode.c @@ -67,7 +67,7 @@ static integer c__2 = 2; * * Revision 1.15 2003/09/19 01:20:22 markster * Code cleanups (bug #66) - * + * * Revision 1.2 2003/09/19 01:20:22 markster * Code cleanups (bug #66) * @@ -144,7 +144,7 @@ static integer c__2 = 2; /* reinitialize its state for any other reason, call the ENTRY */ /* INITDECODE. */ -/* Subroutine */ int decode_(integer *ipitv, integer *irms, +/* Subroutine */ int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st) { @@ -301,13 +301,13 @@ static integer c__2 = 2; /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -317,35 +317,35 @@ static integer c__2 = 2; /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -379,9 +379,9 @@ static integer c__2 = 2; /* The following are used regardless of CORRP's value */ /* The following are used only if CORRP is .TRUE. */ /* I am guessing the initial values for IVP2H, IOVOIC, DRC, DPIT, */ -/* and DRMS. They should be checked to see if they are reasonable. +/* and DRMS. They should be checked to see if they are reasonable. */ -/* I'm also guessing for ERATE, but I think 0 is the right initial +/* I'm also guessing for ERATE, but I think 0 is the right initial */ /* value. */ /* Parameter adjustments */ @@ -474,7 +474,7 @@ static integer c__2 = 2; if (*first) { *first = FALSE_; /* Assign PITCH a "default" value on the first call, since */ -/* otherwise it would be left uninitialized. The two lines +/* otherwise it would be left uninitialized. The two lines */ /* below were copied from above, since it seemed like a */ /* reasonable thing to do for the first call. */ @@ -535,7 +535,7 @@ static integer c__2 = 2; *pitch = dpit[1]; /* If bit 2 of ICORF is set then smooth RMS and RC's, */ if ((icorf & bit[1]) != 0) { - if ((i__1 = drms[1] - drms[0], (real) abs(i__1)) >= corth[ixcor + 3] + if ((i__1 = drms[1] - drms[0], (real) abs(i__1)) >= corth[ixcor + 3] && (i__2 = drms[1] - drms[2], (real) abs(i__2)) >= corth[ ixcor + 3]) { *irms = median_(&drms[2], &drms[1], drms); @@ -552,7 +552,7 @@ static integer c__2 = 2; } /* If bit 3 of ICORF is set then smooth pitch */ if ((icorf & bit[2]) != 0) { - if ((i__1 = dpit[1] - dpit[0], (real) abs(i__1)) >= corth[ixcor - 1] + if ((i__1 = dpit[1] - dpit[0], (real) abs(i__1)) >= corth[ixcor - 1] && (i__2 = dpit[1] - dpit[2], (real) abs(i__2)) >= corth[ ixcor - 1]) { *pitch = median_(&dpit[2], &dpit[1], dpit); diff --git a/codecs/lpc10/difmag.c b/codecs/lpc10/difmag.c index ab59e8c9a4..5132f96e98 100644 --- a/codecs/lpc10/difmag.c +++ b/codecs/lpc10/difmag.c @@ -87,7 +87,7 @@ extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, in /* This subroutine has no local state. */ -/* Subroutine */ int difmag_(real *speech, integer *lpita, integer *tau, +/* Subroutine */ int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, integer *maxlag, real *amdf, integer *minptr, integer * maxptr) { @@ -130,4 +130,3 @@ extern int difmag_(real *speech, integer *lpita, integer *tau, integer *ltau, in } return 0; } /* difmag_ */ - diff --git a/codecs/lpc10/dyptrk.c b/codecs/lpc10/dyptrk.c index 45fb5eb084..ca195b601a 100644 --- a/codecs/lpc10/dyptrk.c +++ b/codecs/lpc10/dyptrk.c @@ -200,13 +200,13 @@ extern struct { /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -216,35 +216,35 @@ extern struct { /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -260,7 +260,7 @@ extern struct { /* removed. */ /* Local state */ /* It would be a bit more "general" to define S(LTAU), if Fortran */ -/* allows the argument of a function to be used as the dimension of +/* allows the argument of a function to be used as the dimension of */ /* a local array variable. */ /* IPOINT is always in the range 0 to DEPTH-1. */ @@ -272,16 +272,16 @@ extern struct { /* initial values (all indices of P with second index equal to */ /* IPTR are all written before being read in this subroutine). */ -/* From examining the code carefully, it appears that all of these +/* From examining the code carefully, it appears that all of these */ /* should be saved from one invocation to the next. */ /* I've run lpcsim with the "-l 6" option to see all of the */ /* debugging information that is printed out by this subroutine */ /* below, and it appears that S, P, IPOINT, and ALPHAX are all */ -/* initialized to 0 (these initial values would likely be different +/* initialized to 0 (these initial values would likely be different */ -/* on different platforms, compilers, etc.). Given that the output +/* on different platforms, compilers, etc.). Given that the output */ /* of the coder sounds reasonable, I'm going to initialize these */ /* variables to 0 explicitly. */ @@ -299,9 +299,9 @@ extern struct { /* Function Body */ -/* Calculate the confidence factor ALPHA, used as a threshold slope in +/* Calculate the confidence factor ALPHA, used as a threshold slope in */ -/* SEESAW. If unvoiced, set high slope so that every point in P array +/* SEESAW. If unvoiced, set high slope so that every point in P array */ /* is marked as a potential pitch frequency. A scaled up version (ALPHAX )*/ @@ -391,11 +391,11 @@ n*/ *pitch = p[*pitch + j * 60 - 61]; } -/* The following statement subtracts one from IPOINT, mod DEPTH. I +/* The following statement subtracts one from IPOINT, mod DEPTH. I */ -/* think the author chose to add DEPTH-1, instead of subtracting 1, +/* think the author chose to add DEPTH-1, instead of subtracting 1, */ -/* because then it will work even if MOD doesn't work as desired on +/* because then it will work even if MOD doesn't work as desired on */ /* negative arguments. */ diff --git a/codecs/lpc10/encode.c b/codecs/lpc10/encode.c index b81799f6be..f7b47762d4 100644 --- a/codecs/lpc10/encode.c +++ b/codecs/lpc10/encode.c @@ -213,13 +213,13 @@ static integer c__2 = 2; /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -229,35 +229,35 @@ static integer c__2 = 2; /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -269,7 +269,7 @@ static integer c__2 = 2; /* common /contrl/ nframe, nunsfm, iclip, maxosp, listl, lincnt */ /* Parameters/constants */ /* These arrays are not Fortran PARAMETER's, but they are defined */ -/* by DATA statements below, and their contents are never altered. +/* by DATA statements below, and their contents are never altered. */ /* Local variables that need not be saved */ /* Parameter adjustments */ @@ -370,4 +370,3 @@ static integer c__2 = 2; /* 801 FORMAT(1X,'<>',T32,2I3,I6,I5,T50,10I8) */ return 0; } /* encode_ */ - diff --git a/codecs/lpc10/energy.c b/codecs/lpc10/energy.c index eada04befc..eba35d89fe 100644 --- a/codecs/lpc10/energy.c +++ b/codecs/lpc10/energy.c @@ -100,4 +100,3 @@ extern int energy_(integer *len, real *speech, real *rms); *rms = (real)sqrt(*rms / *len); return 0; } /* energy_ */ - diff --git a/codecs/lpc10/f2c.h b/codecs/lpc10/f2c.h index e50d642e0a..09bc757272 100644 --- a/codecs/lpc10/f2c.h +++ b/codecs/lpc10/f2c.h @@ -267,18 +267,18 @@ extern integer i_nint(real *x); #endif #ifdef P_R_O_T_O_T_Y_P_E_S -extern int bsynz_(real *coef, integer *ip, integer *iv, +extern int bsynz_(real *coef, integer *ip, integer *iv, real *sout, real *rms, real *ratio, real *g2pass, struct lpc10_decoder_state *st); extern int chanwr_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st); extern int chanrd_(integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits); -extern int chanwr_0_(int n__, integer *order, integer *ipitv, +extern int chanwr_0_(int n__, integer *order, integer *ipitv, integer *irms, integer *irc, integer *ibits, struct lpc10_encoder_state *st); extern int dcbias_(integer *len, real *speech, real *sigout); -extern int decode_(integer *ipitv, integer *irms, integer *irc, +extern int decode_(integer *ipitv, integer *irms, integer *irc, integer *voice, integer *pitch, real *rms, real *rc, struct lpc10_decoder_state *st); extern int deemp_(real *x, integer *n, struct lpc10_decoder_state *st); diff --git a/codecs/lpc10/ham84.c b/codecs/lpc10/ham84.c index fddd8f3c09..6fb1301cb0 100644 --- a/codecs/lpc10/ham84.c +++ b/codecs/lpc10/ham84.c @@ -123,4 +123,3 @@ extern int ham84_(integer *input, integer *output, integer *errcnt); } return 0; } /* ham84_ */ - diff --git a/codecs/lpc10/invert.c b/codecs/lpc10/invert.c index 03c27e20d1..786e4bf97d 100644 --- a/codecs/lpc10/invert.c +++ b/codecs/lpc10/invert.c @@ -191,4 +191,3 @@ L100: /* END DO */ return 0; } /* invert_ */ - diff --git a/codecs/lpc10/irc2pc.c b/codecs/lpc10/irc2pc.c index b96ff0d66d..dc3358b422 100644 --- a/codecs/lpc10/irc2pc.c +++ b/codecs/lpc10/irc2pc.c @@ -148,4 +148,3 @@ extern int irc2pc_(real *rc, real *pc, integer *order, real *gprime, real *g2pas } return 0; } /* irc2pc_ */ - diff --git a/codecs/lpc10/ivfilt.c b/codecs/lpc10/ivfilt.c index 784de2571d..7a0bf60361 100644 --- a/codecs/lpc10/ivfilt.c +++ b/codecs/lpc10/ivfilt.c @@ -133,4 +133,3 @@ extern int ivfilt_(real *lpbuf, real *ivbuf, integer *len, integer *nsamp, real } return 0; } /* ivfilt_ */ - diff --git a/codecs/lpc10/lpc10.h b/codecs/lpc10/lpc10.h index a57f84f3fe..82e7b2cbac 100644 --- a/codecs/lpc10/lpc10.h +++ b/codecs/lpc10/lpc10.h @@ -87,7 +87,7 @@ struct lpc10_encoder_state { real z21; real z12; real z22; - + /* State used by function analys */ real inbuf[540], pebuf[540]; real lpbuf[696], ivbuf[312]; @@ -242,7 +242,7 @@ struct lpc10_decoder_state { (indices 0 through (LPC10_BITS_IN_COMPRESSED_FRAME-1)), and the array speech[] is written (indices 0 through (LPC10_SAMPLES_PER_FRAME-1)). - + */ struct lpc10_encoder_state * create_lpc10_encoder_state (void); diff --git a/codecs/lpc10/lpcdec.c b/codecs/lpc10/lpcdec.c index dd859ffcef..55f8892b60 100644 --- a/codecs/lpc10/lpcdec.c +++ b/codecs/lpc10/lpcdec.c @@ -114,11 +114,11 @@ static integer c__10 = 10; struct lpc10_decoder_state *st) { integer irms, voice[2], pitch, ipitv; - extern /* Subroutine */ int decode_(integer *, integer *, integer *, + extern /* Subroutine */ int decode_(integer *, integer *, integer *, integer *, integer *, real *, real *, struct lpc10_decoder_state *); real rc[10]; - extern /* Subroutine */ int chanrd_(integer *, integer *, integer *, - integer *, integer *), synths_(integer *, + extern /* Subroutine */ int chanrd_(integer *, integer *, integer *, + integer *, integer *), synths_(integer *, integer *, real *, real *, real *, integer *, struct lpc10_decoder_state *); integer irc[10], len; @@ -220,13 +220,13 @@ static integer c__10 = 10; /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -236,35 +236,35 @@ static integer c__10 = 10; /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ diff --git a/codecs/lpc10/lpcenc.c b/codecs/lpc10/lpcenc.c index 989a2defdd..990e731786 100644 --- a/codecs/lpc10/lpcenc.c +++ b/codecs/lpc10/lpcenc.c @@ -110,10 +110,10 @@ static integer c__10 = 10; { integer irms, voice[2], pitch, ipitv; real rc[10]; - extern /* Subroutine */ int encode_(integer *, integer *, real *, real *, - integer *, integer *, integer *), chanwr_(integer *, integer *, + extern /* Subroutine */ int encode_(integer *, integer *, real *, real *, + integer *, integer *, integer *), chanwr_(integer *, integer *, integer *, integer *, integer *, struct lpc10_encoder_state *), - analys_(real *, integer *, + analys_(real *, integer *, integer *, real *, real *, struct lpc10_encoder_state *), prepro_(real *, integer *, struct lpc10_encoder_state *); integer irc[10]; @@ -126,7 +126,7 @@ static integer c__10 = 10; * * Revision 1.14 2003/02/12 13:59:15 matteo * mer feb 12 14:56:57 CET 2003 - * + * * Revision 1.1.1.1 2003/02/12 13:59:15 matteo * mer feb 12 14:56:57 CET 2003 * diff --git a/codecs/lpc10/lpcini.c b/codecs/lpc10/lpcini.c index ea68176e3d..ced34980f8 100644 --- a/codecs/lpc10/lpcini.c +++ b/codecs/lpc10/lpcini.c @@ -187,13 +187,13 @@ struct { /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -203,35 +203,35 @@ struct { /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -280,7 +280,7 @@ void init_lpc10_encoder_state(struct lpc10_encoder_state *st) st->z21 = 0.0f; st->z12 = 0.0f; st->z22 = 0.0f; - + /* State used by function analys */ for (i = 0; i < 540; i++) { st->inbuf[i] = 0.0f; diff --git a/codecs/lpc10/lpfilt.c b/codecs/lpc10/lpfilt.c index 3755289211..159b2d7d99 100644 --- a/codecs/lpc10/lpfilt.c +++ b/codecs/lpc10/lpfilt.c @@ -122,4 +122,3 @@ extern int lpfilt_(real *inbuf, real *lpbuf, integer *len, integer *nsamp); } return 0; } /* lpfilt_ */ - diff --git a/codecs/lpc10/median.c b/codecs/lpc10/median.c index 383c46e894..52c4a78d08 100644 --- a/codecs/lpc10/median.c +++ b/codecs/lpc10/median.c @@ -86,4 +86,3 @@ integer median_(integer *d1, integer *d2, integer *d3) } return ret_val; } /* median_ */ - diff --git a/codecs/lpc10/mload.c b/codecs/lpc10/mload.c index 1cdb0647c0..e384f0d77c 100644 --- a/codecs/lpc10/mload.c +++ b/codecs/lpc10/mload.c @@ -96,7 +96,7 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, /* This subroutine has no local state. */ -/* Subroutine */ int mload_(integer *order, integer *awins, integer *awinf, +/* Subroutine */ int mload_(integer *order, integer *awins, integer *awinf, real *speech, real *phi, real *psi) { /* System generated locals */ @@ -136,21 +136,21 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, for (r__ = 2; r__ <= i__1; ++r__) { i__2 = r__; for (c__ = 2; c__ <= i__2; ++c__) { - phi[r__ + c__ * phi_dim1] = phi[r__ - 1 + (c__ - 1) * phi_dim1] - - speech[*awinf + 1 - r__] * speech[*awinf + 1 - c__] + + phi[r__ + c__ * phi_dim1] = phi[r__ - 1 + (c__ - 1) * phi_dim1] - + speech[*awinf + 1 - r__] * speech[*awinf + 1 - c__] + speech[start - r__] * speech[start - c__]; } } /* End correct to get additional elements of PSI */ i__1 = *order - 1; for (c__ = 1; c__ <= i__1; ++c__) { - psi[c__] = phi[c__ + 1 + phi_dim1] - speech[start - 1] * speech[start + psi[c__] = phi[c__ + 1 + phi_dim1] - speech[start - 1] * speech[start - 1 - c__] + speech[*awinf] * speech[*awinf - c__]; } /* Copy lower triangular section into upper (why bother?) */ -/* I'm commenting this out, since the upper triangular half of PHI +/* I'm commenting this out, since the upper triangular half of PHI */ -/* is never used by later code, unless a sufficiently high level of +/* is never used by later code, unless a sufficiently high level of */ /* tracing is turned on. */ /* DO R = 1,ORDER */ @@ -160,4 +160,3 @@ extern int mload_(integer *order, integer *awins, integer *awinf, real *speech, /* END DO */ return 0; } /* mload_ */ - diff --git a/codecs/lpc10/onset.c b/codecs/lpc10/onset.c index ddca3b477c..b4469c16a5 100644 --- a/codecs/lpc10/onset.c +++ b/codecs/lpc10/onset.c @@ -203,35 +203,35 @@ static real c_b2 = 1.f; /* N, D Numerator and denominator of prediction filters */ /* FPC Current prediction coefs */ /* L2BUF, L2SUM1, L2SUM2 State of slope filter */ -/* The only "significant" change I've made is to change L2SUM2 out +/* The only "significant" change I've made is to change L2SUM2 out */ /* of the list of local variables that need to be saved, since it */ /* didn't need to be. */ -/* L2SUM1 need not be, but avoiding saving it would require a small +/* L2SUM1 need not be, but avoiding saving it would require a small */ /* change to the body of the code. See comments below for an */ -/* example of how the code could be changed to avoid saving L2SUM1. +/* example of how the code could be changed to avoid saving L2SUM1. */ /* FPC and LASTI are saved from one invocation to the next, but */ -/* they are not given initial values. This is acceptable, because +/* they are not given initial values. This is acceptable, because */ /* FPC will be assigned a value the first time that this function */ /* is called after D is initialized to 1, since the formula to */ /* change D will not change it to 0 in one step, and the IF (D */ -/* .NE. 0) statement will execute its THEN part, initializing FPC. +/* .NE. 0) statement will execute its THEN part, initializing FPC. */ /* LASTI's value will not be used until HYST is .TRUE., and */ /* whenever HYST is changed from its initial value of .FALSE., */ /* LASTI is assigned a value. */ /* In a C version of this coder, it would be nice if all of these */ -/* saved things, in this and all other subroutines, could be stored +/* saved things, in this and all other subroutines, could be stored */ -/* in a single struct lpc10_coder_state_t, initialized with a call +/* in a single struct lpc10_coder_state_t, initialized with a call */ -/* to a function like lpc10_init(&lpc10_coder_state). In this way, +/* to a function like lpc10_init(&lpc10_coder_state). In this way, */ -/* a program that used these functions could conveniently alternate +/* a program that used these functions could conveniently alternate */ /* coding more than one distinct audio stream. */ @@ -264,7 +264,7 @@ static real c_b2 = 1.f; } i__1 = *sbufh; for (i__ = *sbufh - *lframe + 1; i__ <= i__1; ++i__) { -/* Compute FPC; Use old FPC on divide by zero; Clamp FPC to +/- 1. +/* Compute FPC; Use old FPC on divide by zero; Clamp FPC to +/- 1. */ *n = (pebuf[i__] * pebuf[i__ - 1] + (*n) * 63.f) / 64.f; /* Computing 2nd power */ @@ -278,11 +278,11 @@ static real c_b2 = 1.f; } } /* Filter FPC */ -/* In order to allow L2SUM1 not to be saved from one invocation +/* In order to allow L2SUM1 not to be saved from one invocation of */ /* this subroutine to the next, one could change the sequence of */ -/* assignments below, up to the IF statement, to the following. +/* assignments below, up to the IF statement, to the following. In */ /* addition, the initial value of L2PTR2 should be changed to */ /* L2WID/2 instead of L2WID/2+1. */ diff --git a/codecs/lpc10/pitsyn.c b/codecs/lpc10/pitsyn.c index 36f6f2a7af..e345fba108 100644 --- a/codecs/lpc10/pitsyn.c +++ b/codecs/lpc10/pitsyn.c @@ -129,8 +129,8 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re /* RATIO - Previous to present energy ratio */ /* Always assigned a value. */ -/* Subroutine */ int pitsyn_(integer *order, integer *voice, - integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, +/* Subroutine */ int pitsyn_(integer *order, integer *voice, + integer *pitch, real *rms, real *rc, integer *lframe, integer *ivuv, integer *ipiti, real *rmsi, real *rci, integer *nout, real *ratio, struct lpc10_decoder_state *st) { @@ -201,7 +201,7 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re /* Frame size, Prediction order, Pitch period */ /* Local variables that need not be saved */ /* LSAMP is initialized in the IF (FIRST) THEN clause, but it is */ -/* not used the first time through, and it is given a value before +/* not used the first time through, and it is given a value before */ /* use whenever FIRST is .FALSE., so it appears unnecessary to */ /* assign it a value when FIRST is .TRUE. */ @@ -214,12 +214,12 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re /* JSAMP - If this routine is called N times with identical values of */ /* LFRAME, then the total length of all pitch periods returned */ -/* is always N*LFRAME-JSAMP, and JSAMP is always in the range 0 +/* is always N*LFRAME-JSAMP, and JSAMP is always in the range 0 */ /* to MAXPIT-1 (see below for why this is so). Thus JSAMP is */ /* the number of samples "left over" from the previous call to */ /* PITSYN, that haven't been "used" in a pitch period returned */ -/* from this subroutine. Every time this subroutine is called, +/* from this subroutine. Every time this subroutine is called, */ /* it returns pitch periods with a total length of at most */ /* LFRAME+JSAMP. */ @@ -277,7 +277,7 @@ extern int pitsyn_(integer *order, integer *voice, integer *pitch, real *rms, re *nout = *lframe / *pitch; *jsamp = *lframe - *nout * *pitch; -/* SYNTHS only calls this subroutine with PITCH in the range +/* SYNTHS only calls this subroutine with PITCH in the range 20 */ /* to 156. LFRAME = MAXFRM = 180, so NOUT is somewhere in th e */ @@ -361,7 +361,7 @@ e */ vflag = 1; } } -/* Here is the value of most variables that are used below, depending +/* Here is the value of most variables that are used below, depending on */ /* the values of IVOICO, VOICE(1), and VOICE(2). VOICE(1) and VOICE(2 ) */ @@ -369,11 +369,11 @@ on */ /* previous call (see notes for the IF (NOUT .NE. 0) statement near th e */ /* end). Each of these three values is either 0 or 1. These three */ -/* values below are given as 3-bit long strings, in the order IVOICO, +/* values below are given as 3-bit long strings, in the order IVOICO, */ /* VOICE(1), and VOICE(2). It appears that the code above assumes tha t */ -/* the bit sequences 010 and 101 never occur, but I wonder whether a +/* the bit sequences 010 and 101 never occur, but I wonder whether a */ /* large enough number of bit errors in the channel could cause such a */ @@ -390,7 +390,7 @@ t */ 4, */ /* and the 45 for NL-JSAMP is actually LFRAME-3*LFRAME/4. */ -/* Note that LSAMP-JSAMP is given as the variable. This was just for +/* Note that LSAMP-JSAMP is given as the variable. This was just for */ /* brevity, to avoid adding "+JSAMP" to all of the column entries. */ /* Similarly for NL-JSAMP. */ @@ -429,13 +429,13 @@ t */ /* The only possible non-0 value of SLOPE (in column 111) is */ /* (PITCH-IPITO)/FLOAT(LSAMP) */ -/* Column 101 is identical to 100. Any good properties we can prove +/* Column 101 is identical to 100. Any good properties we can prove */ /* for 100 will also hold for 101. Similarly for 010 and 011. */ -/* SYNTHS calls this subroutine with PITCH restricted to the range 20 +/* SYNTHS calls this subroutine with PITCH restricted to the range 20 to */ -/* 156. IPITO is similarly restricted to this range, after the first +/* 156. IPITO is similarly restricted to this range, after the first */ /* call. IP below is also restricted to this range, given the */ /* definitions of IPITO, SLOPE, UVPIT, and that I is in the range ISTA @@ -456,7 +456,7 @@ ugh */ /* (I - MAXPIT) .LE. JUSED .LE. (I-1) */ -/* Note that the final value of I is LSAMP+1, so that +/* Note that the final value of I is LSAMP+1, so that after */ /* the DO loop is complete, we know: */ @@ -474,10 +474,10 @@ after */ /* The following check is no longer nece ssary, now that */ -/* we can prove that NOUT will never go +/* we can prove that NOUT will never go over 16. */ -/* IF (NOUT .GT. 16) STOP 'PITSYN: too many epochs' +/* IF (NOUT .GT. 16) STOP 'PITSYN: too many epochs' */ ipiti[*nout] = ip; @@ -501,7 +501,7 @@ over 16. */ goto L100; } -/* I want to prove what range UVPIT must lie in after +/* I want to prove what range UVPIT must lie in after the */ /* assignments to it below. To do this, I must determ ine */ @@ -521,7 +521,7 @@ at: */ /* ISTART is one more than this. */ -/* Let newLSAMP be the value assigned to LSAMP below. +/* Let newLSAMP be the value assigned to LSAMP below. This */ /* is 180+JSAMP. Thus (newLSAMP-oldLSAMP) is either 4 5 or */ @@ -566,7 +566,7 @@ ge. */ L100: *jsamp = lsamp - jused; } -/* Given that the maximum pitch period MAXPIT .LT. LFRAME (this is +/* Given that the maximum pitch period MAXPIT .LT. LFRAME (this is */ /* currently true on every call, since SYNTHS always sets */ /* LFRAME=180), NOUT will always be .GE. 1 at this point. */ diff --git a/codecs/lpc10/placea.c b/codecs/lpc10/placea.c index dacb50e7a5..7a485c4183 100644 --- a/codecs/lpc10/placea.c +++ b/codecs/lpc10/placea.c @@ -114,7 +114,7 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* This subroutine has no local state. */ /* Subroutine */ int placea_(integer *ipitch, integer *voibuf, integer * - obound, integer *af, integer *vwin, integer *awin, integer *ewin, + obound, integer *af, integer *vwin, integer *awin, integer *ewin, integer *lframe, integer *maxwin) { /* System generated locals */ @@ -146,13 +146,13 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* Case 1: Sustained Voiced Speech */ /* If the five most recent voicing decisions are */ /* voiced, then the window is placed phase-synchronously with the */ -/* previous window, as close to the present voicing window if possible. +/* previous window, as close to the present voicing window if possible. */ /* If onsets bound the voicing window, then preference is given to */ /* a phase-synchronous placement which does not overlap these onsets. */ /* Case 2: Voiced Transition */ -/* If at least one voicing decision in AF is voicied, and there are no +/* If at least one voicing decision in AF is voicied, and there are no */ /* onsets, then the window is placed as in case 1. */ @@ -207,7 +207,7 @@ rd */ awin[(*af << 1) + 1] -= *ipitch; awin[(*af << 1) + 2] -= *ipitch; } -/* Similarly if the placement puts the analysis window below LRANGE. +/* Similarly if the placement puts the analysis window below LRANGE. */ while(awin[(*af << 1) + 1] < lrange) { awin[(*af << 1) + 1] += *ipitch; @@ -239,4 +239,3 @@ e*/ } return 0; } /* placea_ */ - diff --git a/codecs/lpc10/placev.c b/codecs/lpc10/placev.c index 56e72c4b8e..9d1548c46b 100644 --- a/codecs/lpc10/placev.c +++ b/codecs/lpc10/placev.c @@ -109,8 +109,8 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou /* This subroutine has no local state. */ -/* Subroutine */ int placev_(integer *osbuf, integer *osptr, integer *oslen, - integer *obound, integer *vwin, integer *af, integer *lframe, integer +/* Subroutine */ int placev_(integer *osbuf, integer *osptr, integer *oslen, + integer *obound, integer *vwin, integer *af, integer *lframe, integer *minwin, integer *maxwin, integer *dvwinl, integer *dvwinh) { /* System generated locals */ @@ -146,15 +146,15 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou /* given in the LPC-10e phase 1 report. */ /* 1. If there are no onsets in this range, then the voicing window */ -/* is centered in the pitch window. If such a placement is not within +/* is centered in the pitch window. If such a placement is not within */ -/* the window's placement range, then the window is placed in the left- +/* the window's placement range, then the window is placed in the left- */ /* most portion of the placement range. Its length is always MAXWIN. */ /* 2. If the first onset is in 2F and there is sufficient room to place */ -/* the window immediately before this onset, then the window is placed +/* the window immediately before this onset, then the window is placed */ /* there, and its length is set to the maximum possible under these */ /* constraints. */ @@ -177,7 +177,7 @@ ing*/ /* Note that the values of MINWIN and LFRAME must be chosen such */ /* that case 2 = false implies case 3 = true. This means that */ /* MINWIN <= LFRAME/2. If this were not the case, then a fourth case */ -/* would have to be added for when the window cannot fit either before +/* would have to be added for when the window cannot fit either before */ /* or after the onset. */ @@ -185,11 +185,11 @@ ing*/ */ /* time, due to the filter delays in computing onsets. The result is tha t*/ -/* occasionally a voicing window will overlap that onset. The only way +/* occasionally a voicing window will overlap that onset. The only way */ -/* to circumvent this problem is to add more delay in processing input +/* to circumvent this problem is to add more delay in processing input */ -/* speech. In the trade-off between delay and window-placement, window +/* speech. In the trade-off between delay and window-placement, window */ /* placement lost. */ /* Compute the placement range */ @@ -272,4 +272,3 @@ L120: } return 0; } /* placev_ */ - diff --git a/codecs/lpc10/preemp.c b/codecs/lpc10/preemp.c index 645428c3cb..61316dd5b7 100644 --- a/codecs/lpc10/preemp.c +++ b/codecs/lpc10/preemp.c @@ -110,12 +110,12 @@ extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z /* Could it be more efficient to apply multiple filters */ /* simultaneously, by combining them into one equivalent filter? */ -/* Are there ever cases when "factoring" one high-order filter into +/* Are there ever cases when "factoring" one high-order filter into */ /* multiple smaller-order filter actually reduces the number of */ /* arithmetic operations needed to perform them? */ /* When I first read this subroutine, I didn't understand why the */ -/* variable temp was used. It seemed that the statements in the do +/* variable temp was used. It seemed that the statements in the do */ /* loop could be replaced with the following: */ @@ -141,4 +141,3 @@ extern int preemp_(real *inbuf, real *pebuf, integer *nsamp, real *coef, real *z } return 0; } /* preemp_ */ - diff --git a/codecs/lpc10/random.c b/codecs/lpc10/random.c index 0f8e9b2098..dc4da2a91f 100644 --- a/codecs/lpc10/random.c +++ b/codecs/lpc10/random.c @@ -122,4 +122,3 @@ integer random_(struct lpc10_decoder_state *st) } return ret_val; } /* random_ */ - diff --git a/codecs/lpc10/rcchk.c b/codecs/lpc10/rcchk.c index 6cb76ef7d0..4cc84f381f 100644 --- a/codecs/lpc10/rcchk.c +++ b/codecs/lpc10/rcchk.c @@ -102,7 +102,7 @@ extern int rcchk_(integer *order, real *rc1f, real *rc2f); } } return 0; -/* Note: In version embedded in other software, all calls to ERROR +/* Note: In version embedded in other software, all calls to ERROR */ /* should probably be removed. */ L10: @@ -116,4 +116,3 @@ L10: } return 0; } /* rcchk_ */ - diff --git a/codecs/lpc10/synths.c b/codecs/lpc10/synths.c index 4c5a70fac5..2a3179b91b 100644 --- a/codecs/lpc10/synths.c +++ b/codecs/lpc10/synths.c @@ -187,8 +187,8 @@ static real c_b2 = .7f; integer ipiti[16]; real g2pass; real pc[10]; - extern /* Subroutine */ int pitsyn_(integer *, integer *, integer *, real - *, real *, integer *, integer *, integer *, real *, real *, + extern /* Subroutine */ int pitsyn_(integer *, integer *, integer *, real + *, real *, integer *, integer *, integer *, real *, real *, integer *, real *, struct lpc10_decoder_state *); real rci[160] /* was [10][16] */; @@ -288,13 +288,13 @@ static real c_b2 = .7f; /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -304,35 +304,35 @@ static real c_b2 = .7f; /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -345,21 +345,21 @@ static real c_b2 = .7f; /* Parameters/constants */ /* Local variables that need not be saved */ /* Local state */ -/* BUF is a buffer of speech samples that would have been returned +/* BUF is a buffer of speech samples that would have been returned */ /* by the older version of SYNTHS, but the newer version doesn't, */ /* so that the newer version can always return MAXFRM samples on */ /* every call. This has the effect of delaying the return of */ /* samples for one additional frame time. */ -/* Indices 1 through BUFLEN contain samples that are left over from +/* Indices 1 through BUFLEN contain samples that are left over from */ /* the last call to SYNTHS. Given the way that PITSYN works, */ /* BUFLEN should always be in the range MAXFRM-MAXPIT+1 through */ /* MAXFRM, inclusive, after a call to SYNTHS is complete. */ /* On the first call to SYNTHS (or the first call after */ -/* reinitializing with the entry INITSYNTHS), BUFLEN is MAXFRM, and +/* reinitializing with the entry INITSYNTHS), BUFLEN is MAXFRM, and */ /* a frame of silence is always returned. */ /* Parameter adjustments */ @@ -388,7 +388,7 @@ static real c_b2 = .7f; r__1 = min(r__2,.99f); rc[i__] = max(r__1,-.99f); } - pitsyn_(&contrl_1.order, &voice[1], pitch, rms, &rc[1], &contrl_1.lframe, + pitsyn_(&contrl_1.order, &voice[1], pitch, rms, &rc[1], &contrl_1.lframe, ivuv, ipiti, rmsi, rci, &nout, &ratio, st); if (nout > 0) { i__1 = nout; @@ -405,7 +405,7 @@ d of */ *buflen += ipiti[j - 1]; } -/* Copy first MAXFRM samples from BUF to output array SPEECH +/* Copy first MAXFRM samples from BUF to output array SPEECH */ /* (scaling them), and then remove them from the beginning of */ diff --git a/codecs/lpc10/tbdm.c b/codecs/lpc10/tbdm.c index 2f6f3d6927..4ca4d73a3d 100644 --- a/codecs/lpc10/tbdm.c +++ b/codecs/lpc10/tbdm.c @@ -91,7 +91,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real /* This subroutine has no local state. */ -/* Subroutine */ int tbdm_(real *speech, integer *lpita, integer *tau, +/* Subroutine */ int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real *amdf, integer *minptr, integer *maxptr, integer * mintau) { @@ -101,7 +101,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real /* Local variables */ real amdf2[6]; integer minp2, ltau2, maxp2, i__; - extern /* Subroutine */ int difmag_(real *, integer *, integer *, integer + extern /* Subroutine */ int difmag_(real *, integer *, integer *, integer *, integer *, real *, integer *, integer *); integer minamd, ptr, tau2[6]; @@ -118,7 +118,7 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real --tau; /* Function Body */ - difmag_(&speech[1], lpita, &tau[1], ltau, &tau[*ltau], &amdf[1], minptr, + difmag_(&speech[1], lpita, &tau[1], ltau, &tau[*ltau], &amdf[1], minptr, maxptr); *mintau = tau[*minptr]; minamd = (integer)amdf[*minptr]; @@ -185,4 +185,3 @@ extern int tbdm_(real *speech, integer *lpita, integer *tau, integer *ltau, real } return 0; } /* tbdm_ */ - diff --git a/codecs/lpc10/voicin.c b/codecs/lpc10/voicin.c index 3605d2f2e2..2d36e2c99c 100644 --- a/codecs/lpc10/voicin.c +++ b/codecs/lpc10/voicin.c @@ -256,8 +256,8 @@ s*/ /* INITVOICIN. */ /* Subroutine */ int voicin_(integer *vwin, real *inbuf, real * - lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, - integer *mintau, real *ivrc, integer *obound, integer *voibuf, + lpbuf, integer *buflim, integer *half, real *minamd, real *maxamd, + integer *mintau, real *ivrc, integer *obound, integer *voibuf, integer *af, struct lpc10_encoder_state *st) { /* Initialized data */ @@ -298,8 +298,8 @@ s*/ real *maxmin; integer vstate; real rc1; - extern /* Subroutine */ int vparms_(integer *, real *, real *, integer *, - integer *, real *, integer *, integer *, integer *, integer *, + extern /* Subroutine */ int vparms_(integer *, real *, real *, integer *, + integer *, real *, integer *, integer *, integer *, integer *, real *, real *, real *, real *); integer fbe, lbe; real *snr; @@ -363,13 +363,13 @@ s*/ /* Error correction */ /* Subroutine SETUP is the only place where order is assigned a value, */ /* and that value is 10. It could increase efficiency 1% or so to */ -/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as +/* declare order as a constant (i.e., a Fortran PARAMETER) instead of as */ /* a variable in a COMMON block, since it is used in many places in the */ -/* core of the coding and decoding routines. Actually, I take that back. +/* core of the coding and decoding routines. Actually, I take that back. */ /* At least when compiling with f2c, the upper bound of DO loops is */ -/* stored in a local variable before the DO loop begins, and then that is +/* stored in a local variable before the DO loop begins, and then that is */ /* compared against on each iteration. */ /* Similarly for lframe, which is given a value of MAXFRM in SETUP. */ @@ -379,35 +379,35 @@ s*/ /* nbits is similar to quant, and is given a value of 54 in SETUP. */ /* corrp is given a value of .TRUE. in SETUP, and is only used in the */ /* subroutines ENCODE and DECODE. It doesn't affect the speed of the */ -/* coder significantly whether it is .TRUE. or .FALSE., or whether it is +/* coder significantly whether it is .TRUE. or .FALSE., or whether it is */ /* a constant or a variable, since it is only examined once per frame. */ /* Leaving it as a variable that is set to .TRUE. seems like a good */ /* idea, since it does enable some error-correction capability for */ -/* unvoiced frames, with no change in the coding rate, and no noticeable +/* unvoiced frames, with no change in the coding rate, and no noticeable */ /* quality difference in the decoded speech. */ /* integer quant, nbits */ -/* *** Read/write: variables for debugging, not needed for LPC algorithm +/* *** Read/write: variables for debugging, not needed for LPC algorithm */ -/* Current frame, Unstable frames, Output clip count, Max onset buffer, +/* Current frame, Unstable frames, Output clip count, Max onset buffer, */ /* Debug listing detail level, Line count on listing page */ /* nframe is not needed for an embedded LPC10 at all. */ /* nunsfm is initialized to 0 in SETUP, and incremented in subroutine */ /* ERROR, which is only called from RCCHK. When LPC10 is embedded into */ -/* an application, I would recommend removing the call to ERROR in RCCHK, +/* an application, I would recommend removing the call to ERROR in RCCHK, */ /* and remove ERROR and nunsfm completely. */ -/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in +/* iclip is initialized to 0 in SETUP, and incremented in entry SWRITE in */ /* sread.f. When LPC10 is embedded into an application, one might want */ /* to cause it to be incremented in a routine that takes the output of */ /* SYNTHS and sends it to an audio device. It could be optionally */ /* displayed, for those that might want to know what it is. */ -/* maxosp is never initialized to 0 in SETUP, although it probably should +/* maxosp is never initialized to 0 in SETUP, although it probably should */ /* be, and it is updated in subroutine ANALYS. I doubt that its value */ /* would be of much interest to an application in which LPC10 is */ @@ -418,7 +418,7 @@ s*/ /* common /contrl/ quant, nbits */ /* common /contrl/ nframe, nunsfm, iclip, maxosp, listl, lincnt */ /* Parameters/constants */ -/* Voicing coefficient and Linear Discriminant Analysis variables: +/* Voicing coefficient and Linear Discriminant Analysis variables: */ /* Max number of VDC's and VDC levels */ /* The following are not Fortran PARAMETER's, but they are */ @@ -428,15 +428,15 @@ s*/ /* Note: */ /* VALUE(1) through VALUE(8) are assigned values, but VALUE(9) */ -/* never is. Yet VALUE(9) is read in the loop that begins "DO I = +/* never is. Yet VALUE(9) is read in the loop that begins "DO I = */ -/* 1, 9" below. I believe that this doesn't cause any problems in +/* 1, 9" below. I believe that this doesn't cause any problems in */ -/* this subroutine, because all VDC(9,*) array elements are 0, and +/* this subroutine, because all VDC(9,*) array elements are 0, and */ -/* this is what is multiplied by VALUE(9) in all cases. Still, it +/* this is what is multiplied by VALUE(9) in all cases. Still, it */ -/* would save a multiplication to change the loop to "DO I = 1, 8". +/* would save a multiplication to change the loop to "DO I = 1, 8". */ /* Local state */ /* WARNING! */ @@ -450,16 +450,16 @@ s*/ /* For VOICE, note that it is "shifted" in the statement that */ /* begins "IF (HALF .EQ. 1) THEN" below. Also, uninitialized */ -/* values in the VOICE array can only affect entries in the VOIBUF +/* values in the VOICE array can only affect entries in the VOIBUF */ -/* array that are for the same frame, or for an older frame. Thus +/* array that are for the same frame, or for an older frame. Thus */ /* the effects of uninitialized values in VOICE cannot linger on */ /* for more than 2 or 3 frame times. */ /* For SFBUE and SLBUE, the effects of uninitialized values can */ /* linger on for many frame times, because their previous values */ -/* are exponentially decayed. Thus it is more important to choose +/* are exponentially decayed. Thus it is more important to choose */ /* initial values for these variables. I would guess that a */ /* reasonable initial value for SFBUE is REF/16, the same as used */ @@ -521,7 +521,7 @@ s*/ /* LBVE, LBUE, FBVE, FBUE, OFBUE, OLBUE */ /* MAXMIN is initialized on the first call, assuming that HALF */ -/* .EQ. 1 on first call. This is how ANALYS calls this subroutine. +/* .EQ. 1 on first call. This is how ANALYS calls this subroutine. */ /* Voicing Decision Parameter vector (* denotes zero coefficient): */ @@ -544,7 +544,7 @@ fic*/ /* The VOICE array contains the result of the linear discriminant functio n*/ -/* (analog values). The VOIBUF array contains the hard-limited binary +/* (analog values). The VOIBUF array contains the hard-limited binary */ /* voicing decisions. The VOICE and VOIBUF arrays, according to FORTRAN */ @@ -564,10 +564,10 @@ n*/ *maxmin = *maxamd / max(*minamd,1.f); } /* Calculate voicing parameters twice per frame: */ - vparms_(&vwin[1], &inbuf[inbuf_offset], &lpbuf[lpbuf_offset], &buflim[1], + vparms_(&vwin[1], &inbuf[inbuf_offset], &lpbuf[lpbuf_offset], &buflim[1], half, dither, mintau, &zc, &lbe, &fbe, &qs, &rc1, &ar_b__, & ar_f__); -/* Estimate signal-to-noise ratio to select the appropriate VDC vector. +/* Estimate signal-to-noise ratio to select the appropriate VDC vector. */ /* The SNR is estimated as the running average of the ratio of the */ /* running average full-band voiced energy to the running average */ @@ -607,10 +607,10 @@ L69: voibuf[*half + 6] = 0; } /* Skip voicing decision smoothing in first half-frame: */ -/* Give a value to VSTATE, so that trace statements below will print +/* Give a value to VSTATE, so that trace statements below will print */ /* a consistent value from one call to the next when HALF .EQ. 1. */ -/* The value of VSTATE is not used for any other purpose when this is +/* The value of VSTATE is not used for any other purpose when this is */ /* true. */ vstate = -1; @@ -631,7 +631,7 @@ L69: .*/ /* Voicing override of transitions at onsets: */ -/* If a V/UV or UV/V voicing decision transition occurs within one-half +/* If a V/UV or UV/V voicing decision transition occurs within one-half */ /* frame of an onset bounding a voicing window, then the transition is */ /* moved to occur at the onset. */ diff --git a/codecs/lpc10/vparms.c b/codecs/lpc10/vparms.c index c75b1b17d8..f802e6ffd7 100644 --- a/codecs/lpc10/vparms.c +++ b/codecs/lpc10/vparms.c @@ -131,8 +131,8 @@ static real c_b2 = 1.f; /* This subroutine has no local state. */ -/* Subroutine */ int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer - *buflim, integer *half, real *dither, integer *mintau, integer *zc, +/* Subroutine */ int vparms_(integer *vwin, real *inbuf, real *lpbuf, integer + *buflim, integer *half, real *dither, integer *mintau, integer *zc, integer *lbe, integer *fbe, real *qs, real *rc1, real *ar_b__, real * ar_f__) { @@ -252,4 +252,3 @@ is)*/ *fbe = min(i__1,32767); return 0; } /* vparms_ */ - diff --git a/codecs/speex/arch.h b/codecs/speex/arch.h index af42e645dc..435befcefd 100644 --- a/codecs/speex/arch.h +++ b/codecs/speex/arch.h @@ -7,18 +7,18 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + - Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -219,11 +219,11 @@ typedef float spx_word32_t; #if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X) /* 2 on TI C5x DSP */ -#define BYTES_PER_CHAR 2 +#define BYTES_PER_CHAR 2 #define BITS_PER_CHAR 16 #define LOG2_BITS_PER_CHAR 4 -#else +#else #define BYTES_PER_CHAR 1 #define BITS_PER_CHAR 8 diff --git a/codecs/speex/fixed_generic.h b/codecs/speex/fixed_generic.h index 3fb096ed90..0b219188d2 100644 --- a/codecs/speex/fixed_generic.h +++ b/codecs/speex/fixed_generic.h @@ -7,18 +7,18 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + - Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR diff --git a/codecs/speex/resample.c b/codecs/speex/resample.c index 2b03951805..0797352adf 100644 --- a/codecs/speex/resample.c +++ b/codecs/speex/resample.c @@ -1,6 +1,6 @@ /* Copyright (C) 2007-2008 Jean-Marc Valin Copyright (C) 2008 Thorvald Natvig - + File: resample.c Arbitrary resampling code @@ -38,22 +38,22 @@ - Low memory requirement - Good *perceptual* quality (and not best SNR) - Warning: This resampler is relatively new. Although I think I got rid of + Warning: This resampler is relatively new. Although I think I got rid of all the major bugs and I don't expect the API to change anymore, there may be something I've missed. So use with caution. This algorithm is based on this original resampling algorithm: Smith, Julius O. Digital Audio Resampling Home Page - Center for Computer Research in Music and Acoustics (CCRMA), + Center for Computer Research in Music and Acoustics (CCRMA), Stanford University, 2007. Web published at http://www-ccrma.stanford.edu/~jos/resample/. - There is one main difference, though. This resampler uses cubic + There is one main difference, though. This resampler uses cubic interpolation instead of linear interpolation in the above paper. This makes the table much smaller and makes it possible to compute that table - on a per-stream basis. In turn, being able to tweak the table for each - stream makes it possible to both reduce complexity on simple ratios - (e.g. 2/3), and get rid of the rounding operations in the inner loop. + on a per-stream basis. In turn, being able to tweak the table for each + stream makes it possible to both reduce complexity on simple ratios + (e.g. 2/3), and get rid of the rounding operations in the inner loop. The latter both reduces CPU time and makes the algorithm more SIMD-friendly. */ @@ -106,7 +106,7 @@ struct SpeexResamplerState_ { spx_uint32_t out_rate; spx_uint32_t num_rate; spx_uint32_t den_rate; - + int quality; spx_uint32_t nb_channels; spx_uint32_t filt_len; @@ -118,17 +118,17 @@ struct SpeexResamplerState_ { spx_uint32_t oversample; int initialised; int started; - + /* These are per-channel */ spx_int32_t *last_sample; spx_uint32_t *samp_frac_num; spx_uint32_t *magic_samples; - + spx_word16_t *mem; spx_word16_t *sinc_table; spx_uint32_t sinc_table_length; resampler_basic_func resampler_ptr; - + int in_stride; int out_stride; } ; @@ -170,7 +170,7 @@ static double kaiser8_table[36] = { 0.32108304, 0.27619388, 0.23465776, 0.19672670, 0.16255380, 0.13219758, 0.10562887, 0.08273982, 0.06335451, 0.04724088, 0.03412321, 0.02369490, 0.01563093, 0.00959968, 0.00527363, 0.00233883, 0.00050000, 0.00000000}; - + static double kaiser6_table[36] = { 0.99733006, 1.00000000, 0.99733006, 0.98935595, 0.97618418, 0.95799003, 0.93501423, 0.90755855, 0.87598009, 0.84068475, 0.80211977, 0.76076565, @@ -183,7 +183,7 @@ struct FuncDef { double *table; int oversample; }; - + static struct FuncDef _KAISER12 = {kaiser12_table, 64}; #define KAISER12 (&_KAISER12) /*static struct FuncDef _KAISER12 = {kaiser12_table, 32}; @@ -205,7 +205,7 @@ struct QualityMapping { /* This table maps conversion quality to internal parameters. There are two - reasons that explain why the up-sampling bandwidth is larger than the + reasons that explain why the up-sampling bandwidth is larger than the down-sampling bandwidth: 1) When up-sampling, we can assume that the spectrum is already attenuated close to the Nyquist rate (from an A/D or a previous resampling filter) @@ -231,7 +231,7 @@ static double compute_func(float x, struct FuncDef *func) { float y, frac; double interp[4]; - int ind; + int ind; y = x*func->oversample; ind = (int)floor(y); frac = (y-ind); @@ -242,7 +242,7 @@ static double compute_func(float x, struct FuncDef *func) interp[0] = -0.3333333333*frac + 0.5*(frac*frac) - 0.1666666667*(frac*frac*frac); /* Just to make sure we don't have rounding problems */ interp[1] = 1.f-interp[3]-interp[2]-interp[0]; - + /*sum = frac*accum[1] + (1-frac)*accum[2];*/ return interp[0]*func->table[ind] + interp[1]*func->table[ind+1] + interp[2]*func->table[ind+2] + interp[3]*func->table[ind+3]; } @@ -461,7 +461,7 @@ static int resampler_basic_interpolate_single(SpeexResamplerState *st, spx_uint3 cubic_coef(frac, interp); sum = interpolate_product_single(iptr, st->sinc_table + st->oversample + 4 - offset - 2, N, st->oversample, interp); #endif - + out[out_stride * out_sample++] = PSHR32(sum,15); last_sample += int_advance; samp_frac_num += frac_advance; @@ -523,7 +523,7 @@ static int resampler_basic_interpolate_double(SpeexResamplerState *st, spx_uint3 cubic_coef(frac, interp); sum = interpolate_product_double(iptr, st->sinc_table + st->oversample + 4 - offset - 2, N, st->oversample, interp); #endif - + out[out_stride * out_sample++] = PSHR32(sum,15); last_sample += int_advance; samp_frac_num += frac_advance; @@ -543,11 +543,11 @@ static int resampler_basic_interpolate_double(SpeexResamplerState *st, spx_uint3 static void update_filter(SpeexResamplerState *st) { spx_uint32_t old_length; - + old_length = st->filt_len; st->oversample = quality_map[st->quality].oversample; st->filt_len = quality_map[st->quality].base_length; - + if (st->num_rate > st->den_rate) { /* down-sampling */ @@ -570,7 +570,7 @@ static void update_filter(SpeexResamplerState *st) /* up-sampling */ st->cutoff = quality_map[st->quality].upsample_bandwidth; } - + /* Choose the resampling type that requires the least amount of memory */ if (st->den_rate <= st->oversample) { @@ -623,7 +623,7 @@ static void update_filter(SpeexResamplerState *st) st->int_advance = st->num_rate/st->den_rate; st->frac_advance = st->num_rate%st->den_rate; - + /* Here's the place where we update the filter memory to take into account the change in filter length. It's probably the messiest part of the code due to handling of lots of corner cases. */ @@ -661,7 +661,7 @@ static void update_filter(SpeexResamplerState *st) /*if (st->magic_samples[i])*/ { /* Try and remove the magic samples as if nothing had happened */ - + /* FIXME: This is wrong but for now we need it to avoid going over the array bounds */ olen = old_length + 2*st->magic_samples[i]; for (j=old_length-2+st->magic_samples[i];j>=0;j--) @@ -736,18 +736,18 @@ static void update_filter(SpeexResamplerState *st) st->filt_len = 0; st->mem = 0; st->resampler_ptr = 0; - + st->cutoff = 1.f; st->nb_channels = nb_channels; st->in_stride = 1; st->out_stride = 1; - + #ifdef FIXED_POINT st->buffer_size = 160; #else st->buffer_size = 160; #endif - + /* Per channel data */ st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(int)); st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(int)); @@ -762,9 +762,9 @@ static void update_filter(SpeexResamplerState *st) speex_resampler_set_quality(st, quality); speex_resampler_set_rate_frac(st, ratio_num, ratio_den, in_rate, out_rate); - + update_filter(st); - + st->initialised = 1; if (err) *err = RESAMPLER_ERR_SUCCESS; @@ -789,17 +789,17 @@ static int speex_resampler_process_native(SpeexResamplerState *st, spx_uint32_t int out_sample = 0; spx_word16_t *mem = st->mem + channel_index * st->mem_alloc_size; spx_uint32_t ilen; - + st->started = 1; - + /* Call the right resampler through the function ptr */ out_sample = st->resampler_ptr(st, channel_index, mem, in_len, out, out_len); - + if (st->last_sample[channel_index] < (spx_int32_t)*in_len) *in_len = st->last_sample[channel_index]; *out_len = out_sample; st->last_sample[channel_index] -= *in_len; - + ilen = *in_len; for(j=0;jmagic_samples[channel_index]; spx_word16_t *mem = st->mem + channel_index * st->mem_alloc_size; const int N = st->filt_len; - + speex_resampler_process_native(st, channel_index, &tmp_in_len, *out, &out_len); st->magic_samples[channel_index] -= tmp_in_len; - + /* If we couldn't process all "magic" input samples, save the rest for next time */ if (st->magic_samples[channel_index]) { @@ -842,13 +842,13 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i const spx_uint32_t xlen = st->mem_alloc_size - filt_offs; const int istride = st->in_stride; - if (st->magic_samples[channel_index]) + if (st->magic_samples[channel_index]) olen -= speex_resampler_magic(st, channel_index, &out, olen); if (! st->magic_samples[channel_index]) { while (ilen && olen) { spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; spx_uint32_t ochunk = olen; - + if (in) { for(j=0;jout_stride = 1; - + while (ilen && olen) { spx_word16_t *y = ystack; spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; @@ -929,7 +929,7 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i #else out[j*ostride_save] = WORD2INT(ystack[j]); #endif - + ilen -= ichunk; olen -= ochunk; out += (ochunk+omagic) * ostride_save; @@ -963,7 +963,7 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i st->out_stride = ostride_save; return RESAMPLER_ERR_SUCCESS; } - + int speex_resampler_process_interleaved_int(SpeexResamplerState *st, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) { spx_uint32_t i; @@ -1003,7 +1003,7 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i spx_uint32_t i; if (st->in_rate == in_rate && st->out_rate == out_rate && st->num_rate == ratio_num && st->den_rate == ratio_den) return RESAMPLER_ERR_SUCCESS; - + old_den = st->den_rate; st->in_rate = in_rate; st->out_rate = out_rate; @@ -1018,7 +1018,7 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i st->den_rate /= fact; } } - + if (old_den > 0) { for (i=0;inb_channels;i++) @@ -1029,7 +1029,7 @@ static int speex_resampler_magic(SpeexResamplerState *st, spx_uint32_t channel_i st->samp_frac_num[i] = st->den_rate-1; } } - + if (st->initialised) update_filter(st); return RESAMPLER_ERR_SUCCESS; diff --git a/codecs/speex/resample_sse.h b/codecs/speex/resample_sse.h index 4bd35a2d03..d85898067e 100644 --- a/codecs/speex/resample_sse.h +++ b/codecs/speex/resample_sse.h @@ -9,18 +9,18 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + - Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR diff --git a/codecs/speex/speex_resampler.h b/codecs/speex/speex_resampler.h index 5dead0e797..d02022d2e4 100644 --- a/codecs/speex/speex_resampler.h +++ b/codecs/speex/speex_resampler.h @@ -1,8 +1,8 @@ /* Copyright (C) 2007 Jean-Marc Valin - + File: speex_resampler.h Resampling code - + The design goals of this code are: - Very fast algorithm - Low memory requirement @@ -45,7 +45,7 @@ /********* WARNING: MENTAL SANITY ENDS HERE *************/ -/* If the resampler is defined outside of Speex, we change the symbol names so that +/* If the resampler is defined outside of Speex, we change the symbol names so that there won't be any clash if linking with Speex later on. */ #define RANDOM_PREFIX ast @@ -55,7 +55,7 @@ #define CAT_PREFIX2(a,b) a ## b #define CAT_PREFIX(a,b) CAT_PREFIX2(a, b) - + #define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init) #define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac) #define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy) @@ -83,7 +83,7 @@ #define spx_int32_t int #define spx_uint16_t unsigned short #define spx_uint32_t unsigned int - + #else /* OUTSIDE_SPEEX */ #include "speex/speex_types.h" @@ -106,7 +106,7 @@ enum { RESAMPLER_ERR_BAD_STATE = 2, RESAMPLER_ERR_INVALID_ARG = 3, RESAMPLER_ERR_PTR_OVERLAP = 4, - + RESAMPLER_ERR_MAX_ERROR }; @@ -123,14 +123,14 @@ typedef struct SpeexResamplerState_ SpeexResamplerState; * \return Newly created resampler state * \retval NULL Error: not enough memory */ -SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, - spx_uint32_t in_rate, - spx_uint32_t out_rate, +SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, + spx_uint32_t in_rate, + spx_uint32_t out_rate, int quality, int *err); -/** Create a new resampler with fractional input/output rates. The sampling - * rate ratio is an arbitrary rational number with both the numerator and +/** Create a new resampler with fractional input/output rates. The sampling + * rate ratio is an arbitrary rational number with both the numerator and * denominator being 32-bit integers. * @param nb_channels Number of channels to be processed * @param ratio_num Numerator of the sampling rate ratio @@ -143,11 +143,11 @@ SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, * @return Newly created resampler state * @retval NULL Error: not enough memory */ -SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, - spx_uint32_t ratio_num, - spx_uint32_t ratio_den, - spx_uint32_t in_rate, - spx_uint32_t out_rate, +SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, + spx_uint32_t ratio_num, + spx_uint32_t ratio_den, + spx_uint32_t in_rate, + spx_uint32_t out_rate, int quality, int *err); @@ -158,24 +158,24 @@ void speex_resampler_destroy(SpeexResamplerState *st); /** Resample a float array. The input and output buffers must *not* overlap. * @param st Resampler state - * @param channel_index Index of the channel to process for the multi-channel + * @param channel_index Index of the channel to process for the multi-channel * base (0 otherwise) * @param in Input buffer - * @param in_len Number of input samples in the input buffer. Returns the + * @param in_len Number of input samples in the input buffer. Returns the * number of samples processed * @param out Output buffer * @param out_len Size of the output buffer. Returns the number of samples written */ -int speex_resampler_process_float(SpeexResamplerState *st, - spx_uint32_t channel_index, - const float *in, - spx_uint32_t *in_len, - float *out, +int speex_resampler_process_float(SpeexResamplerState *st, + spx_uint32_t channel_index, + const float *in, + spx_uint32_t *in_len, + float *out, spx_uint32_t *out_len); /** Resample an int array. The input and output buffers must *not* overlap. * @param st Resampler state - * @param channel_index Index of the channel to process for the multi-channel + * @param channel_index Index of the channel to process for the multi-channel * base (0 otherwise) * @param in Input buffer * @param in_len Number of input samples in the input buffer. Returns the number @@ -183,11 +183,11 @@ int speex_resampler_process_float(SpeexResamplerState *st, * @param out Output buffer * @param out_len Size of the output buffer. Returns the number of samples written */ -int speex_resampler_process_int(SpeexResamplerState *st, - spx_uint32_t channel_index, - const spx_int16_t *in, - spx_uint32_t *in_len, - spx_int16_t *out, +int speex_resampler_process_int(SpeexResamplerState *st, + spx_uint32_t channel_index, + const spx_int16_t *in, + spx_uint32_t *in_len, + spx_int16_t *out, spx_uint32_t *out_len); /** Resample an interleaved float array. The input and output buffers must *not* overlap. @@ -199,10 +199,10 @@ int speex_resampler_process_int(SpeexResamplerState *st, * @param out_len Size of the output buffer. Returns the number of samples written. * This is all per-channel. */ -int speex_resampler_process_interleaved_float(SpeexResamplerState *st, - const float *in, - spx_uint32_t *in_len, - float *out, +int speex_resampler_process_interleaved_float(SpeexResamplerState *st, + const float *in, + spx_uint32_t *in_len, + float *out, spx_uint32_t *out_len); /** Resample an interleaved int array. The input and output buffers must *not* overlap. @@ -214,10 +214,10 @@ int speex_resampler_process_interleaved_float(SpeexResamplerState *st, * @param out_len Size of the output buffer. Returns the number of samples written. * This is all per-channel. */ -int speex_resampler_process_interleaved_int(SpeexResamplerState *st, - const spx_int16_t *in, - spx_uint32_t *in_len, - spx_int16_t *out, +int speex_resampler_process_interleaved_int(SpeexResamplerState *st, + const spx_int16_t *in, + spx_uint32_t *in_len, + spx_int16_t *out, spx_uint32_t *out_len); /** Set (change) the input/output sampling rates (integer value). @@ -225,8 +225,8 @@ int speex_resampler_process_interleaved_int(SpeexResamplerState *st, * @param in_rate Input sampling rate (integer number of Hz). * @param out_rate Output sampling rate (integer number of Hz). */ -int speex_resampler_set_rate(SpeexResamplerState *st, - spx_uint32_t in_rate, +int speex_resampler_set_rate(SpeexResamplerState *st, + spx_uint32_t in_rate, spx_uint32_t out_rate); /** Get the current input/output sampling rates (integer value). @@ -234,11 +234,11 @@ int speex_resampler_set_rate(SpeexResamplerState *st, * @param in_rate Input sampling rate (integer number of Hz) copied. * @param out_rate Output sampling rate (integer number of Hz) copied. */ -void speex_resampler_get_rate(SpeexResamplerState *st, - spx_uint32_t *in_rate, +void speex_resampler_get_rate(SpeexResamplerState *st, + spx_uint32_t *in_rate, spx_uint32_t *out_rate); -/** Set (change) the input/output sampling rates and resampling ratio +/** Set (change) the input/output sampling rates and resampling ratio * (fractional values in Hz supported). * @param st Resampler state * @param ratio_num Numerator of the sampling rate ratio @@ -246,10 +246,10 @@ void speex_resampler_get_rate(SpeexResamplerState *st, * @param in_rate Input sampling rate rounded to the nearest integer (in Hz). * @param out_rate Output sampling rate rounded to the nearest integer (in Hz). */ -int speex_resampler_set_rate_frac(SpeexResamplerState *st, - spx_uint32_t ratio_num, - spx_uint32_t ratio_den, - spx_uint32_t in_rate, +int speex_resampler_set_rate_frac(SpeexResamplerState *st, + spx_uint32_t ratio_num, + spx_uint32_t ratio_den, + spx_uint32_t in_rate, spx_uint32_t out_rate); /** Get the current resampling ratio. This will be reduced to the least @@ -258,52 +258,52 @@ int speex_resampler_set_rate_frac(SpeexResamplerState *st, * @param ratio_num Numerator of the sampling rate ratio copied * @param ratio_den Denominator of the sampling rate ratio copied */ -void speex_resampler_get_ratio(SpeexResamplerState *st, - spx_uint32_t *ratio_num, +void speex_resampler_get_ratio(SpeexResamplerState *st, + spx_uint32_t *ratio_num, spx_uint32_t *ratio_den); /** Set (change) the conversion quality. * @param st Resampler state - * @param quality Resampling quality between 0 and 10, where 0 has poor + * @param quality Resampling quality between 0 and 10, where 0 has poor * quality and 10 has very high quality. */ -int speex_resampler_set_quality(SpeexResamplerState *st, +int speex_resampler_set_quality(SpeexResamplerState *st, int quality); /** Get the conversion quality. * @param st Resampler state - * @param quality Resampling quality between 0 and 10, where 0 has poor + * @param quality Resampling quality between 0 and 10, where 0 has poor * quality and 10 has very high quality. */ -void speex_resampler_get_quality(SpeexResamplerState *st, +void speex_resampler_get_quality(SpeexResamplerState *st, int *quality); /** Set (change) the input stride. * @param st Resampler state * @param stride Input stride */ -void speex_resampler_set_input_stride(SpeexResamplerState *st, +void speex_resampler_set_input_stride(SpeexResamplerState *st, spx_uint32_t stride); /** Get the input stride. * @param st Resampler state * @param stride Input stride copied */ -void speex_resampler_get_input_stride(SpeexResamplerState *st, +void speex_resampler_get_input_stride(SpeexResamplerState *st, spx_uint32_t *stride); /** Set (change) the output stride. * @param st Resampler state * @param stride Output stride */ -void speex_resampler_set_output_stride(SpeexResamplerState *st, +void speex_resampler_set_output_stride(SpeexResamplerState *st, spx_uint32_t stride); /** Get the output stride. * @param st Resampler state copied * @param stride Output stride */ -void speex_resampler_get_output_stride(SpeexResamplerState *st, +void speex_resampler_get_output_stride(SpeexResamplerState *st, spx_uint32_t *stride); /** Get the latency in input samples introduced by the resampler. @@ -316,8 +316,8 @@ int speex_resampler_get_input_latency(SpeexResamplerState *st); */ int speex_resampler_get_output_latency(SpeexResamplerState *st); -/** Make sure that the first samples to go out of the resamplers don't have - * leading zeros. This is only useful before starting to use a newly created +/** Make sure that the first samples to go out of the resamplers don't have + * leading zeros. This is only useful before starting to use a newly created * resampler. It is recommended to use that when resampling an audio file, as * it will generate a file with the same length. For real-time processing, * it is probably easier not to use this call (so that the output duration diff --git a/codecs/speex/stack_alloc.h b/codecs/speex/stack_alloc.h index 5264e666b0..6c56334f86 100644 --- a/codecs/speex/stack_alloc.h +++ b/codecs/speex/stack_alloc.h @@ -7,18 +7,18 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + - Neither the name of the Xiph.org Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -101,7 +101,7 @@ #endif #if defined(VAR_ARRAYS) -#define VARDECL(var) +#define VARDECL(var) #define ALLOC(var, size, type) type var[size] #elif defined(USE_ALLOCA) #define VARDECL(var) var diff --git a/configs/basic-pbx/indications.conf b/configs/basic-pbx/indications.conf index 115cddd0bb..ccf249d6b2 100644 --- a/configs/basic-pbx/indications.conf +++ b/configs/basic-pbx/indications.conf @@ -16,4 +16,3 @@ stutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/1 ; Additional country configurations can be found in the Asterisk source ; at /configs/samples/indications.conf.sample - diff --git a/configs/basic-pbx/pjsip.conf b/configs/basic-pbx/pjsip.conf index b20e0c623a..826d5c5ec9 100644 --- a/configs/basic-pbx/pjsip.conf +++ b/configs/basic-pbx/pjsip.conf @@ -326,4 +326,3 @@ username = DB589C0875AB [1108](aor-single-reg) mailboxes = 1108@example - diff --git a/configs/samples/alsa.conf.sample b/configs/samples/alsa.conf.sample index 23aac4e104..3e617104d8 100644 --- a/configs/samples/alsa.conf.sample +++ b/configs/samples/alsa.conf.sample @@ -75,4 +75,3 @@ extension=s ; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no". ; ---------------------------------------------------------------------------------- - diff --git a/configs/samples/ari.conf.sample b/configs/samples/ari.conf.sample index 1294814e2d..8729b1e09e 100644 --- a/configs/samples/ari.conf.sample +++ b/configs/samples/ari.conf.sample @@ -33,4 +33,3 @@ enabled = yes ; When set to no, ARI support is disabled. ; When set to plain, the password is in plaintext. ; ;password_format = plain - diff --git a/configs/samples/asterisk.adsi b/configs/samples/asterisk.adsi index a589525896..904b33aa19 100644 --- a/configs/samples/asterisk.adsi +++ b/configs/samples/asterisk.adsi @@ -156,4 +156,3 @@ SUB "stableCall" IS SHOWDISPLAY "callended" AT 2 ENDIF ENDSUB - diff --git a/configs/samples/asterisk.conf.sample b/configs/samples/asterisk.conf.sample index 8379b6ef0c..5f33abbfe2 100644 --- a/configs/samples/asterisk.conf.sample +++ b/configs/samples/asterisk.conf.sample @@ -74,7 +74,7 @@ astsbindir => /usr/sbin ;rungroup = asterisk ; The group to run as. ;lightbackground = yes ; If your terminal is set for a light-colored ; background. -;forceblackbackground = yes ; Force the background of the terminal to be +;forceblackbackground = yes ; Force the background of the terminal to be ; black, in order for terminal colors to show ; up properly. ;defaultlanguage = en ; Default language diff --git a/configs/samples/calendar.conf.sample b/configs/samples/calendar.conf.sample index d87b3b2c4e..08cbd3aa57 100644 --- a/configs/samples/calendar.conf.sample +++ b/configs/samples/calendar.conf.sample @@ -43,7 +43,7 @@ ;setvar = CALLERID(name)=${CALENDAR_EVENT(summary)} ;[calendar2] -; Note: Support for Exchange Server 2003 +; Note: Support for Exchange Server 2003 ; ;type = exchange ; type of calendar--currently supported: ical, caldav, exchange, or ews ;url = https://example.com/exchange/jdoe ; URL to MS Exchange OWA for user (usually includes exchange/user) diff --git a/configs/samples/cdr_adaptive_odbc.conf.sample b/configs/samples/cdr_adaptive_odbc.conf.sample index 58a596649c..1585b8764b 100644 --- a/configs/samples/cdr_adaptive_odbc.conf.sample +++ b/configs/samples/cdr_adaptive_odbc.conf.sample @@ -60,4 +60,3 @@ ; ; Add quoted indentifiers for table and columns names. ;quoted_identifiers=" ; Default to null - diff --git a/configs/samples/cdr_beanstalkd.conf.sample b/configs/samples/cdr_beanstalkd.conf.sample index 5f45d5d5de..4f8d53148b 100644 --- a/configs/samples/cdr_beanstalkd.conf.sample +++ b/configs/samples/cdr_beanstalkd.conf.sample @@ -18,9 +18,3 @@ ; platform with multiple Asterisk servers, that are used for different functions. For example, ; none billable CDR records can be inserted with a priority of 99, while billable ones be ; inserted with a priority of 1 - - - - - - diff --git a/configs/samples/cdr_mysql.conf.sample b/configs/samples/cdr_mysql.conf.sample index e15a8ed932..a1f7d38e8c 100644 --- a/configs/samples/cdr_mysql.conf.sample +++ b/configs/samples/cdr_mysql.conf.sample @@ -4,17 +4,17 @@ ; setting hostname=localhost ; ; port and sock are both optional parameters. If hostname is specified -; and is not "localhost" (you can use address 127.0.0.1 instead), then -; cdr_mysql will attempt to connect to the port specified or use the -; default port. If hostname is not specified or if hostname is -; "localhost", then cdr_mysql will attempt to connect to the socket file +; and is not "localhost" (you can use address 127.0.0.1 instead), then +; cdr_mysql will attempt to connect to the port specified or use the +; default port. If hostname is not specified or if hostname is +; "localhost", then cdr_mysql will attempt to connect to the socket file ; specified by sock or otherwise use the default socket file. ; ;[global] ;hostname=database.host.name ;dbname=asteriskcdrdb ;table=cdr -;password=password +;password=password ;user=asteriskcdruser ;port=3306 ;sock=/tmp/mysql.sock @@ -60,4 +60,3 @@ alias start => calldate ;alias accountcode => ;alias userfield => ;alias uniqueid => - diff --git a/configs/samples/cdr_tds.conf.sample b/configs/samples/cdr_tds.conf.sample index 309599e5fc..f3a9d7ccae 100644 --- a/configs/samples/cdr_tds.conf.sample +++ b/configs/samples/cdr_tds.conf.sample @@ -75,4 +75,3 @@ ; Default value: false ;hrtime=false - diff --git a/configs/samples/cel.conf.sample b/configs/samples/cel.conf.sample index d92e2745d9..755fcd3eda 100644 --- a/configs/samples/cel.conf.sample +++ b/configs/samples/cel.conf.sample @@ -103,7 +103,7 @@ events=APP_START,CHAN_START,CHAN_END,ANSWER,HANGUP,BRIDGE_ENTER,BRIDGE_EXIT ;show_user_defined=yes ; -; RADIUS CEL Backend +; RADIUS CEL Backend ; [radius] ; diff --git a/configs/samples/chan_dahdi.conf.sample b/configs/samples/chan_dahdi.conf.sample index 69f7512797..3c5e18df08 100644 --- a/configs/samples/chan_dahdi.conf.sample +++ b/configs/samples/chan_dahdi.conf.sample @@ -1490,12 +1490,12 @@ pickupgroup=1 ; MFC-R2 signaling has lots of variants from country to country and even sometimes ; minor variants inside the same country. The only mandatory parameters here are: ; mfcr2_variant, mfcr2_max_ani and mfcr2_max_dnis. -; IT IS RECOMMENDED that you leave the default values (leaving it commented) for the -; other parameters unless you have problems or you have been instructed to change some -; parameter. OpenR2 library uses the mfcr2_variant parameter to try to determine the -; best defaults for your country, also refer to the OpenR2 package directory -; doc/asterisk/ where you can find sample configurations for some countries. If you -; want to contribute your configs for a particular country send them to the e-mail +; IT IS RECOMMENDED that you leave the default values (leaving it commented) for the +; other parameters unless you have problems or you have been instructed to change some +; parameter. OpenR2 library uses the mfcr2_variant parameter to try to determine the +; best defaults for your country, also refer to the OpenR2 package directory +; doc/asterisk/ where you can find sample configurations for some countries. If you +; want to contribute your configs for a particular country send them to the e-mail ; of the primary OpenR2 developer that you can find in the AUTHORS file of the OpenR2 package ; MFC/R2 variant. This depends on the OpenR2 supported variants diff --git a/configs/samples/chan_mobile.conf.sample b/configs/samples/chan_mobile.conf.sample index c9c4d2d85c..3814337316 100644 --- a/configs/samples/chan_mobile.conf.sample +++ b/configs/samples/chan_mobile.conf.sample @@ -4,7 +4,7 @@ ; [general] -interval=30 ; Number of seconds between trying to connect to devices. +interval=30 ; Number of seconds between trying to connect to devices. ; The following is a list of adapters we use. ; id must be unique and address is the bdaddr of the adapter from hciconfig. @@ -24,7 +24,7 @@ id=dlink address=00:80:C8:35:52:78 ; The following is a list of the devices we deal with. -; Every device listed below will be available for calls in and out of Asterisk. +; Every device listed below will be available for calls in and out of Asterisk. ; Each device needs an adapter=xxxx entry which determines which bluetooth adapter is used. ; Use the CLI command 'mobile search' to discover devices. ; Use the CLI command 'mobile show devices' to see device status. diff --git a/configs/samples/codecs.conf.sample b/configs/samples/codecs.conf.sample index 9b7af3e362..8457fb5ac3 100644 --- a/configs/samples/codecs.conf.sample +++ b/configs/samples/codecs.conf.sample @@ -207,4 +207,3 @@ packetloss_percentage=10; ;max_bandwidth=wide ; Maximum encoded bandwidth set to wide band (0-8000 Hz ; ; audio bandwidth at 16Khz sample rate) ;cbr=yes ; Force a constant bit rate (i.e don't use what's on the SDP) - diff --git a/configs/samples/dbsep.conf.sample b/configs/samples/dbsep.conf.sample index 9cfa237407..7a68850be1 100644 --- a/configs/samples/dbsep.conf.sample +++ b/configs/samples/dbsep.conf.sample @@ -32,4 +32,3 @@ dbpass=password # For most databases, this is fine. Set to 'no' for Sybase or MS SQL Server. backslash_is_escape=yes - diff --git a/configs/samples/dsp.conf.sample b/configs/samples/dsp.conf.sample index 55951582e3..f13ca2f96a 100644 --- a/configs/samples/dsp.conf.sample +++ b/configs/samples/dsp.conf.sample @@ -40,4 +40,3 @@ ;successive number hits/misses of 12.75ms before a digit/nodigit is considered valid ;dtmf_hits_to_begin=2 ;dtmf_misses_to_end=3 - diff --git a/configs/samples/extconfig.conf.sample b/configs/samples/extconfig.conf.sample index 0f347a6aba..9e13cacda4 100644 --- a/configs/samples/extconfig.conf.sample +++ b/configs/samples/extconfig.conf.sample @@ -109,4 +109,3 @@ ; note that using dynamic realtime extensions is not recommended anymore as a ; best practice; instead, you should consider writing a static dialplan with ; proper data abstraction via a tool like func_odbc. - diff --git a/configs/samples/extensions.lua.sample b/configs/samples/extensions.lua.sample index 1b4428c7c5..e845f0dc90 100644 --- a/configs/samples/extensions.lua.sample +++ b/configs/samples/extensions.lua.sample @@ -238,4 +238,3 @@ hints = { ["1234"] = "SIP/1234"; }; } - diff --git a/configs/samples/extensions_minivm.conf.sample b/configs/samples/extensions_minivm.conf.sample index 7bd1df1d21..1bd4731ce5 100644 --- a/configs/samples/extensions_minivm.conf.sample +++ b/configs/samples/extensions_minivm.conf.sample @@ -154,4 +154,3 @@ exten => sendvmcleanup,n(done),wait(0.5) exten => sendvmcleanup,n,hangup exten => h,1,gotoif($[${MINIVM_RECORD_STATUS} = SUCCESS]?sendvmcleanup,1)) - diff --git a/configs/samples/festival.conf.sample b/configs/samples/festival.conf.sample index e918217199..27b43d52e5 100644 --- a/configs/samples/festival.conf.sample +++ b/configs/samples/festival.conf.sample @@ -32,4 +32,3 @@ ;festivalcommand=(tts_textasterisk "%s" 'file)(quit)\n ; ; - diff --git a/configs/samples/followme.conf.sample b/configs/samples/followme.conf.sample index 7e1d40ff43..487554d811 100644 --- a/configs/samples/followme.conf.sample +++ b/configs/samples/followme.conf.sample @@ -95,5 +95,3 @@ status_prompt=>followme/status sorry_prompt=>followme/sorry ; The 'I'm sorry, but we were unable to locate your party' message prompt. Default ; is the global default. - - diff --git a/configs/samples/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample index f4d90b7997..ca970e17d3 100644 --- a/configs/samples/func_odbc.conf.sample +++ b/configs/samples/func_odbc.conf.sample @@ -107,4 +107,3 @@ synopsis=Check if a specified callerid is contained in the ex-gf database dsn=mysql1 readsql=SELECT location FROM presence WHERE id='${SQL_ESC(${ARG1})}' writesql=UPDATE presence SET location='${SQL_ESC(${VAL1})}' WHERE id='${SQL_ESC(${ARG1})}' - diff --git a/configs/samples/iaxprov.conf.sample b/configs/samples/iaxprov.conf.sample index 668809c4db..8b7d8e092e 100644 --- a/configs/samples/iaxprov.conf.sample +++ b/configs/samples/iaxprov.conf.sample @@ -78,4 +78,3 @@ flags=register,heartbeat ; USE A '*' PROVISIONING ENTRY UNLESS YOU KNOW WHAT YOU'RE DOING. ; ;template=default - diff --git a/configs/samples/manager.conf.sample b/configs/samples/manager.conf.sample index 0eb64c8ae7..989441a615 100644 --- a/configs/samples/manager.conf.sample +++ b/configs/samples/manager.conf.sample @@ -85,7 +85,7 @@ bindaddr = 0.0.0.0 ;permit=209.16.236.73/255.255.255.0 ;acl=named_acl_example ; use a named ACL from acl.conf ; -; +; ;setvar=PBXACCOUNT=edvina ; The setvar option defines channel variables that will be set when this account ; originates a call. You can define multiple setvar= commands for one manager @@ -154,4 +154,3 @@ bindaddr = 0.0.0.0 ; ;read = system,call,log,verbose,agent,user,config,dtmf,reporting,cdr,dialplan ;write = system,call,agent,user,config,command,reporting,originate,message - diff --git a/configs/samples/mgcp.conf.sample b/configs/samples/mgcp.conf.sample index f4bc0dbf2a..107a30d922 100644 --- a/configs/samples/mgcp.conf.sample +++ b/configs/samples/mgcp.conf.sample @@ -13,7 +13,7 @@ ; --------------------- DIGIT TIMEOUTS ---------------------------- firstdigittimeout = 30000 ; default 16000 = 16s -gendigittimeout = 10000 ; default 8000 = 8s +gendigittimeout = 10000 ; default 8000 = 8s matchdigittimeout = 5000 ; defaults 3000 = 3s ; ----------------------------- JITTER BUFFER CONFIGURATION -------------------------- @@ -59,27 +59,27 @@ matchdigittimeout = 5000 ; defaults 3000 = 3s ;; The MGCP channel supports the following service codes: ;; # - Transfer -;; *67 - Calling Number Delivery Blocking -;; *70 - Cancel Call Waiting -;; *72 - Call Forwarding Activation -;; *73 - Call Forwarding Deactivation -;; *78 - Do Not Disturb Activation -;; *79 - Do Not Disturb Deactivation +;; *67 - Calling Number Delivery Blocking +;; *70 - Cancel Call Waiting +;; *72 - Call Forwarding Activation +;; *73 - Call Forwarding Deactivation +;; *78 - Do Not Disturb Activation +;; *79 - Do Not Disturb Deactivation ;; *8 - Call pick-up ; -; known to work with Swissvoice IP10s -;[192.168.1.20] -;context=local -;host=192.168.1.20 -;callerid = "John Doe" <123> +; known to work with Swissvoice IP10s +;[192.168.1.20] +;context=local +;host=192.168.1.20 +;callerid = "John Doe" <123> ;callgroup=0 ; in the range from 0 to 63 ;pickupgroup=0 ; in the range from 0 to 63 -;nat=no -;threewaycalling=yes +;nat=no +;threewaycalling=yes ;transfer=yes ; transfer requires threewaycalling=yes. Use FLASH to transfer ;callwaiting=yes ; this might be a cause of trouble for ip10s -;cancallforward=yes -;line => aaln/1 +;cancallforward=yes +;line => aaln/1 ; ;[dph100] @@ -102,7 +102,7 @@ matchdigittimeout = 5000 ; defaults 3000 = 3s ; 'documentation', or 'omit' ;context = local ;host = 192.168.1.20 -;wcardep = aaln/* ; enables wildcard endpoint and sets it to 'aaln/*' +;wcardep = aaln/* ; enables wildcard endpoint and sets it to 'aaln/*' ; another common format is '*' ;callerid = "Duane Cox" <123> ; now lets setup line 1 using per endpoint configuration... ;callwaiting = no diff --git a/configs/samples/ooh323.conf.sample b/configs/samples/ooh323.conf.sample index aeeb02fab3..563ec9fa8b 100644 --- a/configs/samples/ooh323.conf.sample +++ b/configs/samples/ooh323.conf.sample @@ -201,8 +201,3 @@ allow=ulaw e164=12345 rtptimeout=60 dtmfmode=rfc2833 - - - - - diff --git a/configs/samples/oss.conf.sample b/configs/samples/oss.conf.sample index ee169209fb..b0b3831ab6 100644 --- a/configs/samples/oss.conf.sample +++ b/configs/samples/oss.conf.sample @@ -150,4 +150,3 @@ ; to add video support, uncomment this and remember to install ; the keypad and keypad_font files to the right place ; [general](+,my_video,skin2) - diff --git a/configs/samples/phoneprov.conf.sample b/configs/samples/phoneprov.conf.sample index 7d14013b2e..df3058fe3a 100644 --- a/configs/samples/phoneprov.conf.sample +++ b/configs/samples/phoneprov.conf.sample @@ -140,4 +140,3 @@ setvar => CUSTOM_CONFIG=/var/lib/asterisk/phoneprov/configs/custom.cfg ; Custom ;snom 300, 320, 360, 370, 820, 821, 870 support snom-${MAC}.xml => snom-mac.xml - diff --git a/configs/samples/queuerules.conf.sample b/configs/samples/queuerules.conf.sample index 16648f98c0..b131f84c4f 100644 --- a/configs/samples/queuerules.conf.sample +++ b/configs/samples/queuerules.conf.sample @@ -45,4 +45,3 @@ ; penaltychange => 60,10,5 ; 60 seconds into the call increase the QUEUE_MAX_PENALTY to 10 and increase the QUEUE_MIN_PENALTY to 5 ; penaltychange => 75,,7 ; 75 seconds into the call keep the QUEUE_MAX_PENALTY the same and increase the QUEUE_MIN_PENALTY to 7 ; penaltychange => 90,,,20 ; 90 seconds into the call leave QUEUE_MAX_PENALTY and QUEUE_MIN_PENALTY untouched and set QUEUE_RAISE_PENALTY to 20 - diff --git a/configs/samples/queues.conf.sample b/configs/samples/queues.conf.sample index 226a3a9ef2..79b656b75e 100644 --- a/configs/samples/queues.conf.sample +++ b/configs/samples/queues.conf.sample @@ -97,7 +97,7 @@ monitor-type = MixMonitor ; fewestcalls - ring the one with fewest completed calls from this queue ; random - ring random interface ; rrmemory - round robin with memory, remember where we left off last ring pass -; rrordered - same as rrmemory, except the queue member order from config file +; rrordered - same as rrmemory, except the queue member order from config file ; is preserved ; linear - rings interfaces in the order specified in this configuration file. ; If you use dynamic members, the members will be rung in the order in diff --git a/configs/samples/res_config_mysql.conf.sample b/configs/samples/res_config_mysql.conf.sample index ab8ebf0950..7d9c78e67f 100644 --- a/configs/samples/res_config_mysql.conf.sample +++ b/configs/samples/res_config_mysql.conf.sample @@ -5,7 +5,7 @@ ; If dbhost is commented out or the string "localhost", a connection ; to the local host is assumed and dbsock is used instead of TCP/IP ; to connect to the server. If no dbcharset is specified, the connection -; is made with no extra charset configurations sent to MySQL, leaving all +; is made with no extra charset configurations sent to MySQL, leaving all ; configured MySQL charset options and defaults untouched. ; ; Multiple database contexts may be configured, with the caveat that diff --git a/configs/samples/res_fax.conf.sample b/configs/samples/res_fax.conf.sample index 022a23aad1..95e6be811a 100644 --- a/configs/samples/res_fax.conf.sample +++ b/configs/samples/res_fax.conf.sample @@ -1,4 +1,4 @@ -; Generic Fax Application configuration +; Generic Fax Application configuration [general] ; Maximum Transmission Rate diff --git a/configs/samples/res_ldap.conf.sample b/configs/samples/res_ldap.conf.sample index ac345cdd4e..c8d1286c39 100644 --- a/configs/samples/res_ldap.conf.sample +++ b/configs/samples/res_ldap.conf.sample @@ -4,7 +4,7 @@ ; Realtime configuration ; ---------------------- -; In order to use this module, you start +; In order to use this module, you start ; in extconfig.conf with a configuration like this: ; ; sippeers = ldap,"dc=myDomain,dc=myDomainExt",sip @@ -19,13 +19,13 @@ ; TLS support ; ----------- ; Note that you can configure an ldaps: url here to get TLS support. -; Detailed configuration of certificates and supported CAs is done in your +; Detailed configuration of certificates and supported CAs is done in your ; ldap.conf file for OpenLDAP clients on your system. ; This requires that you have OpenLDAP libraries compiled with TLS support ; ********************************************************************************* ; NOTE: res_ldap.conf should be chmod 600 because it contains the plain-text LDAP -; password to an account with WRITE access to the asterisk configuration. +; password to an account with WRITE access to the asterisk configuration. ; ********************************************************************************* [_general] @@ -196,4 +196,3 @@ regcontext = AstAccountRegistrationContext regexten = AstAccountRegistrationExten CanCallForward = AstAccountCanCallForward additionalFilter=(objectClass=AstAccount) - diff --git a/configs/samples/res_pgsql.conf.sample b/configs/samples/res_pgsql.conf.sample index cc7442fd09..015d68c13c 100644 --- a/configs/samples/res_pgsql.conf.sample +++ b/configs/samples/res_pgsql.conf.sample @@ -18,7 +18,7 @@ dbpass=password ; actual socket is constructed as a combination of dbsock and dbport. For ; example, the values of '/tmp' and '5432', respectively, will specify a socket ; file of '/tmp/.s.PGSQL.5432'. -; +; ;dbsock=/tmp ; ; requirements - At startup, each realtime family will make requirements diff --git a/configs/samples/res_snmp.conf.sample b/configs/samples/res_snmp.conf.sample index 7f37349107..c017c0ec55 100644 --- a/configs/samples/res_snmp.conf.sample +++ b/configs/samples/res_snmp.conf.sample @@ -10,7 +10,7 @@ ; If you use the subagent model, you need to enable agentx in snmpd.conf ; Note that you can only run one Asterisk on the system in this case. ; -; See https://wiki.asterisk.org/wiki/display/AST/Simple+Network+Management+Protocol+(SNMP)+Support +; See https://wiki.asterisk.org/wiki/display/AST/Simple+Network+Management+Protocol+(SNMP)+Support ; to get more information about ; snmp support in Asterisk diff --git a/configs/samples/resolver_unbound.conf.sample b/configs/samples/resolver_unbound.conf.sample index 97361525e8..c1b96c3aa9 100644 --- a/configs/samples/resolver_unbound.conf.sample +++ b/configs/samples/resolver_unbound.conf.sample @@ -21,4 +21,3 @@ ; ; debug is output. ;ta_file = /etc/asterisk/dnssec_keys ; Full path to a trusted anchors key file. These keys are ; ; used to verify DNSSEC signed results. - diff --git a/configs/samples/say.conf.sample b/configs/samples/say.conf.sample index 6285dbe1e3..de35ee4a6a 100644 --- a/configs/samples/say.conf.sample +++ b/configs/samples/say.conf.sample @@ -271,7 +271,7 @@ mode=old ; method for playing numbers and dates _[n]um:1XX => digits/hundred, num:${SAY:1} _[n]um:[2-9]00 => num:${SAY:0:1}, digits/hundred _[n]um:[2-9]XX => num:${SAY:0:1}, digits/hundred, num:${SAY:1} - + _[n]um:1000 => digits/thousand _[n]um:1XXX => digits/thousand, num:${SAY:1} _[n]um:[2-9]000 => num:${SAY:0:1}, digits/thousand @@ -280,7 +280,7 @@ mode=old ; method for playing numbers and dates _[n]um:XXXXX => num:${SAY:0:2}, digits/thousand, num:${SAY:2} _[n]um:XXX000 => num:${SAY:0:3}, digits/thousand _[n]um:XXXXXX => num:${SAY:0:3}, digits/thousand, num:${SAY:3} - + _[n]um:1000000 => num:${SAY:0:1}, digits/million _[n]um:1XXXXXX => num:${SAY:0:1}, digits/million, num:${SAY:1} _[n]um:[2-9]000000 => num:${SAY:0:1}, digits/million @@ -289,11 +289,11 @@ mode=old ; method for playing numbers and dates _[n]um:XXXXXXXX => num:${SAY:0:2}, digits/million, num:${SAY:2} _[n]um:XXX000000 => num:${SAY:0:3}, digits/million _[n]um:XXXXXXXXX => num:${SAY:0:3}, digits/million, num:${SAY:3} - - _datetime::. => date:AdBY 'digits/at' H 'hours' M 'perc':${SAY} + + _datetime::. => date:AdBY 'digits/at' H 'hours' M 'perc':${SAY} _date::. => date:AdBY:${SAY} _time::. => date:H 'hours' M 'perc':${SAY} - + _pho[n]e:XXXX => num:${SAY:0:2}, num:${SAY:2:2} _pho[n]e:0[1-9]XXXXXXXX => num:${SAY:0:1}, num:${SAY:1:1}, num:${SAY:2:2}, num:${SAY:4:2}, num:${SAY:6:2}, num:${SAY:8:2} _pho[n]e:. => digit:${SAY} diff --git a/configs/samples/sip.conf.sample b/configs/samples/sip.conf.sample index ace5097596..7971b6494a 100644 --- a/configs/samples/sip.conf.sample +++ b/configs/samples/sip.conf.sample @@ -115,7 +115,7 @@ ; ** Old configuration options ** ; The "call-limit" configuation option is considered old is replaced -; by new functionality. To enable callcounters, you use the new +; by new functionality. To enable callcounters, you use the new ; "callcounter" setting (for extension states in queue and subscriptions) ; You are encouraged to use the dialplan groupcount functionality ; to enforce call limits instead of using this channel-specific method. @@ -150,7 +150,7 @@ allowoverlap=no ; Disable overlap dialing support. (Default is y ; Set this to your host name or domain name ;domainsasrealm=no ; Use domains list as realms ; You can serve multiple Realms specifying several - ; 'domain=...' directives (see below). + ; 'domain=...' directives (see below). ; In this case Realm will be based on request 'From'/'To' header ; and should match one of domain names. ; Otherwise default 'realm=...' will be used. @@ -201,8 +201,8 @@ udpbindaddr=0.0.0.0 ; IP address to bind UDP listen socket to (0.0.0 ; makes the assumption that the endpoint supports all known SIP methods. ; If you know that your SIP endpoint does not provide support for a specific ; method, then you may provide a comma-separated list of methods that your -; endpoint does not implement in the disallowed_methods option. Note that -; if your endpoint is truthful with its Allow header, then there is no need +; endpoint does not implement in the disallowed_methods option. Note that +; if your endpoint is truthful with its Allow header, then there is no need ; to set this option. This option may be set in the general section or may ; be set per endpoint. If this option is set both in the general section and ; in a peer section, then the peer setting completely overrides the general @@ -230,7 +230,7 @@ tcpbindaddr=0.0.0.0 ; IP address for TCP server to bind to (0.0.0.0 ; Optionally add a port number, 192.168.1.1:5063 (default is port 5061) ; Remember that the IP address must match the common name (hostname) in the ; certificate, so you don't want to bind a TLS socket to multiple IP addresses. - ; For details how to construct a certificate for SIP see + ; For details how to construct a certificate for SIP see ; http://tools.ietf.org/html/draft-ietf-sip-domain-certs ;tcpauthtimeout = 30 ; tcpauthtimeout specifies the maximum number @@ -385,14 +385,14 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; but the remote party's domain will be anonymized. The way legacy ; behaves may violate RFC-3325, but it follows historic behavior. ; This option is set to 'legacy' by default -;prematuremedia=no ; Some ISDN links send empty media frames before - ; the call is in ringing or progress state. The SIP +;prematuremedia=no ; Some ISDN links send empty media frames before + ; the call is in ringing or progress state. The SIP ; channel will then send 183 indicating early media ; which will be empty - thus users get no ring signal. ; Setting this to "yes" will stop any media before we have ; call progress (meaning the SIP channel will not send 183 Session ; Progress for early media). Default is "yes". Also make sure that - ; the SIP peer is configured with progressinband=never. + ; the SIP peer is configured with progressinband=never. ; ; In order for "noanswer" applications to work, you need to run ; the progress() application in the priority before the app. @@ -904,10 +904,10 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; externaddr = 12.34.56.78 ; use this address. ; externaddr = 12.34.56.78:9900 ; use this address and port. ; externaddr = mynat.my.org:12600 ; Public address of my nat box. -; externtcpport = 9900 ; The externally mapped tcp port, when Asterisk is behind a static NAT or PAT. -; ; externtcpport will default to the externaddr or externhost port if either one is set. +; externtcpport = 9900 ; The externally mapped tcp port, when Asterisk is behind a static NAT or PAT. +; ; externtcpport will default to the externaddr or externhost port if either one is set. ; externtlsport = 12600 ; The externally mapped tls port, when Asterisk is behind a static NAT or PAT. -; ; externtlsport port will default to the RFC designated port of 5061. +; ; externtlsport port will default to the RFC designated port of 5061. ; ; b. "externhost = hostname[:port]" is similar to "externaddr" except ; that the hostname is looked up every "externrefresh" seconds @@ -987,7 +987,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; can not be set per-user or per-peer. ; ; Note that this does not change the listen address for RTP, it only changes the -; advertised address in the SDP. The Asterisk RTP engine will still listen on +; advertised address in the SDP. The Asterisk RTP engine will still listen on ; the standard IP address. ; ; media_address = 172.16.42.1 @@ -1031,7 +1031,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; It only controls Asterisk generating reINVITEs for the specific ; purpose of setting up a direct media path. If a reINVITE is ; needed to switch a media stream to inactive (when placed on - ; hold) or to T.38, it will still be done, regardless of this + ; hold) or to T.38, it will still be done, regardless of this ; setting. Note that direct T.38 is not supported. ;directmedia=nonat ; An additional option is to allow media path redirection @@ -1058,11 +1058,11 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; callers INVITE. This will also fail if directmedia is enabled when ; the device is actually behind NAT. -;directmediadeny=0.0.0.0/0 ; Use directmediapermit and directmediadeny to restrict +;directmediadeny=0.0.0.0/0 ; Use directmediapermit and directmediadeny to restrict ;directmediapermit=172.16.0.0/16; which peers should be able to pass directmedia to each other ; (There is no default setting, this is just an example) ; Use this if some of your phones are on IP addresses that - ; can not reach each other directly. This way you can force + ; can not reach each other directly. This way you can force ; RTP to always flow through asterisk in such cases. ;directmediaacl=acl_example ; Use named ACLs defined in acl.conf @@ -1247,10 +1247,10 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; matches rather than the IP address. Since it is also a peer, a friend entity can ; be called as long as its IP is known to Asterisk. In the case of host=dynamic, ; this means it is necessary for the entity to register before Asterisk can call it. -; +; ; Use remotesecret for outbound authentication, and secret for authenticating ; inbound requests. For historical reasons, if no remotesecret is supplied for an -; outbound registration or call, the secret will be used. +; outbound registration or call, the secret will be used. ; ; For device names, we recommend using only a-z, numerics (0-9) and underscore ; diff --git a/configs/samples/skinny.conf.sample b/configs/samples/skinny.conf.sample index 2bf06fbc8a..9ee602e955 100644 --- a/configs/samples/skinny.conf.sample +++ b/configs/samples/skinny.conf.sample @@ -205,4 +205,3 @@ keepalive=120 ;speeddial => 112@hints,Bob Peterson ; When a context is specified, the speeddial watches a dialplan hint. ;addon => 7914 ;addon => 7914 - diff --git a/configs/samples/sla.conf.sample b/configs/samples/sla.conf.sample index b5e1ef614d..1f5a56e7bf 100644 --- a/configs/samples/sla.conf.sample +++ b/configs/samples/sla.conf.sample @@ -36,7 +36,7 @@ ; NOTE: You can not just put any type of channel here. ; DAHDI channels can be directly used. IP trunks ; require some indirect configuration which is - ; described in + ; described in ; https://wiki.asterisk.org/wiki/display/AST/SLA+Trunk+Configuration ;autocontext=line1 ; This supports automatic generation of the dialplan entries @@ -148,4 +148,3 @@ ;[station5](station) ;device=SIP/station5 ; -------------------------------------- - diff --git a/configs/samples/users.conf.sample b/configs/samples/users.conf.sample index 50b80a1c53..52f02b5ba6 100644 --- a/configs/samples/users.conf.sample +++ b/configs/samples/users.conf.sample @@ -111,4 +111,3 @@ pickupgroup = 1 ;LINEKEYS = 1 ;linenumber = 1 ;cid_number = 6000 - diff --git a/configs/samples/voicemail.conf.sample b/configs/samples/voicemail.conf.sample index 84e83a3447..c90f8513c8 100644 --- a/configs/samples/voicemail.conf.sample +++ b/configs/samples/voicemail.conf.sample @@ -245,7 +245,7 @@ pagerdateformat=%A, %B %d, %Y at %r ; overridden in the per-mailbox settings, unless listed otherwise. ; ; tz=central ; Timezone from zonemessages below. Irrelevant if envelope=no. -; locale=de_DE.UTF-8 ; set the locale for generation of the date/time strings (make +; locale=de_DE.UTF-8 ; set the locale for generation of the date/time strings (make ; sure the locales are installed in your operating system; e.g ; on Debian Linux you can use "dpkg-reconfigure locales"). ; If you use UTF-8 locales, make sure to set the "charset" option @@ -259,8 +259,8 @@ pagerdateformat=%A, %B %d, %Y at %r ; Useful if Windows users want wav49, but Linux users want gsm. ; [per-mailbox only] ; saycid=yes ; Say the caller id information before the message. If not described, - ; or set to no, it will be in the envelope. When enabled, if a recorded file - ; with the same name as the caller id exists in + ; or set to no, it will be in the envelope. When enabled, if a recorded file + ; with the same name as the caller id exists in ; /recordings/callerids, then that file will be played as a name ; rather than saying each digit as a phone number. ; cidinternalcontexts=intern ; Internal Context for Name Playback instead of diff --git a/configs/samples/xmpp.conf.sample b/configs/samples/xmpp.conf.sample index e3a4be142b..4bd9a92750 100644 --- a/configs/samples/xmpp.conf.sample +++ b/configs/samples/xmpp.conf.sample @@ -62,4 +62,3 @@ ; "default" will be used. ;forceoldssl=no ; Force the use of old-style SSL. ;keepalive= - diff --git a/contrib/README.festival b/contrib/README.festival index 24912827c9..bd9d17bded 100644 --- a/contrib/README.festival +++ b/contrib/README.festival @@ -1,15 +1,15 @@ app_festival is an application that allows one to send text-to-speech commands to a background festival server, and to obtain the resulting waveform which -gets sent down to the respective channel. app_festival also employs a waveform -cache, so invariant text-to-speech strings ("Please press 1 for instructions") -do not need to be dynamically generated all the time. +gets sent down to the respective channel. app_festival also employs a waveform +cache, so invariant text-to-speech strings ("Please press 1 for instructions") +do not need to be dynamically generated all the time. -You need : +You need : 1) festival, patched to produce 8khz waveforms on output. Patch for Festival -1.4.2 RELEASE are included. The patch adds a new command to festival -(asterisk_tts). +1.4.2 RELEASE are included. The patch adds a new command to festival +(asterisk_tts). It is possible to run Festival without patches in the source-code. Just add this to your /etc/festival.scm or /usr/share/festival/festival/scm: @@ -30,7 +30,7 @@ add this to your /etc/festival.scm or /usr/share/festival/festival/scm: original mentioning of it] 2) You may wish to obtain and install the asterisk-perl -module by James Golovich , from +module by James Golovich , from either CPAN, or his site: http://asterisk.gnuinter.net, as this contains a good example of how variable text can be tts'd via asterisk, namely the examples/tts-*.agi @@ -41,7 +41,7 @@ can be ideal for these sorts of needs. For simpler usage, fixed, pre-recorded messages may be more amenable for your purposes. -3) Before running asterisk, you have to run festival-server with a command -like : +3) Before running asterisk, you have to run festival-server with a command +like : /usr/local/festival/bin/festival --server > /dev/null 2>&1 & diff --git a/contrib/ast-db-manage/cdr/versions/210693f3123d_create_cdr_table.py b/contrib/ast-db-manage/cdr/versions/210693f3123d_create_cdr_table.py index 3ea9ed1532..650015f2a0 100644 --- a/contrib/ast-db-manage/cdr/versions/210693f3123d_create_cdr_table.py +++ b/contrib/ast-db-manage/cdr/versions/210693f3123d_create_cdr_table.py @@ -61,4 +61,3 @@ def upgrade(): def downgrade(): op.drop_table('cdr') - diff --git a/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py b/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py index 215726fa05..9fa09f0613 100644 --- a/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py +++ b/contrib/ast-db-manage/config/versions/1758e8bbf6b_increase_useragent_column_size.py @@ -38,4 +38,3 @@ def upgrade(): def downgrade(): op.alter_column('sippeers', 'useragent', type_=sa.String(20)) - diff --git a/contrib/ast-db-manage/config/versions/28887f25a46f_create_queue_tables.py b/contrib/ast-db-manage/config/versions/28887f25a46f_create_queue_tables.py index 59ddac7cd1..084952d710 100644 --- a/contrib/ast-db-manage/config/versions/28887f25a46f_create_queue_tables.py +++ b/contrib/ast-db-manage/config/versions/28887f25a46f_create_queue_tables.py @@ -138,4 +138,3 @@ def downgrade(): sa.Enum(name=QUEUE_STRATEGY_NAME).drop(op.get_bind(), checkfirst=False) sa.Enum(name=QUEUE_AUTOPAUSE_NAME).drop(op.get_bind(), checkfirst=False) - diff --git a/contrib/ast-db-manage/config/versions/4a6c67fa9b7a_add_fax_detect_timeout_option.py b/contrib/ast-db-manage/config/versions/4a6c67fa9b7a_add_fax_detect_timeout_option.py index 91774c447c..42f39779ca 100644 --- a/contrib/ast-db-manage/config/versions/4a6c67fa9b7a_add_fax_detect_timeout_option.py +++ b/contrib/ast-db-manage/config/versions/4a6c67fa9b7a_add_fax_detect_timeout_option.py @@ -20,4 +20,3 @@ def upgrade(): def downgrade(): op.drop_column('ps_endpoints', 'fax_detect_timeout') - diff --git a/contrib/ast-db-manage/config/versions/837aa67461fb_ps_contacts_add_authenticate_qualify.py b/contrib/ast-db-manage/config/versions/837aa67461fb_ps_contacts_add_authenticate_qualify.py index 033a999af6..5fde44ffb7 100644 --- a/contrib/ast-db-manage/config/versions/837aa67461fb_ps_contacts_add_authenticate_qualify.py +++ b/contrib/ast-db-manage/config/versions/837aa67461fb_ps_contacts_add_authenticate_qualify.py @@ -31,4 +31,3 @@ def downgrade(): if op.get_context().bind.dialect.name == 'mssql': op.drop_constraint('ck_ps_contacts_authenticate_qualify_yesno_values','ps_contacts') op.drop_column('ps_contacts', 'authenticate_qualify') - diff --git a/contrib/ast-db-manage/config/versions/a6ef36f1309_ps_globals_add_ignore_uri_user_options.py b/contrib/ast-db-manage/config/versions/a6ef36f1309_ps_globals_add_ignore_uri_user_options.py index 55d3d3811a..f9412a655b 100644 --- a/contrib/ast-db-manage/config/versions/a6ef36f1309_ps_globals_add_ignore_uri_user_options.py +++ b/contrib/ast-db-manage/config/versions/a6ef36f1309_ps_globals_add_ignore_uri_user_options.py @@ -31,4 +31,3 @@ def downgrade(): if op.get_context().bind.dialect.name == 'mssql': op.drop_constraint('ck_ps_globals_ignore_uri_user_options_yesno_values','ps_globals') op.drop_column('ps_globals', 'ignore_uri_user_options') - diff --git a/contrib/ast-db-manage/config/versions/d39508cb8d8_create_queue_rules.py b/contrib/ast-db-manage/config/versions/d39508cb8d8_create_queue_rules.py index 740972103d..fd0f35ad4b 100644 --- a/contrib/ast-db-manage/config/versions/d39508cb8d8_create_queue_rules.py +++ b/contrib/ast-db-manage/config/versions/d39508cb8d8_create_queue_rules.py @@ -28,4 +28,3 @@ def downgrade(): ########################## drop tables ########################### op.drop_table('queue_rules') - diff --git a/contrib/ast-db-manage/env.py b/contrib/ast-db-manage/env.py index 1864239135..5036f4ccfe 100644 --- a/contrib/ast-db-manage/env.py +++ b/contrib/ast-db-manage/env.py @@ -150,4 +150,3 @@ if context.is_offline_mode(): run_migrations_offline() else: run_migrations_online() - diff --git a/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py b/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py index f06cbf10e6..2b89427619 100644 --- a/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py +++ b/contrib/ast-db-manage/voicemail/versions/39428242f7f5_increase_recording_column_size.py @@ -41,4 +41,3 @@ def upgrade(): def downgrade(): op.alter_column('voicemail_messages', 'recording', type_=sa.LargeBinary) - diff --git a/contrib/asterisk-ices.xml b/contrib/asterisk-ices.xml index abc028c752..afbc87db73 100644 --- a/contrib/asterisk-ices.xml +++ b/contrib/asterisk-ices.xml @@ -70,7 +70,7 @@ and samplerate given in the parameters to the oss input module above or the remsaple/downmix section below. --> - + 0 8000 1 @@ -80,9 +80,9 @@ 0 - +