April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13173 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 18:36:03 2009 New Revision: 13173 Log: parse out alert-info and call-info from infos Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Apr 27 18:36:03 2009 @@ -2908,6 +2908,8 @@ const char *to_uri = switch_event_get_header(event, "to-uri"); const char *local_user_full = switch_event_get_header(event, "local-user"); const char *from_uri = switch_event_get_header(event, "from-uri"); + const char *call_info = switch_event_get_header(event, "call-info"); + const char *alert_info = switch_event_get_header(event, "alert-info"); const char *body = switch_event_get_body(event); sofia_profile_t *profile = NULL; nua_handle_t *nh; @@ -2972,7 +2974,9 @@ nua_info(nh, NUTAG_WITH_THIS(profile->nua), - TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), + TAG_IF(ct, SIPTAG_CONTENT_TYPE_STR(ct)), + TAG_IF(alert_info, SIPTAG_ALERT_INFO_STR(alert_info)), + TAG_IF(call_info, SIPTAG_ALERT_INFO_STR(call_info)), TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), TAG_END()); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Apr 27 18:36:03 2009 @@ -107,6 +107,10 @@ #include <sofia-sip/tport_tag.h> #include <sofia-sip/sip_extra.h> #include "nua_stack.h" +#include "sofia-sip/msg_parser.h" +#include "sofia-sip/sip_parser.h" +#include "sofia-sip/tport_tag.h" + typedef enum { DTMF_2833, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Apr 27 18:36:03 2009 @@ -35,9 +35,7 @@ * */ #include "mod_sofia.h" -#include "sofia-sip/msg_parser.h" -#include "sofia-sip/sip_extra.h" -#include "sofia-sip/tport_tag.h" + extern su_log_t tport_log[]; extern su_log_t iptsec_log[]; @@ -4010,7 +4008,8 @@ if (switch_event_create(&event, SWITCH_EVENT_RECV_INFO) == SWITCH_STATUS_SUCCESS) { - + sip_alert_info_t *alert_info = sip_alert_info(sip); + if (sip && sip->sip_content_type) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SIP-Content-Type", sip->sip_content_type->c_type); } @@ -4046,6 +4045,16 @@ } } + + if (sip->sip_call_info) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Call-Info", sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info)); + } + + if (alert_info) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Alert-Info", sip_header_as_string(nua_handle_home(nh), (void *) alert_info)); + } + + if (sip->sip_payload && sip->sip_payload->pl_data) { switch_event_add_body(event, "%s", sip->sip_payload->pl_data); }

1 0

[commit] r13172 - freeswitch/trunk/docs
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mcollins Date: Mon Apr 27 13:38:54 2009 New Revision: 13172 Log: update changelog through april 26, 2009 (r13159) Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Mon Apr 27 13:38:54 2009 @@ -48,11 +48,13 @@ build: use different version file for moh version (r:13093) build: de-couple version numbers and builds of sound files and moh files (FSBUILD-153/r:13096) build: use sound_version.txt and moh_version.txt to determine sound file version on windows (FSBUILD-152/r:13097) + build: use in tree libtiff for msvc build and fix some header generation checks (r:13150) config: default config, calling own extension no longer goes to voicemail (r:12596) config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838) config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938) config: Update sample IVR to include ClueCon reg option :) (r:13043) config: Add ext 9991 as ClueCon ext; use transfer instead of bridge on demo ivr opt #4 (r:13046) + config: remove invalid options from profiles (r:13153) core: fix suncc visibility support in libteletone (r:12154-12157) core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402) core: add separate mutex for state related methods (r:12191) @@ -125,6 +127,7 @@ core: make state_handler macros not let you install the same one more than once (r:13111) core: Do not use struct fd_set uninitialized (always FD_ZERO() them, before using FD_SET() on a new one, or reusing them after select()). Fixes a segfault on solaris (r:13125) core: Fix missing UNPROTECT_INTERFACE in case pre_answer fails (r:13130) + core: add record_waste_resources channel variable to send blank audio during recording (r:13144) docs: Fix filename references in phrase_en.xml (r:12976) docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) docs: Updates to phrase_es.xml (r:13067) @@ -176,6 +179,7 @@ mod_commands: add show modules functionality (MODAPP-227/r:12806) mod_commands: add echo api command (echo back exact input) and add expand api command (executes another api command with variable expansion) (r:13101,13102) mod_commands: add "stun" fsapi command (r:13137) + mod_commands: mod_commands: if no bind ip specified for stun fsapi command, use the guess ip (r:13140) mod_conference: fix read terminating on single digit when called from a meta-app inside a conference (MODAPP-226/r:12466) mod_conference: recording members should be invisible to commands (MODAPP-233/r:12582) mod_conference: add lock caller_control (r:12787) @@ -228,6 +232,9 @@ mod_loopback: fix loopback channels that stay alive (FSCORE-349/r:12944,12953) mod_loopback: flush queued frames on audio sync event (r:13018) mod_loopback: autoflush these channels that use queues (r:13057) + mod_loopback: pass flush indications across to the b leg (r:13146) + mod_loopback: make mod_loopback render silence to prevent livelock (r:13147) + mod_loopback: drop excess frames on loopback channel (r:13156,13157,13158) mod_memcache: add new module, mod_memcache; API for memcached (r:12871) mod_memcache: make -ERR for API call less verbose (r:12949) mod_memcache: add hook reloadxml event (r:12950) @@ -305,6 +312,7 @@ mod_sofia: add calls count and failed calls count to sofia profile sorted by direction (r:13103) mod_sofia: only pass 2833 while bridged and while bridged to another channel that uses our RTP stack (r:13131) mod_sofia: send-message-query-on-register profile param, set it to false to disable default of true (r:13139) + mod_sofia: fix segfault in sofia xmlstatus profile command (MODENDP-214/r:13141) mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the @@ -318,6 +326,7 @@ mod_voicemail: add parameter "login-keys" to allow user to customize which key is used to log in (MODAPP-251/r:12916) mod_voicemail: change len to seconds (r:13127) mod_voicemail: message-query-exact-match global param in settings section of voicemail to assume profile names match domain names (r:13138) + mod_voicemail: allow unload and reload of mod_voicemail (MODAPP-177/r:13145) mod_xml_curl: fix data fetch (MODXMLINT-48/r:12586) sofia-sip: su.h - define su_family via struct sockaddr (r:12260) sofia-sip: sip_parser.c - fixed sip_transport_d() (r:12261)

