- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10723 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: anthm Date: Thu Dec 11 18:39:16 2008 New Revision: 10723 Log: fix conference record race Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Dec 11 18:39:16 2008 @@ -885,6 +885,12 @@ switch_mutex_unlock(globals.hash_mutex); if (conference->auto_record) { + uint32_t sanity = 100; + + while (!conference->members && --sanity) { + switch_yield(100000); + } + imember = conference->members; if (imember) { switch_channel_t *channel = switch_core_session_get_channel(imember->session);

1 0

[commit] r10722 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: anthm Date: Thu Dec 11 18:06:51 2008 New Revision: 10722 Log: add mkdir function FSCORE-250 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 Thu Dec 11 18:06:51 2008 @@ -126,6 +126,13 @@ } } +#define MKDIR_SYNTAX "<path>" +SWITCH_STANDARD_APP(mkdir_function) +{ + switch_dir_make_recursive(data, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s MKDIR: %s\n", switch_channel_get_name(switch_core_session_get_channel(session)), data); +} + #define SOFT_HOLD_SYNTAX "<unhold key> [<moh_a>] [<moh_b>]" SWITCH_STANDARD_APP(soft_hold_function) { @@ -2377,6 +2384,7 @@ SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "mkdir", "Create a directory", "Create a directory", mkdir_function, MKDIR_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "soft_hold", "Put a bridged channel on hold", "Put a bridged channel on hold", soft_hold_function, SOFT_HOLD_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "bind_meta_app", "Bind a key to an application", "Bind a key to an application", dtmf_bind_function, BIND_SYNTAX,

1 0