1 0

[commit] r13171 - freeswitch/trunk/docs
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mcollins Date: Mon Apr 27 13:29:14 2009 New Revision: 13171 Log: add changelog items since 1.0.3 through r13139 (part deux) Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Mon Apr 27 13:29:14 2009 @@ -1,5 +1,5 @@ freeswitch (1.0.4) - + add: TextMate bundle for FreeSWITCH - thanks mrene (r:12559-12560) all: numerous code cleanups, removal of unused variables all: update numerous Doxygen comments @@ -58,8 +58,272 @@ core: add separate mutex for state related methods (r:12191) core: move media bug removal to hangup state (r:12225) core: create indexes for ODBC (r:12235) - core: add direction col to sql db, add direction param to session_c - + core: add direction col to sql db, add direction param to session_create, log DTMF digits to digits_dialed variable for CDR (r:12244) + core: avoid operations on closed file handles in embedded languages (r:12255) + core: fix bridging issue from r:12244 (FSCORE-308/r:12257) + core: fix segfault after 2000 calls, 5 days uptime (FSCORE-309/r:12267-12270) + core: fix crash in switch_ivr_digit_stream_parser_feed (MODAPP-221/r:12262) + core: fix issue in monitor_early_media_fail (r:12271) + core: fix leak in switch_event.c (r:12291-12292) + core: clean up ivr_menu, prevent recursion (r:12295) + core: improve memory usage (r:12317) + core: fix leak in switch_ivr_async.c (r:12330) + core: fix leak in switch_channel.c (r:12332) + core: uuid_displace stopped working when limit arg used (MODAPP-225/r:12368) + core: fix att_xfer media bug problem (FSCORE-317/r:12390) + core: improve stability (FSCORE-297/FSCORE-305/FSCORE-315/r:12392,12403) + core: add new state for CDR and leg_delay_start originate var (r:12403-12404) + core: Make MESSAGE work with SIP PATH Exension (FSCORE-310/r:12426) + core: fix uninitialized mutex in switch_core_media_bug (FSCORE-320/r:12428) + core: fix segfault with eavesdrop (FSCORE-319/r:12429) + core: add generic config parser - thanks mrene (r:12432) + core: add sessions since start up to heartbeat event (r:12472) + core: increase buffer size for regex api (MODAPP-228/r:12480) + core: fix FreeSWITCH start failure - "Error: stacksize 240 is too large" (FSCORE-323/r:12509) + core: unloading endpoint module now removes from endpoint list (MODENDP-196/r:12535) + core: fix deadlock in fsctl hupall (r:12544) + core: add origination_pricavy var to originate api (r:12546) + core: increase stack limit for switch_system (FSCORE-328/r:12569) + core: fix uuid_originate param not assigning uuid properly (FSCORE-322/r:12591) + core: add check for a and b leg no answer on bridge (r:12595) + core: fix origination_privacy var (r:12603) + core: fix group_confirm regression from svn r12403 (r:12616) + core: fix caller ID values not being set in CHANNEL_OUTGOING (FSCORE-336/r:12643) + core: make -vg imply -waste so valgrind runs won't re-exec (r:12670) + core: add apr_pool_mutex_set() to our apr to fix thread-saftey issue (r:12672) + core: make port allocator more random (r:12673,12675) + core: make switch_channel_get_variable strdup so the pointer returned is safe and clean up the state locking (r:12674) + core: Empty audio files should not be created when RECORD_ANSWER_REQ is set to true and a call is not bridged (r:12682) + core: add transfer_after_bridge var (r:12691) + core: other_leg_unique_id incorrectly set when briding with using ',' (FSCORE-331/r:12704) + core: make gaussian noise less noisy (FSCORE-340/r:12720) + core: add import vars to FIFO (r:12722) + core: fix switch_core_file_write method not writing the entire buffer to the file (FSCORE-341/r:12728) + core: fix hanguphook order of operations vs destroy method issue in c++ code (r:12730) + core: rearrange hangup callflow to do more work in the session's own thread (r:12784) + core: Allow variables containing variables in set and export (MODAPP-241/r:12804) + core: add read_terminator_used var (r:12840) + core: change blocking rtp to psuedo-blocking to avoid endlessly blocking reads and refactor jitter buffer (r:12846) + core: add rtp-autoflush profile param and rtp_autoflush var (r:12854) + core: fix various small leaks (FSCORE-347/r:12873) + core: add a couple, two tree stats (r:12913) + core: fix play_and_get_digits to unset the var if the regex didn't match (r:12921) + core: drop divide by 2 from normalize func (r12935) + core: add missing begin/end, allow threads to read and play_and_get_digits methods (r:12958) + core: fix windows calling conventions for modules with sub-modules broken in svn r12919 (r:12960) + core: add flag to denote if a codec is init or not (FSCORE-349/r:12961) + core: add more specific checks to new macro just to be safe (r:12973) + core: change CS_DONE to CS_DESTROY and add state handler for destroy and tear down critical parts of the channel from this method which is not called until it's impossible for anything to be referencing the channel (after final write lock and before destroying the pool) (r:12986) + core: fix regression from earlier commit (FSCORE-352/r:12987) + core: expand channel variables for sound files in IVRs (MODAPP-257/r:13005) + core: clone frames in loopback so we can smooth it out better, now with more memory usage (tm) maybe this will curb pepople from using it like candy (r:13011) + core: run expand_vars if input contains a special escaped character not just when it contains a variable to eat up back slashes (r:13015) + core: change names to be more explicit (r:13028) + core: xml_config: Fix issue where default NULL strings were ignored on reload (r:13052) + core: autoflush on bridge and add bridge_hangup_cause variable to indicate the hangup cause of the last bridged channel (r:13065) + core: add record_ms, record_samples, playback_ms and playback_samples chanvars (r:13105) + core: make state_handler macros not let you install the same one more than once (r:13111) + core: Do not use struct fd_set uninitialized (always FD_ZERO() them, before using FD_SET() on a new one, or reusing them after select()). Fixes a segfault on solaris (r:13125) + core: Fix missing UNPROTECT_INTERFACE in case pre_answer fails (r:13130) + docs: Fix filename references in phrase_en.xml (r:12976) + docs: Update phrase_en.xml to include v1.0.8 sound prompts (r:13041) + docs: Updates to phrase_es.xml (r:13067) + docs: Latest revision of Spanish prompts file (r:13115) + formats: add mod_portaudio_stream to get audio from any dev (MODFORM-25/r:12178) + fs_cli: fix solaris build (r:12160) + ivr: make tts-engine and tts-voice valid attributes on the menu xml (r:12278) + libdingaling: hijack gcrypt init call to fix threadsafe race in dingaling and fix buffer overrun in iksemel (r:12575) + libdingaling: add ldl_handle_running (r:13085) + libdingaling: add a function to check for connected and authorized (r:13100) + libdingaling: fix auto-restart on disconnect (r:13134) + libesl: add api, bgapi methods (r:12179) + libesl: add ruby example (r:12180) + libesl: add python example (r:12184) + libesl: fix missing Event-Name param (MODEVENT-39/r:12311) + libesl: example of using esl to get events for ASR (r:12344) + libesl: improved filter handling (r:12488-12489) + libesl: fix ESL segfault when bgapi is called twice and BACKGROUD_JOB events are subscribed (ESL-5/r:12525) + libesl: fix illegal free when invalid bgapi originate args (ESL-8/r:12623) + libesl: add disconnect method; add ivrd (r:12724) + libesl: add command line args to single_command.py example (ESL-9/r:12729) + libesl: check in ESL::IVR perl mod (r:12760) + libesl: fix ruby linking on debian (ESL-7/r:12805) + libesl: fix esl coredumps in esl_event_serialize when using sendEvent from PHP (ESL-11/r:12884) + libesl: add event name when sending (r:12889) + libesl: add ESL::IVR::setVar from intralanman (r:12917) + libesl: fix ESL/IVR to include the regex (r:12921) + libesl: fix ctrl-D in fs_cli not to exit unless cmd line is empty (ESL-13/r:12952) + libesl: fix undef check (r:13012) + libesl: kill zombies (r:13013) + libesl: don't double encode events when sending them (r:13078) + libesl: adding sendevent example for esl perl (r:13079) + libiksemel: let return 0 be a failure on read in iks to avoid cpu race (r:13123,13124,13133) + libsndfile: add executable permissions to libs/libsndfile/src/create_symbols_file.py (FSBUILD-134/r:12535) + libsofiasip: Fix compile time out-of-bounds error in su_uniqueid.c (SFSIP-136/r:12914) + libsofiasip: make info work out of dialog (r:13087) + libspandsp: update to snapshot spandsp-20090421 (r:13086) + libspeex: Add visibility support for suncc on solaris (r:13117,13118) + libteletone: update api visibility macros for windows + libtiff: add libtiff, v3.8.2 + libxmlrpc: add select to read socket in abyss so we can timeout (r:13107) + mod_cidlookup: add new module, mod_cidlookup (r:12990) + mod_cidlookup: switch to using CURL instead of mod_http (r:12992) + mod_cidlookup: add config file (r:12994) + mod_cidlookup: set initial value for status (r:13029) + mod_clue_choo: add new module, mod_clue_choo (r:13068,13069,13070) + mod_commands: Add show api [name] and show application [name] (r:12296) + mod_commands: fix header_string "key" from being set twice from SWITCH_STANDARD_API(user_data_function) (MODAPP-242/r:12786) + mod_commands: add show modules functionality (MODAPP-227/r:12806) + mod_commands: add echo api command (echo back exact input) and add expand api command (executes another api command with variable expansion) (r:13101,13102) + mod_commands: add "stun" fsapi command (r:13137) + mod_conference: fix read terminating on single digit when called from a meta-app inside a conference (MODAPP-226/r:12466) + mod_conference: recording members should be invisible to commands (MODAPP-233/r:12582) + mod_conference: add lock caller_control (r:12787) + mod_conference: only first call to a conf requires a profile; fix bgdial (MODAPP-245/r:12809) + mod_conference: add conference_enforce_security variable to bypass or require pin or locked flag (r:12863) + mod_conference: clean up pin prommpting and make local override stay local (r:12864) + mod_conference: keep new conference locked the whole time during transfer (r:12988) + mod_conference: allow setting the moh_sound from a variable (r:13042) + mod_conference: set perpetual_sound from channel var (r:13048) + mod_conference: increase sanity timer for conference auto-record to 120 seconds (r:13104) + mod_conference: serialize (r:13116) + mod_console: Fix mod_console (missing FD_ZERO before FD_SET) (r:13126) + mod_dahdi_codec: delay init of resources until the first time they are actually used to avoid unnecessary waste of resources in hardware codec (r:12962) + mod_dingaling: fix crash when unloading/reload mod_dingaling (LBDING-13/r:12612) + mod_dingaling: fix no sound if phone picked up after 5th dingaling on Gtalk client (MODENDP-198/r:12641) + mod_dingaling: fix core dump when calling Gtalk enabled FS using leg_timeout (MODENDP-199/r:12641) + mod_dingaling: dl_login command line Usage and parameter doesn't match (MODENDP-202/r:12680) + mod_dingaling: fix unload mod_dingaling core dump (MODENDP-204/r:12680) + mod_dptools: prevent system crash when "user" in originate dialstring (FSCORE-313/r:12395) + mod_dptools: added sched_heartbeat and enable_heartbeat dialplan apps (r:12491) + mod_dptools: fix b & c legs not bridging when attended transfer used (FSCORE-334/r:12649) + mod_dptools: Custom events fired from event application bypass filtering mechanism (MODAPP-249/r:12894) + mod_dptools: change inline limit from 4 to 128 apps (MODAPP-253/r:12957) + mod_enum: fix enum_auto_route (MODAPP220/r:12243) + mod_erlang_event: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. (r:12249) + mod_erlang_event: Reply appropriately to net_adm:ping() (r:13066) + mod_erlang_event: snprintf needs a format string too, and write has the warn_unused_result attribute set, so store the return value somewhere (r:13090) + mod_event_socket: disallow unloading mod_event_socket from event socket (r:12326,12334) + mod_event_socket: fix api_exec crash on OSX (MODEVENT-40,r:12349) + mod_event_socket: move connect command to always work on outbound socket not just the first time (r:12723) + mod_fifo: consumer callback waiting an option in fifo.conf.xml (r:12685) + mod_fifo: add fire events on bridge in fifo (r:12791) + mod_fifo: fix fifo re-parse crash (FSCORE-343/r:12855) + mod_fifo: fix uuid_transfer into mod_conference audio issue (MODAPP-259/r:13030) + mod_fifo: add fifo_orbit_dialplan and fifo_orbit_context vars (MODAPP-189/r:13038) + mod_fifo: don't do wrapup when agent is in nowait mode or call has ended (r:13094) + mod_flite: three new voices - rms, awb (male), slt (female) (r:12166) + mod_iax: make mod_iax async (r:13021) + mod_iax: autoflush these channels that use queues (r:13057) + mod_lcr: allow channel vars in custom_sql (r:12198) + mod_limit: Add events and a shutdown function (r:12497) + mod_limit: close odbc handle (r:12632) + mod_limit: Add more error checking to hash api/app (r:13007) + mod_limit: prevent multiple bindings of the same event_hooks to make code simpler in mod_limit (MODAPP-264/r:13113) + mod_lua: windows build changes to support externally built modules. (MODLANG-101/r:12237) + mod_lua: fix visibility support (FSCORE-302/r:12239-12240) + mod_lua: fix windows build (FSBUILD-149/r:12919) + mod_loopback: mod_lopback: other_loopback _leg_uuid variables are sometimes unset while executing the dialplan (MODENDP-210/r:12905) + mod_loopback: destroy codec (r:12936) + mod_loopback: fix loopback channels that stay alive (FSCORE-349/r:12944,12953) + mod_loopback: flush queued frames on audio sync event (r:13018) + mod_loopback: autoflush these channels that use queues (r:13057) + mod_memcache: add new module, mod_memcache; API for memcached (r:12871) + mod_memcache: make -ERR for API call less verbose (r:12949) + mod_memcache: add hook reloadxml event (r:12950) + mod_memcache: unbind the reloadxml event handler on shutdown (r:12954) + mod_memcache: Fix C99 error, move var declaration out of the "for()" statement (no -std=c99?) (r:12959) + mod_memcache: cleanup xml config handling (r:13050,13051) + mod_nibblebill: mod_nibblebill question: DB Error while updating cash (MODAPP-229/r:12907) + mod_nibblebill: Updated mod_nibblebill to work properly w/ postgres fields (r:13031) + mod_opal: Fixed transmission of Q.931 Calling-Party-Number, and DisplayName on H.323 Setup (r:12347) + mod_opal: allocate frame from session pool so it will not go out of scope (r:12811) + mod_opal: disable visibility support broken in newer gcc (MODENDP-190/r:12923) + mod_opal: add dtmf method to mod_opal (r:13002) + mod_opal: Applied patch to fix some race conditions on call termination (r:13014) + mod_opal: prevent endless loop (r:13034) + mod_opal: Fixed ability to send a string as user indications (DTMF) (r:13049) + mod_opal: try to flag CNG frames (MODOPAL-6/r:13098) + mod_perl: Libtool build fix for mod_perl: use LIBTOOL_LIB_EXTEN to make libtool-2.2 happy and CXXLINK since we are linking a C++ lib (r:13080) + mod_pocketsphinx: Revamp mod_pocketsphinx to use jsgf format (r:12224) + mod_portaudio: fix audio issue in portaudio (r:12669) + mod_python: fix core dump when using startup script (MODLANG-106/r:12648) + mod_python: fix python failing during loading startup modules (MODLANG-105/r:12658) + mod_python: fix EventConsumer::pop() can deadlock mod_python (MODLANG-109/r:12849) + mod_say_en: fix missing "at" in time readback, change from cardinal to ordinal numbers on dates, e.g. "January 20th" vs. "January 20" (MODAPP-263/r:13099) + mod_say_es: Add stub phrase_es.xml (r:13019) + mod_say_ru: add Russian language say module and config files (r:12966-12971) + mod_say_ru: change encoding on phrase_ru.xml from cp1251 to utf8 (r:12974) + mod_say_ru: add .wav and small fix (r:13000) + mod_say_ru: change char million,thousand to enum (r:13009) + mod_say_ru: rename currency (r:13024) + mod_say_ru: change dollars and cents to rubles and kopecks (r:13025) + mod_say_ru: add ru_ip (r:13026) + mod_say_ru: Update phrase_ru.xml to include v1.0.8 sound prompts (r:13044,13045) + mod_skel: add more example code and info (r:12459) + mod_skypiax: move to trunk (r:12167) + mod_skypiax: fix hang on invalid mod_skypiax.conf.xml (MODSKYPIAX-21/r:12320-12322,12343) + mod_skypiax: modified configs/startskype.sh to specify which unix user will start the Skype client instance (r:12937) + mod_skypiax: fixed assignment before declaration on Windows VC++ (r:12956) + mod_skypiax: great startup speedup in Windows (using only one Broadcast sendmessage for each interface hunting) (r:13083) + mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327/r:12577) + mod_spidermonkey: fix error loading mod_spidermonkey due to missing PR_* symbols (r:12934,12939) + mod_spidermonkey: add destroy method to js (r:13016) + mod_spidermonkey: Let session.destroy() take the cause as a string too (r:13020) + mod_sofia: allow you to set invite, to and from params independently (r:12287) + mod_sofia: allow add params to a contact that isn't a gateway (r:12289) + mod_sofia: add sip_route_uri var to set proxy route (r:12408) + mod_sofia: add sip_send_to Sofia dial param (MODEND-195/r:12409) + mod_sofia: add siptrace on/off to sofia command (r:12410,12412) + mod_sofia: add network_ip and network_port to registration ODBC table and registration event (MODENDP-194/r:12414) + mod_sofia: add configurable outgoing cid types (r:12427) + mod_sofia: send SIP INFO DTMF to the bridged leg in bypass media mode (FSCORE-263) + mod_sofia: add extension-in-contact param for rare cases when provider makes you say a certain contact user (r:12511) + mod_sofia: add contact-host param to gateways (r:12531) + mod_sofia: add sip_from_display var and fix backwards switch_strisr calls (r:12566) + mod_sofia: remove Redundant NTATAG_DEFAULT_PROXY (MODENDP-197/r:12583) + mod_sofia: reset rtp timer on unhold operation (r:12617) + mod_sofia: fix G.722 call with broken ptime triggers crash after transfer between contexts (FSCORE-337/r:12647) + mod_sofia: fix presence subscription not automatically refreshed due to wrong Contact in 202 (refer accepted) response. (MODENDP-201/r:12657) + mod_sofia: fix random segfaults (FSCORE-322/r:12676) + mod_sofia: fix registration issue (r:/12715) + mod_sofia: add username and realm to sip db (r:12785) + mod_sofia: fix subscriptions being checked even though it belongs to other host (MODAPP-207/r:12792) + mod_sofia: reduce exponential mwi notifies (r:12801) + mod_sofia: don't auto-disable, just warn on RFC2833 in transcoded call (r:12815) + mod_sofia: add 603 for now (r:12883) + mod_sofia: make nat options ping configurable and leave it off by default (r:12897) + mod_sofia: continue_on_fail broken on SVN12881 (MODENDP-209/r:12902) + mod_sofia: add rtp-autofix-timing (defauts to true even when not present) set to false to disable it (FSCORE-281/r:12903,12904) + mod_sofia: add set r_sdp_codec_string to list of codecs offered in inbound call dsp (MODENDP-206/r:12946) + mod_sofia: add sip_call_info variable (SFSIP-138/r:12977) + mod_sofia: move rtp stats up to where they will be more useful (r:13017) + mod_sofia: fix FreeSWITCH/SIPX transfer issue (SFSIP-86/r:13032) + mod_sofia: ndlb_sendrecv_in_session var NDLB-sendrecv-in-session profile option to reverse the effects of MODENDP-148 (r:13084) + mod_sofia: add sip info to event_socket gateway (r:13088) + mod_sofia: switch_add_event_header needs a format specifier, or >=gcc-4.3 will be very unhappy (r:13089) + mod_sofia: add calls count and failed calls count to sofia profile sorted by direction (r:13103) + mod_sofia: only pass 2833 while bridged and while bridged to another channel that uses our RTP stack (r:13131) + mod_sofia: send-message-query-on-register profile param, set it to false to disable default of true (r:13139) + mod_spy: add new module, mod_spy (MODAPP-260/r:13035,13036) + mod_syslog: Keep the indent string in memory (LOGGER-1/r:12852) + mod_t38gateway: Introduction of the skeleton of a media bug implementing a T.38 gateway, so the + related infrastructure work can take place around it (r:13082) + mod_voicemail: remove endless loop on leaving message (MODAPP-233,r:12315-12316) + mod_voicemail: add indexes to mod_voicemail (r:12341) + mod_voicemail: fix audio cutoffs in voicemail_leave_main (MODAPP-225/r:12367) + mod_voicemail: fix profile id mismatch when changing password via menu (MODAPP-236/r:12602) + mod_voicemail: fix incorrect (NULL) recipient stored for VM on dynamic binding of FS directory. (MODAPP-240/r:12850) + mod_voicemail: fix segfault on vm_boxcount when box has "sip:" prefix (MODAPP-250/r:12915) + mod_voicemail: add parameter "login-keys" to allow user to customize which key is used to log in (MODAPP-251/r:12916) + mod_voicemail: change len to seconds (r:13127) + mod_voicemail: message-query-exact-match global param in settings section of voicemail to assume profile names match domain names (r:13138) + mod_xml_curl: fix data fetch (MODXMLINT-48/r:12586) + sofia-sip: su.h - define su_family via struct sockaddr (r:12260) + sofia-sip: sip_parser.c - fixed sip_transport_d() (r:12261) + spandsp: update to snapshot 20090308 (r:12514) + support: Add print_list gdb macro (r:12687) + freeswitch (1.0.3)