[commit] r10721 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: anthm Date: Thu Dec 11 17:32:02 2008 New Revision: 10721 Log: fix FSCORE-246 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 Thu Dec 11 17:32:02 2008 @@ -2076,7 +2076,7 @@ switch_originate_flag_t myflags = SOF_NONE; char *cid_name_override = NULL; char *cid_num_override = NULL; - + if (var_event) { cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); @@ -2094,18 +2094,23 @@ d_dest = switch_channel_expand_variables(channel, dest); } else { - switch_event_t *event = var_event; - if (!event) { + switch_event_t *event = NULL; + + if (var_event) { + switch_event_dup(&event, var_event); + switch_event_del_header(event, "dialer_user"); + switch_event_del_header(event, "dialer_domain"); + } else { switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(event); } + switch_assert(var_event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_user", user); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "dialed_domain", domain); d_dest = switch_event_expand_headers(event, dest); - if (event && event != var_event) { - switch_event_destroy(&event); - } + + switch_event_destroy(&event); } if ((flags & SOF_FORKED_DIAL)) {

1 0

[commit] r10720 - freeswitch/trunk/src/mod/applications/mod_vmd
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: ericdc Date: Thu Dec 11 17:13:20 2008 New Revision: 10720 Log: Added useful comments. Eric Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.c Thu Dec 11 17:13:20 2008 @@ -50,35 +50,40 @@ #define ISNAN(x) ((x)== NAN) #endif -/* Number of points for beep detection */ +/*! Number of points for beep detection */ #define POINTS 32 -/* Number of valid points required for beep detection */ +/*! Number of valid points required for beep detection */ #define VALID 22 -/* Maximum number of invalid points - * to declare beep has stopped */ +/*! Maximum number of invalid points to declare beep has stopped */ #define MAX_CHIRP 22 -/* Minimum time for a beep */ +/*! Minimum time for a beep */ #define MIN_TIME 8000 -/* Minimum amplitude of the signal */ +/*! Minimum amplitude of the signal */ #define MIN_AMPL 0.10 -/* Minimum beep frequency */ +/*! Minimum beep frequency */ #define MIN_FREQ (600) -/* Maximum beep frequency */ +/*! Maximum beep frequency */ #define MAX_FREQ (1100) -/* PSI function for amplitude calculation*/ +/*! \brief \f$\psi{(x)}\f$ function for amplitude calculation + * + * \f$\psi{(x)} = {x^2_1} - {x_2} {x_0}\f$ + */ #define PSI(x) (x[1]*x[1]-x[2]*x[0]) -/* Sample rate */ +/*! Sample rate NOTE: this should be dynamic in the future */ #define F (8000) -/* Conversion of frequency to Hz */ +/*! \brief Conversion of frequency to Hz + * + * \f$F = \frac{f}{{2}{\pi}}\f$ + */ #define TO_HZ(f) ((F * f) / (2.0 * M_PI)) /* Number of points in discreet energy separation */ @@ -91,22 +96,22 @@ * DEPRECATED */ #define ADJUST_MAX (65536) -/* Discreet energy separation tolerance to error */ +/*! Discreet energy separation tolerance to error */ #define TOLERANCE (0.20) -/* Maximum value within tolerance */ +/*! Maximum value within tolerance */ #define TOLERANCE_T(m) (m + (m * TOLERANCE)) -/* Minimum value within tolerance */ +/*! Minimum value within tolerance */ #define TOLERANCE_B(m) (m - (m * TOLERANCE)) -/* Syntax of the API call */ +/*! Syntax of the API call */ #define VMD_SYNTAX "<uuid> <command>" -/* Number of expected parameters in api call */ +/*! Number of expected parameters in api call */ #define VMD_PARAMS 2 -/* FreeSWITCH CUSTOM event type */ +/*! FreeSWITCH CUSTOM event type */ #define VMD_EVENT_BEEP "vmd::beep" /* Prototypes */ @@ -117,39 +122,39 @@ SWITCH_MODULE_DEFINITION(mod_vmd, mod_vmd_load, NULL, NULL); SWITCH_STANDARD_APP(vmd_start_function); -/* Type that holds state information about the beep */ +/*! Type that holds state information about the beep */ typedef enum vmd_state { BEEP_DETECTED, BEEP_NOT_DETECTED } vmd_state_t; -/* Type that holds data for 5 points of discreet energy separation */ +/*! Type that holds data for 5 points of discreet energy separation */ typedef struct vmd_point { double freq; double ampl; } vmd_point_t; -/* Type that holds codec information */ +/*! Type that holds codec information */ typedef struct vmd_codec_info { int rate; int channels; } vmd_codec_info_t; -/* Type that holds session information pertinent to the vmd module */ +/*! Type that holds session information pertinent to the vmd module */ typedef struct vmd_session_info { - /* State of the session */ + /*! State of the session */ vmd_state_t state; - /* Snapshot of DESA samples */ + /*! Snapshot of DESA samples */ vmd_point_t points[POINTS]; - /* Internal FreeSWITCH session */ + /*! Internal FreeSWITCH session */ switch_core_session_t *session; - /* Codec information for the session */ + /*! Codec information for the session */ vmd_codec_info_t vmd_codec; - /* Current position in the snapshot */ + /*! Current position in the snapshot */ unsigned int pos; - /* Frequency aproximation of a detected beep */ + /*! Frequency aproximation of a detected beep */ double beep_freq; - /* A count of how long a distinct beep was detected by - * by the discreet energy separation algorithm */ + /*! A count of how long a distinct beep was detected by + * by the discreet energy separation algorithm */ switch_size_t timestamp; } vmd_session_info_t; @@ -202,6 +207,7 @@ return SWITCH_TRUE; } +/*! Process and convert data to be used by the find_beep() function */ static switch_bool_t process_data(vmd_session_info_t * vmd_info, switch_frame_t * frame) { uint32_t i; @@ -253,6 +259,7 @@ return SWITCH_TRUE; } +/*! Find voicemail beep in the audio stream */ static void find_beep(vmd_session_info_t * vmd_info, switch_frame_t * frame) { int i; @@ -347,7 +354,7 @@ } } -/* Find the median of an array of doubles */ +/*! Find the median of an array of doubles */ static double median(double *m, int n) { int i; @@ -411,17 +418,20 @@ return mingtguess; } -/* Convert many points for Signed L16 to relative floating point */ +/*! Convert many points for Signed L16 to relative floating point */ static void convert_pts(int16_t * i_pts, double *d_pts, int16_t max) { int i; for (i = 0; i < P; i++) { - /* Signed L16 to relative floating point conversion */ + /*! Signed L16 to relative floating point conversion */ d_pts[i] = ((((double) (i_pts[i]) + (double) max) / (double) (2 * max)) - 0.5) * 2.0; } } -/* Amplitude estimator for DESA-2 */ +/*! \brief Amplitude estimator for DESA-2 + * + * \f$A = \sqrt{\frac{\psi{(x)}}{\sin{\Omega^2}}}\f$ + */ double ampl_estimator(double *x) { double freq_sq; @@ -432,7 +442,15 @@ return sqrt(PSI(x) / sin(freq_sq)); } -/* The DESA-2 algorithm */ +/*! \brief The DESA-2 algorithm + * + * \f$\frac{1}{2}\arccos{\frac{{{x^2_2} - + * {x_0}{x_4}} - {{x^2_1} - + * {x_0}{x_2}} - {{x^2_3} - + * {x_2}{x_4}}} + * {{2}({x^2_2} - {x_1}{x_3})}}\f$ + * + */ double freq_estimator(double *x) { return 0.5 * acos((((x[2] * x[2]) - (x[0] * x[4])) @@ -443,7 +461,7 @@ ); } - +/*! FreeSWITCH module loading function */ SWITCH_MODULE_LOAD_FUNCTION(mod_vmd_load) { switch_application_interface_t *app_interface; @@ -461,7 +479,7 @@ return SWITCH_STATUS_SUCCESS; } -/* Same as api function see it for comments */ +/*! FreeSWITCH application handler function */ SWITCH_STANDARD_APP(vmd_start_function) { switch_media_bug_t *bug; @@ -518,7 +536,7 @@ } -/* Called when the system shuts down */ +/*! Called when the system shuts down */ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_vmd_shutdown) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail detection disabled\n"); @@ -526,6 +544,7 @@ return SWITCH_STATUS_SUCCESS; } +/*! FreeSWITCH API handler function */ SWITCH_STANDARD_API(vmd_api_main) { switch_core_session_t *vmd_session;

1 0

[commit] r10719 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: mikej Date: Thu Dec 11 15:52:04 2008 New Revision: 10719 Log: tweaks for windows build Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_ivr_originate.c 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 Thu Dec 11 15:52:04 2008 @@ -1206,11 +1206,11 @@ switch_set_string(expires_str, "0"); kill_handle = 1; } else if (exptime > 0) { - switch_snprintf(sstr, sizeof(sstr), "active;expires=%d", exptime); + switch_snprintf(sstr, sizeof(sstr), "active;expires=%u", (unsigned)exptime); } else { - long delta = exptime * -1; - switch_snprintf(sstr, sizeof(sstr), "active;expires=%d", delta); - switch_snprintf(expires_str, sizeof(expires_str), "%d", delta); + unsigned delta = (unsigned) (exptime * -1); + switch_snprintf(sstr, sizeof(sstr), "active;expires=%u", delta); + switch_snprintf(expires_str, sizeof(expires_str), "%u", delta); nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, delta, delta); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Dec 11 15:52:04 2008 @@ -1326,11 +1326,11 @@ ringback.fh = &ringback.fhb; } else if (!strncasecmp(ringback_data, "silence", 7)) { - const char *p = ringback_data + 7; - if (*p == ':') { - p++; - if (p) { - ringback.silence = atoi(p); + const char *c = ringback_data + 7; + if (*c == ':') { + c++; + if (c) { + ringback.silence = atoi(c); } } if (ringback.silence <= 0) {

1 0

[commit] r10718 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: mikej Date: Thu Dec 11 15:42:34 2008 New Revision: 10718 Log: add sip_history_info var for inbound invites. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Thu Dec 11 15:42:34 2008 @@ -4197,6 +4197,8 @@ free(tmp_name); } } + } else if (!strncasecmp(un->un_name, "History-Info", 12)) { + switch_channel_set_variable(channel, "sip_history_info", un->un_value); } else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) { if (!switch_strlen_zero(un->un_value)) { char new_name[512] = "";

1 0

[commit] r10717 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: mikej Date: Thu Dec 11 15:24:31 2008 New Revision: 10717 Log: SFSIP-92 add support to send a notify in the invite dialog by specifying the uuid of the call. 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 Thu Dec 11 15:24:31 2008 @@ -2598,10 +2598,26 @@ const char *user = switch_event_get_header(event, "user"); const char *host = switch_event_get_header(event, "host"); const char *call_id = switch_event_get_header(event, "call-id"); + const char *uuid = switch_event_get_header(event, "uuid"); const char *body = switch_event_get_body(event); sofia_profile_t *profile; - if (profile_name && ct && es && user && host && (profile = sofia_glue_find_profile(profile_name))) { + if (uuid && ct && es) { + switch_core_session_t *session; + private_object_t *tech_pvt; + + if ((session = switch_core_session_locate(uuid))) { + if ((tech_pvt = switch_core_session_get_private(session))) { + nua_notify(tech_pvt->nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(es), + SIPTAG_CONTENT_TYPE_STR(ct), + TAG_IF(!switch_strlen_zero(body), SIPTAG_PAYLOAD_STR(body)), + TAG_END()); + } + switch_core_session_rwunlock(session); + } + } else if (profile_name && ct && es && user && host && (profile = sofia_glue_find_profile(profile_name))) { char *sql; if (call_id) {

1 0

[commit] r10716 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: anthm Date: Thu Dec 11 15:20:20 2008 New Revision: 10716 Log: The Grinch is trying to steal our presence! Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Thu Dec 11 15:20:20 2008 @@ -432,6 +432,7 @@ int rport_level; sofia_presence_type_t pres_type; sofia_media_options_t media_options; + uint32_t force_subscription_expires; }; struct private_object { 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 Thu Dec 11 15:20:20 2008 @@ -70,12 +70,14 @@ char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { +#if 0 if (status >= 300 && sip && sip->sip_call_id) { char *sql; sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", sip->sip_call_id->i_id); switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } +#endif } void sofia_handle_sip_i_notify(switch_core_session_t *session, int status, @@ -1257,6 +1259,11 @@ } else { switch_clear_flag(profile, TFLAG_INB_NOMEDIA); } + } else if (!strcasecmp(var, "force-subscription-expires")) { + int tmp = atoi(val); + if (tmp > 0) { + profile->force_subscription_expires = tmp; + } } else if (!strcasecmp(var, "inbound-late-negotiation")) { if (switch_true(val)) { switch_set_flag(profile, TFLAG_LATE_NEGOTIATION); @@ -1686,6 +1693,11 @@ switch_set_flag(profile, TFLAG_LATE_NEGOTIATION); } else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) { switch_set_flag(profile, TFLAG_PROXY_MEDIA); + } else if (!strcasecmp(var, "force-subscription-expires")) { + int tmp = atoi(val); + if (tmp > 0) { + profile->force_subscription_expires = tmp; + } } else if (!strcasecmp(var, "inbound-use-callid-as-uuid")) { if (switch_true(val)) { profile->pflags |= PFLAG_CALLID_AS_UUID; 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 Thu Dec 11 15:20:20 2008 @@ -34,6 +34,8 @@ */ #include "mod_sofia.h" +#define SUB_OVERLAP 300 + static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames); @@ -519,16 +521,14 @@ } - switch (event->event_id) { - case SWITCH_EVENT_PRESENCE_IN: - sql = switch_mprintf( + if ((sql = switch_mprintf( "select sip_subscriptions.proto,sip_subscriptions.sip_user,sip_subscriptions.sip_host," "sip_subscriptions.sub_to_user,sip_subscriptions.sub_to_host,sip_subscriptions.event," "sip_subscriptions.contact,sip_subscriptions.call_id,sip_subscriptions.full_from," "sip_subscriptions.full_via,sip_subscriptions.expires,sip_subscriptions.user_agent," "sip_subscriptions.accept,sip_subscriptions.profile_name" - ",1,'%q','%q','%q',sip_presence.status,sip_presence.rpid " + ",'%q','%q','%q',sip_presence.status,sip_presence.rpid " "from sip_subscriptions " "left join sip_presence on " "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and " @@ -536,41 +536,17 @@ "where (event='%q' or event='%q') and sub_to_user='%q' " "and (sub_to_host='%q' or presence_hosts like '%%%q%%') " "and (sip_subscriptions.profile_name = '%q' or sip_subscriptions.presence_hosts != sip_subscriptions.sub_to_host)", - switch_str_nil(status), switch_str_nil(rpid), host, event_type, alt_event_type, euser, host, host, profile->name); - break; - case SWITCH_EVENT_PRESENCE_OUT: - sql = switch_mprintf( - "select sip_subscriptions.proto,sip_subscriptions.sip_user,sip_subscriptions.sip_host," - "sip_subscriptions.sub_to_user,sip_subscriptions.sub_to_host,sip_subscriptions.event," - "sip_subscriptions.contact,sip_subscriptions.call_id,sip_subscriptions.full_from," - "sip_subscriptions.full_via,sip_subscriptions.expires,sip_subscriptions.user_agent," - "sip_subscriptions.accept,sip_subscriptions.profile_name" - ",0,'%q','%q','%q',sip_presence.status,sip_presence.rpid " - "from sip_subscriptions " - "left join sip_presence on " - "(sip_subscriptions.sub_to_user=sip_presence.sip_user and sip_subscriptions.sub_to_host=sip_presence.sip_host and " - "sip_subscriptions.profile_name=sip_presence.profile_name) " - "where (event='%q' or event='%q') and sub_to_user='%q' " - "and (sub_to_host='%q' or presence_hosts like '%%%q%%') ", - "and (sip_subscriptions.profile_name = '%q' or sip_subscriptions.presence_hosts != sip_subscriptions.sub_to_host)", - switch_str_nil(status), switch_str_nil(rpid), host, event_type, alt_event_type, euser, host, host, profile->name); - break; - default: - break; - } + switch_str_nil(status), switch_str_nil(rpid), host, event_type, alt_event_type, euser, host, host, profile->name))) { - - if (sql) { struct presence_helper helper = { 0 }; helper.profile = profile; helper.event = event; SWITCH_STANDARD_STREAM(helper.stream); switch_assert(helper.stream.data); - - if (mod_sofia_globals.debug_presence > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s START_PRESENCE_SQL\n", profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s START_PRESENCE_SQL (%s)\n", + event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name); } if (mod_sofia_globals.debug_presence > 1) { @@ -583,8 +559,10 @@ sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, NULL, sql, sofia_presence_sub_callback, &helper); + if (mod_sofia_globals.debug_presence > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s END_PRESENCE_SQL\n\n", profile->name); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s END_PRESENCE_SQL (%s)\n", + event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name); } switch_safe_free(sql); @@ -829,7 +807,7 @@ if (!switch_strlen_zero(to_user)) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "to-user", to_user); } - + if (switch_strlen_zero(state)) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", SOFIA_CHAT_PROTO); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP"); @@ -945,27 +923,31 @@ char *expires = argv[10]; char *user_agent = argv[11]; char *profile_name = argv[13]; - uint32_t in = atoi(argv[14]); - char *status = argv[15]; - char *rpid = argv[16]; - char *sub_to_host = argv[17]; + uint32_t in = 0; + char *status = argv[14]; + char *rpid = argv[15]; + char *sub_to_host = argv[16]; nua_handle_t *nh; char *to = NULL; char *open; char *prpid; - int done = 0; const char *ct = "no/idea"; time_t exptime = switch_timestamp(NULL) + 3600; int is_dialog = 0; sofia_profile_t *ext_profile = NULL, *profile = helper->profile; + char sstr[128] = ""; + int kill_handle = 0; + char expires_str[10] = ""; - - if (argc > 19 && !switch_strlen_zero(argv[18]) && !switch_strlen_zero(argv[19])) { - status = argv[18]; - rpid = argv[19]; + if (argc > 18 && !switch_strlen_zero(argv[17]) && !switch_strlen_zero(argv[18])) { + status = argv[17]; + rpid = argv[18]; } + in = helper->event && helper->event->event_id == SWITCH_EVENT_PRESENCE_IN; + + if (switch_strlen_zero(rpid)) { rpid = "unknown"; } @@ -988,29 +970,25 @@ } } - + if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { + goto end; + } + if (expires) { long tmp = atol(expires); if (tmp > 0) { - exptime = tmp - switch_timestamp(NULL); + exptime = tmp - switch_timestamp(NULL) - SUB_OVERLAP; + } else { + exptime = tmp; } } - - if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { - goto end; - } - + if (!rpid) { rpid = "unknown"; } prpid = translate_rpid(rpid); - if (in < 0) { - done = 1; - in = 0; - } - if (!strcasecmp(proto, SOFIA_CHAT_PROTO)) { clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); } else { @@ -1020,7 +998,7 @@ if (mod_sofia_globals.debug_presence > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "SEND PRESENCE\nTo: \t%s@%s\nFrom: \t%s@%s\nCall-ID: \t%s\nProfile:\t%s [%s]\n\n", - sub_to_user, sub_to_host, user, host, call_id, profile_name, helper->profile->name); + user, host, sub_to_user, sub_to_host, call_id, profile_name, helper->profile->name); } if (!strcasecmp(sub_to_host, host)) { @@ -1210,7 +1188,7 @@ prpid = translate_rpid(rpid); pl = gen_pidf(user_agent, clean_id, profile->url, open, rpid, prpid, status_line, &ct); } - + } else { if (in) { open = "open"; @@ -1222,7 +1200,23 @@ } nua_handle_bind(nh, &mod_sofia_globals.keep_private); - nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR("active"), + + if (helper->event && helper->event->event_id == SWITCH_EVENT_PRESENCE_OUT) { + switch_set_string(sstr, "terminated;reason=noresource"); + switch_set_string(expires_str, "0"); + kill_handle = 1; + } else if (exptime > 0) { + switch_snprintf(sstr, sizeof(sstr), "active;expires=%d", exptime); + } else { + long delta = exptime * -1; + switch_snprintf(sstr, sizeof(sstr), "active;expires=%d", delta); + switch_snprintf(expires_str, sizeof(expires_str), "%d", delta); + nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, delta, delta); + } + + nua_notify(nh, + TAG_IF(*expires_str, SIPTAG_EXPIRES_STR(expires_str)), + SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); end: @@ -1236,6 +1230,10 @@ switch_safe_free(pl); switch_safe_free(to); + if (nh && kill_handle) { + nua_handle_destroy(nh); + } + return 0; } @@ -1374,7 +1372,8 @@ tagi_t tags[]) { if (sip) { - long exp, exp_raw; + long exp_abs, exp_delta; + char exp_delta_str[30] = ""; sip_to_t const *to = sip->sip_to; sip_from_t const *from = sip->sip_from; sip_contact_t const *contact = sip->sip_contact; @@ -1567,15 +1566,18 @@ call_id = sip->sip_call_id->i_id; full_from = sip_header_as_string(profile->home, (void *) sip->sip_from); full_via = sip_header_as_string(profile->home, (void *) sip->sip_via); - - exp_raw = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); - if (exp_raw) { - exp = (long) switch_timestamp(NULL) + exp_raw + 120; + + exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); + + if (exp_delta) { + exp_abs = (long) switch_timestamp(NULL) + exp_delta; } else { - exp = 0; + exp_abs = 0; sub_state = nua_substate_terminated; } + switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta); + if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { sql = switch_mprintf("delete from sip_subscriptions where call_id='%q'", call_id); } else { @@ -1598,18 +1600,38 @@ switch_snprintf(accept + strlen(accept), sizeof(accept) - strlen(accept), "%s%s ", ap->ac_type, ap->ac_next ? "," : ""); ap = ap->ac_next; } + + /* negative in exptime means keep bumping up sub time to avoid a snafu where every device has it's own rules about subscriptions + that somehow barely resemble the RFC not that I blame them because the RFC MAY be amibiguous and SHOULD be deleted. + So to avoid the problem we keep resetting the expiration date of the subscription so it never expires. + + Eybeam completely ignores this option and most other subscription-state: directives from rfc3265 and still expires. + Polycom is happy to keep upping the subscription expiry back to the original time on each new notify. + The rest ... who knows...? + + */ + sql = switch_mprintf("insert into sip_subscriptions " "(proto,sip_user,sip_host,sub_to_user,sub_to_host,presence_hosts,event,contact,call_id,full_from," "full_via,expires,user_agent,accept,profile_name,hostname) " "values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld,'%q','%q','%q','%q')", proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : to_host, - event, contact_str, call_id, full_from, full_via, exp, full_agent, accept, profile->name,mod_sofia_globals.hostname); + event, contact_str, call_id, full_from, full_via, + + exp_delta * -1, + //exp_abs + SUB_OVERLAP, + + full_agent, accept, profile->name,mod_sofia_globals.hostname); + if (mod_sofia_globals.debug_presence > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s SUBSCRIBE %s@%s %s@%s\n", profile->name, from_user, from_host, to_user, to_host); + } + switch_assert(sql != NULL); sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); - sstr = switch_mprintf("active;expires=%ld", exp_raw); + sstr = switch_mprintf("active;expires=%ld", exp_delta); } switch_mutex_unlock(profile->ireg_mutex); @@ -1639,10 +1661,14 @@ contactstr = profile->tls_contact; } - nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_raw + 120, exp_raw + 120); + + + nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); + nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contact_str), NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), + SIPTAG_EXPIRES_STR(exp_delta_str), TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END()); switch_safe_free(sticky); @@ -1653,9 +1679,9 @@ #if 0 nua_notify(nh, - NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EVENT_STR(event), - SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), + SIPTAG_EXPIRES_STR(exp_delta_str), + SIPTAG_CONTENT_TYPE_STR("application/notice"), SIPTAG_PAYLOAD_STR("Note: Come to ClueCon http://www.cluecon.com\n\n"), TAG_END()); #endif @@ -1780,7 +1806,7 @@ uint8_t in = 0; char *sql; char *full_agent = NULL; - long exp, exp_raw; + long exp, exp_delta; if ((xml = switch_xml_parse_str(payload->pl_data, strlen(payload->pl_data)))) { char *status_txt = "", *note_txt = ""; @@ -1817,8 +1843,8 @@ } } - exp_raw = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); - exp = (long) switch_timestamp(NULL) + exp_raw; + exp_delta = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); + exp = (long) switch_timestamp(NULL) + exp_delta; if ((sql = switch_mprintf("delete from sip_presence where sip_user='%q' and sip_host='%q' " Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Dec 11 15:20:20 2008 @@ -995,7 +995,34 @@ switch_event_fire(&event); } #endif + + } else { + + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", SOFIA_CHAT_PROTO); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user-agent", + (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", to_user, reg_host); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "UNRegistered"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } +#if 0 + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "sip"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_PROTO, to_user, reg_host); + + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "unavailable"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } +#endif + if (multi_reg) { char *icontact, *p; icontact = sofia_glue_get_url_from_contact(contact_str, 1); @@ -1032,16 +1059,6 @@ sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE); } } - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "sip"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_PROTO, to_user, reg_host); - - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "unavailable"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", rpid); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } }

1 0

[commit] r10715 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: brian Date: Thu Dec 11 15:16:32 2008 New Revision: 10715 Log: option to turn of auto_restart of sofia profiles on ip change Modified: freeswitch/trunk/conf/autoload_configs/sofia.conf.xml 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/conf/autoload_configs/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/sofia.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/sofia.conf.xml Thu Dec 11 15:16:32 2008 @@ -2,6 +2,8 @@ <global_settings> <param name="log-level" value="0"/> +  + <param name="debug-presence" value="0"/> </global_settings> <!-- 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 Thu Dec 11 15:16:32 2008 @@ -2686,7 +2686,7 @@ { const char *cond = switch_event_get_header(event, "condition"); - if (cond && !strcmp(cond, "network-address-change")) { + if (cond && !strcmp(cond, "network-address-change") && mod_sofia_globals.auto_restart) { sofia_glue_restart_all_profiles(); } 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 Thu Dec 11 15:16:32 2008 @@ -243,6 +243,7 @@ switch_event_node_t *custom_node; switch_event_node_t *mwi_node; int debug_presence; + int auto_restart; }; extern struct mod_sofia_globals mod_sofia_globals; 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 Thu Dec 11 15:16:32 2008 @@ -1571,6 +1571,8 @@ goto done; } + mod_sofia_globals.auto_restart = SWITCH_TRUE; + if ((settings = switch_xml_child(cfg, "global_settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -1579,6 +1581,8 @@ su_log_set_level(NULL, atoi(val)); } else if (!strcasecmp(var, "debug-presence")) { mod_sofia_globals.debug_presence = atoi(val); + } else if (!strcasecmp(var, "auto-restart")) { + mod_sofia_globals.auto_restart = switch_true(val); } } }

1 0

[commit] r10714 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 11 Dec '08

11 Dec '08

Author: mikej Date: Thu Dec 11 12:56:51 2008 New Revision: 10714 Log: mod_commands only send content-type on status when it really is http. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Dec 11 12:56:51 2008 @@ -704,13 +704,14 @@ if (stream->param_event) { http = switch_event_get_header(stream->param_event, "http-host"); + if ((var = switch_event_get_header(stream->param_event, "content-type"))) { + if (!strcasecmp(var, "text/plain")) { + http = NULL; + } + } } - if ((var = switch_event_get_header(stream->param_event, "content-type"))) { - if (!strcasecmp(var, "text/plain")) { - http = NULL; - } - } else { + if (http) { stream->write_function(stream, "%s", "Content-Type: text/html\n\n"); }

1 0