1 0

[commit] r13170 - freeswitch/trunk/docs
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mcollins Date: Mon Apr 27 13:24:07 2009 New Revision: 13170 Log: add changelog items since 1.0.3 through r13139 Modified: freeswitch/trunk/docs/ChangeLog Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Mon Apr 27 13:24:07 2009 @@ -1,3 +1,66 @@ +freeswitch (1.0.4) + + add: TextMate bundle for FreeSWITCH - thanks mrene (r:12559-12560) + all: numerous code cleanups, removal of unused variables + all: update numerous Doxygen comments + build: fix mod_flite (FSBUILD-126/r:12153) + build: fix getlib.sh curl/wget detection (12175) + build: add msvc 2005 project files (r:12197) + build: rename spandsp project files windows (r:12195) + build: fix spandsp windows build, msvc 2005 (r:12199-12202) + build: merge x64 build for msvc9 (r:12207) + build: add libtiff auto-download to msvc build (r:12212) + build: update to match spandsp api (FSBUILD-129/r:12214) + build: inital work on x64 windows build (FSBUILD-125/r:12215) + build: fix spandsp msvc build issues (r:12218-12220,12223) + build: fix msvc configuration manager for x64 targets in both 2008 sln files (r:12227) + build: use compiler intrinsics for windows x64 build (FSBUILD-131/r:12245) + build: fix version generator on windows (FSBUILD-115/FSBUILD-69/r:12247) + build: fix various msvc build issues (r:12272-12276) + build: silence nuisance sun cc warnings (r:12462) + build: updated windows projects for flite (FSBUILD-128/FSBUILD-133/r:12477) + build: download flite from right tarball location (FSBUILD-135/r:12482) + build: rework Windows build for pocketsphinx 5.1 (MODASRTTS-13/r:12483,12541) + build: fix automake 1.7 build (r:12487) + build: build path cleanups (FSBUILD-130/r:12490) + build: fix rebuild every time on msvc 2008 non team editions (FSBUILD-132/r:12492) + build: add skypiax to sln file and fix some warnings (r:12502) + build: fixed openzap.conf issue in deb package (r:12506) + build: fix rlim_t build on Mac (FSCORE-325/r:12533) + build: Solaris doesn't define RLIMIT_NPROC (FSCORE-326/r:12534) + build: removal of file reference for flite (FSBUILD-139/r:12540) + build: integrate mod_erlang_event into the buildsystem (FSBUILD-142/r:12587) + build: Fix FreeBSD build (r:12678) + build: fix libsoundtouch build dependencies after a configure failure (MODAPP-243/r:12783) + build: fix odbc detection to not try to use odbc when no headers are installed (r:12788) + build: add build of fs_ivrd (r:12843) + build: sphinx downloads for windows (FSBUILD-146/r:12853) + build: Build fails at bootstrap with libtool 2.2.6a (FSBUILD-82/r:12899) + build: add python build dependency to debian package build (FSBUILD-145/r:12920) + build: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time (r:12922,12926-27) + build: fix older gcc build (FSBUILD-150/r:12924) + build: Add a fallback check in case libtool is not yet available in the builddir (get the version from build/config/ltmain.sh instead). print an error message and exit configure if that fails too (r:12933) + build: Add mod_memcache (commented) to modules.conf.in (r:12955) + build: make libtool version detection more robust (r:12979) + build: we need DYNAMIC_LIB_EXTEN for mod_perl and others (r:13023) + build: add mod_say_ru to modules.conf.in (r:13037) + build: bump sounds version (r:13040) + build: use different version file for moh version (r:13093) + build: de-couple version numbers and builds of sound files and moh files (FSBUILD-153/r:13096) + build: use sound_version.txt and moh_version.txt to determine sound file version on windows (FSBUILD-152/r:13097) + config: default config, calling own extension no longer goes to voicemail (r:12596) + config: default config, 1000-1019 uses $${default_password} instead of hard-coded 1234 (FSCONFIG-5/r:12838) + config: tweak the configs to bind siptrace on and off to F10 and F11 (r:12938) + config: Update sample IVR to include ClueCon reg option :) (r:13043) + config: Add ext 9991 as ClueCon ext; use transfer instead of bridge on demo ivr opt #4 (r:13046) + core: fix suncc visibility support in libteletone (r:12154-12157) + core: fix crash on FS shutdown with "..." (FSCORE-297/r:12173,12361,12402) + core: add separate mutex for state related methods (r:12191) + core: move media bug removal to hangup state (r:12225) + core: create indexes for ODBC (r:12235) + core: add direction col to sql db, add direction param to session_c + + freeswitch (1.0.3) build: add targets cd-sounds[-install] and cd-moh[-install] for 48k sounds (r:11151)

1 0

[commit] r13169 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: brian Date: Mon Apr 27 13:18:29 2009 New Revision: 13169 Log: add contact lookup for lazy ppl Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Apr 27 13:18:29 2009 @@ -2875,7 +2875,7 @@ switch_assert(id); contact = sofia_glue_get_url_from_contact(buf, 0); - + if ((p = strstr(contact, ";fs_"))) { *p = '\0'; } @@ -2906,32 +2906,60 @@ const char *profile_name = switch_event_get_header(event, "profile"); const char *ct = switch_event_get_header(event, "content-type"); const char *to_uri = switch_event_get_header(event, "to-uri"); + const char *local_user_full = switch_event_get_header(event, "local-user"); const char *from_uri = switch_event_get_header(event, "from-uri"); const char *body = switch_event_get_body(event); - sofia_profile_t *profile; + sofia_profile_t *profile = NULL; nua_handle_t *nh; + char *local_dup = NULL; + char *local_user, *local_host; + char buf[1024] = ""; + char *p; + if (!profile_name) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Profile Name\n"); - return; + goto done; } - if (!to_uri) { + if (!to_uri && !local_user_full) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To-URI header\n"); - return; + goto done; } if (!from_uri) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing From-URI header\n"); - return; + goto done; } if (!(profile = sofia_glue_find_profile(profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile %s\n", profile_name); - return; + goto done; } + + if (local_user_full) { + local_dup = strdup(local_user_full); + local_user = local_dup; + if ((local_host = strchr(local_user, '@'))) { + *local_host++ = '\0'; + } + + if (!local_user || !local_host || !sofia_reg_find_reg_url(profile, local_user, local_host, buf, sizeof(buf))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find local user\n"); + goto done; + } + + to_uri = sofia_glue_get_url_from_contact(buf, 0); + + if ((p = strstr(to_uri, ";fs_"))) { + *p = '\0'; + } + + } + + nh = nua_handle(profile->nua, NULL, NUTAG_URL(to_uri), @@ -2948,8 +2976,14 @@ TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), TAG_END()); - - sofia_glue_release_profile(profile); + + if (profile) { + sofia_glue_release_profile(profile); + } + + done: + + switch_safe_free(local_dup); } break;

1 0

[commit] r13168 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 13:02:44 2009 New Revision: 13168 Log: send content len with body in esl sendevent Modified: freeswitch/trunk/libs/esl/src/esl_event.c Modified: freeswitch/trunk/libs/esl/src/esl_event.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_event.c (original) +++ freeswitch/trunk/libs/esl/src/esl_event.c Mon Apr 27 13:02:44 2009 @@ -524,7 +524,7 @@ } if (blen) { - snprintf(buf + len, dlen - len, "\n%s", event->body); + snprintf(buf + len, dlen - len, "Content-Length: %d\n\n%s", (int)strlen(event->body), event->body); } else { snprintf(buf + len, dlen - len, "\n"); }

1 0

[commit] r13167 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 12:45:04 2009 New Revision: 13167 Log: FSCORE-357 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Apr 27 12:45:04 2009 @@ -677,6 +677,8 @@ SWITCH_DECLARE(void) switch_core_session_hupall_matching_var(_In_ const char *var_name, _In_ const char *var_val, _In_ switch_call_cause_t cause); SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause); +SWITCH_DECLARE(switch_status_t) switch_core_session_get_partner(switch_core_session_t *session, switch_core_session_t **partner); + /*! \brief Send a message to another session using it's uuid \param uuid_str the unique id of the session you want to send a message to Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Apr 27 12:45:04 2009 @@ -764,7 +764,7 @@ state = switch_channel_get_running_state(other_channel); mystate = switch_channel_get_running_state(channel); - if (mystate != ostate || state >= CS_HANGUP || state == want_state) { + if (mystate != ostate || state >= CS_HANGUP || state >= want_state) { break; } switch_cond_next(); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Apr 27 12:45:04 2009 @@ -75,6 +75,19 @@ return session; } +SWITCH_DECLARE(switch_status_t) switch_core_session_get_partner(switch_core_session_t *session, switch_core_session_t **partner) +{ + const char *uuid; + + if ((uuid = switch_channel_get_variable(session->channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + *partner = switch_core_session_locate(uuid); + return SWITCH_STATUS_SUCCESS; + } + + *partner = NULL; + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(void) switch_core_session_hupall_matching_var(const char *var_name, const char *var_val, switch_call_cause_t cause) { Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 27 12:45:04 2009 @@ -508,15 +508,24 @@ if (switch_true(switch_channel_get_variable(channel, SWITCH_COPY_XML_CDR_VARIABLE))) { + switch_core_session_t *other_session; + switch_channel_t *other_channel; switch_xml_t cdr; char *xml_text; - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { - switch_channel_set_variable_partner(channel, "b_leg_cdr", xml_text); - switch_safe_free(xml_text); + if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) { + other_channel = switch_core_session_get_channel(other_session); + + switch_channel_wait_for_state(channel, other_channel, CS_REPORTING); + + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { + switch_channel_set_variable(other_channel, "b_leg_cdr", xml_text); + switch_safe_free(xml_text); + } + switch_xml_free(cdr); } - switch_xml_free(cdr); + switch_core_session_rwunlock(other_session); } }

1 0

[commit] r13166 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 12:31:34 2009 New Revision: 13166 Log: keep presence up to date Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Apr 27 12:31:34 2009 @@ -1114,7 +1114,7 @@ goto error; } - if (argc != need) { + if (argc < need) { goto error; } @@ -1122,12 +1122,19 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "dp"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", __FILE__); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", argv[1]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); if (type == SWITCH_EVENT_PRESENCE_IN) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); + if (!strncasecmp(argv[3], "cs_", 3) || switch_stristr("hangup", argv[3])) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP"); + } + } else { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP"); } switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); switch_event_fire(&event); } stream->write_function(stream, "Event Sent"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 27 12:31:34 2009 @@ -634,11 +634,15 @@ event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name); } - if (mod_sofia_globals.debug_presence > 1) { + if (mod_sofia_globals.debug_presence) { char *buf; switch_event_serialize(event, &buf, SWITCH_FALSE); switch_assert(buf); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf); + if (mod_sofia_globals.debug_presence > 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "EVENT DUMP:\n%s\n", buf); + } free(buf); } @@ -946,16 +950,18 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *rpid, char *prpid, char *status, const char **ct) { + char *ret = NULL; + if (switch_stristr("polycom", user_agent)) { *ct = "application/xpidf+xml"; - + /* of course!, lets make a big deal over dashes. Now the stupidity is complete. */ if (!strcmp(prpid, "on-the-phone")) { prpid = "onthephone"; } - return switch_mprintf( + ret = switch_mprintf( "<?xml version=\"1.0\"?>\n" "<!DOCTYPE presence PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n" "<presence>\n" @@ -973,7 +979,7 @@ ); } else { *ct = "application/pidf+xml"; - return switch_mprintf( + ret = switch_mprintf( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> \n" "<presence xmlns='urn:ietf:params:xml:ns:pidf' \n" "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model' \n" @@ -993,6 +999,9 @@ " </dm:person>\n" "</presence>", id, open, prpid, status); } + + + return ret; } static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) @@ -1305,6 +1314,12 @@ } } + if (mod_sofia_globals.debug_presence > 0 && pl) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "send payload:\n%s\n", pl); + } + + + nua_notify(nh, TAG_IF(*expires_str, SIPTAG_EXPIRES_STR(expires_str)), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon Apr 27 12:31:34 2009 @@ -443,7 +443,7 @@ switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause)); switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850); - switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL); + switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL); switch_channel_set_timestamps(session->channel);

1 0

[commit] r13165 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 12:27:20 2009 New Revision: 13165 Log: MODFORM-27 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Mon Apr 27 12:27:20 2009 @@ -557,6 +557,88 @@ return SWITCH_STATUS_SUCCESS; } +#define SHOW_LOCAL_STREAM_SYNTAX "[local_stream_name [xml]]" +SWITCH_STANDARD_API(show_local_stream_function) +{ + local_stream_source_t *source = NULL; + char *mycmd = NULL, *argv[2] = { 0 }; + char *local_stream_name = NULL; + int argc = 0; + switch_hash_index_t *hi; + const void *var; + void *val; + switch_bool_t xml = SWITCH_FALSE; + + switch_mutex_lock(globals.mutex); + + if (switch_strlen_zero(cmd)) { + for (hi = switch_hash_first(NULL, globals.source_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + if ((source = (local_stream_source_t *) val)) { + stream->write_function(stream, "%s,%s\n", source->name, source->location); + } + } + } else { + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + local_stream_name = argv[0]; + if (argc > 1 && !strcasecmp("xml", argv[1])) { + xml = SWITCH_TRUE; + } + } + + source = switch_core_hash_find(globals.source_hash, local_stream_name); + if (source) { + if (xml) { + stream->write_function(stream, "<?xml version=\"1.0\"?>\n<local_stream name=\"%s\">\n", source->name); + stream->write_function(stream, " <location>%s</location>\n", source->location); + stream->write_function(stream, " <channels>%d</channels>\n", source->channels); + stream->write_function(stream, " <rate>%d</rate>\n", source->rate); + stream->write_function(stream, " <interval>%d<interval>\n", source->interval); + stream->write_function(stream, " <samples>%d</samples>\n", source->samples); + stream->write_function(stream, " <prebuf>%d</prebuf>\n", source->prebuf); + stream->write_function(stream, " <timer>%s</timer>\n", source->timer_name); + stream->write_function(stream, " <total>%d</total>\n", source->total); + stream->write_function(stream, " <shuffle>%s</shuffle>\n", (source->shuffle) ? "true" : "false"); + stream->write_function(stream, " <ready>%s</ready>\n", (source->ready) ? "true" : "false"); + stream->write_function(stream, " <stopped>%s</stopped>\n", (source->stopped) ? "true" : "false"); + stream->write_function(stream, "</local_stream>\n"); + } else { + stream->write_function(stream, "%s\n", source->name); + stream->write_function(stream, " location: %s\n", source->location); + stream->write_function(stream, " channels: %d\n", source->channels); + stream->write_function(stream, " rate: %d\n", source->rate); + stream->write_function(stream, " interval: %d\n", source->interval); + stream->write_function(stream, " samples: %d\n", source->samples); + stream->write_function(stream, " prebuf: %d\n", source->prebuf); + stream->write_function(stream, " timer: %s\n", source->timer_name); + stream->write_function(stream, " total: %d\n", source->total); + stream->write_function(stream, " shuffle: %s\n", (source->shuffle) ? "true" : "false"); + stream->write_function(stream, " ready: %s\n", (source->ready) ? "true" : "false"); + stream->write_function(stream, " stopped: %s\n", (source->stopped) ? "true" : "false"); + } + } else { + stream->write_function(stream, "-ERR Cannot locate local_stream %s!\n",local_stream_name); + goto done; + } + } + + stream->write_function(stream,"+OK"); + goto done; + + usage: + stream->write_function(stream, "-USAGE: %s\n", SHOW_LOCAL_STREAM_SYNTAX); + + done: + + switch_mutex_unlock(globals.mutex); + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + #define START_LOCAL_STREAM_SYNTAX "<local_stream_name> [<path>] [<rate>] [<shuffle>] [<prebuf>] [<channels>] [<interval>] [<timer_name>]" SWITCH_STANDARD_API(start_local_stream_function) { @@ -758,6 +840,7 @@ SWITCH_ADD_API(commands_api_interface, "stop_local_stream", "Stops and unloads a local_stream", stop_local_stream_function, STOP_LOCAL_STREAM_SYNTAX); SWITCH_ADD_API(commands_api_interface, "start_local_stream", "Starts a new local_stream", start_local_stream_function, START_LOCAL_STREAM_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "show_local_stream", "Shows a local stream", show_local_stream_function, SHOW_LOCAL_STREAM_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r13164 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 10:52:34 2009 New Revision: 13164 Log: clean up presence function Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Apr 27 10:52:34 2009 @@ -1094,20 +1094,28 @@ return SWITCH_STATUS_SUCCESS; } + +#define PRESENCE_USAGE "[in|out] <user> <rpid> <message>" SWITCH_STANDARD_API(presence_api_function) { switch_event_t *event; char *lbuf, *argv[4]; int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; + int need = 4; if (!switch_strlen_zero(cmd) && (lbuf = strdup(cmd)) - && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + if (!strcasecmp(argv[0], "out")) { type = SWITCH_EVENT_PRESENCE_OUT; - } else if (argc != 4) { - stream->write_function(stream, "Invalid"); - return SWITCH_STATUS_SUCCESS; + need = 2; + } else if (strcasecmp(argv[0], "in")) { + goto error; + } + + if (argc != need) { + goto error; } if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { @@ -1119,14 +1127,22 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); } switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); switch_event_fire(&event); } stream->write_function(stream, "Event Sent"); switch_safe_free(lbuf); } else { - stream->write_function(stream, "Invalid"); + goto error; } + return SWITCH_STATUS_SUCCESS; + + error: + + stream->write_function(stream, "Invalid: presence %s", PRESENCE_USAGE); + return SWITCH_STATUS_SUCCESS; + } SWITCH_STANDARD_API(chat_api_function) @@ -2599,7 +2615,7 @@ SWITCH_ADD_API(api_interface, "strepoch", "Convert a date string into epoch time", strepoch_api_function, "<string>"); SWITCH_ADD_API(api_interface, "chat", "chat", chat_api_function, "<proto>|<from>|<to>|<message>|[<content-type>]"); SWITCH_ADD_API(api_interface, "strftime", "strftime", strftime_api_function, "<format_string>"); - SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, "<user> <rpid> <message>"); + SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, PRESENCE_USAGE); SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number", SAF_SUPPORT_NOMEDIA);

1 0