April 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5006 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Apr '07

23 Apr '07

Author: anthm Date: Mon Apr 23 16:11:28 2007 New Revision: 5006 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Apr 23 16:11:28 2007 @@ -1090,11 +1090,17 @@ static void check_hangup_hook(struct js_session *jss) { - jsval argv[2] = { 0 }; + jsval argv[3] = { 0 }; int argc = 0; jsval ret; - if (jss->on_hangup) { + + if (jss->on_hangup && (jss->hook_state == CS_HANGUP || jss->hook_state == CS_RING)) { argv[argc++] = OBJECT_TO_JSVAL(jss->obj); + if (jss->hook_state == CS_HANGUP) { + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "hangup")); + } else { + argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(jss->cx, "transfer")); + } JS_CallFunction(jss->cx, jss->obj, jss->on_hangup, argc, argv, &ret); } } @@ -1103,16 +1109,21 @@ { switch_channel_t *channel; struct js_session *jss = NULL; + switch_channel_state_t state; channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (switch_channel_get_state(channel) != CS_EXECUTE) { - if ((jss = switch_channel_get_private(channel, "jss"))) { + state = switch_channel_get_state(channel); + + if ((jss = switch_channel_get_private(channel, "jss"))) { + if (jss->hook_state != state) { + jss->hook_state = state; check_hangup_hook(jss); } } + return SWITCH_STATUS_SUCCESS; } @@ -1128,6 +1139,7 @@ switch_channel_t *channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); jss->on_hangup = function; + jss->hook_state = switch_channel_get_state(channel); switch_channel_set_private(channel, "jss", jss); switch_core_event_hook_add_state_change(jss->session, hanguphook); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Mon Apr 23 16:11:28 2007 @@ -129,6 +129,7 @@ unsigned int flags; switch_call_cause_t cause; JSFunction *on_hangup; + switch_channel_state_t hook_state; };

1 0

[Freeswitch-svn] [commit] r5005 - in freeswitch/trunk: libs/iksemel/src libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 23 Apr '07

23 Apr '07

Author: anthm Date: Mon Apr 23 15:03:06 2007 New Revision: 5005 Modified: freeswitch/trunk/libs/iksemel/src/iks.c freeswitch/trunk/libs/iksemel/src/io-posix.c freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update dingaling Modified: freeswitch/trunk/libs/iksemel/src/iks.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/iks.c (original) +++ freeswitch/trunk/libs/iksemel/src/iks.c Mon Apr 23 15:03:06 2007 @@ -379,7 +379,7 @@ iks_name (iks *x) { if (x) { - if (IKS_TAG == x->type) + if (IKS_TAG == x->type) return IKS_TAG_NAME (x); else return IKS_ATTRIB_NAME (x); Modified: freeswitch/trunk/libs/iksemel/src/io-posix.c ============================================================================== --- freeswitch/trunk/libs/iksemel/src/io-posix.c (original) +++ freeswitch/trunk/libs/iksemel/src/io-posix.c Mon Apr 23 15:03:06 2007 @@ -110,8 +110,36 @@ tv.tv_sec = timeout; if (timeout != -1) tvptr = &tv; else tvptr = NULL; if (select (sock + 1, &fds, NULL, NULL, tvptr) > 0) { + memset(buffer, 0, buf_len); len = recv (sock, buffer, buf_len, 0); if (len > 0) { + char *p, *e = NULL, *t = NULL; + for (p = buffer; p && *p; p++) { + + if (*p == '>') { + e = p; + t = p+1; + if (*t == '<') { + continue; + } + while(t && *t) { + if (*t != ' ' && *t != '<') { + t = e = NULL; + break; + } + if (*t == '<') { + p = t; + *(p-1) = '>'; + *e = ' '; + e = NULL; + break; + } + + t++; + + } + } + } return len; } else if (len <= 0) { return -1; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Apr 23 15:03:06 2007 @@ -175,6 +175,7 @@ typedef struct ldl_feature ldl_feature_t; #define FEATURE_DISCO "http://jabber.org/protocol/disco" +#define FEATURE_DISCO_INFO "http://jabber.org/protocol/disco#info" #define FEATURE_VERSION "jabber:iq:version" #define FEATURE_VCARD "vcard-temp" #define FEATURE_VOICE "http://www.google.com/xmpp/protocol/voice/v1" @@ -182,6 +183,7 @@ static ldl_feature_t FEATURES[] = { { FEATURE_DISCO, on_disco_default }, + { FEATURE_DISCO_INFO, on_disco_default }, { FEATURE_VERSION, on_disco_default }, { FEATURE_VCARD, on_vcard}, { FEATURE_VOICE, on_disco_default }, @@ -414,11 +416,11 @@ dl_signal = LDL_SIGNAL_TRANSPORT_ACCEPT; } else if (!strcasecmp(type, "reject")) { dl_signal = LDL_SIGNAL_REJECT; - } else if (!strcasecmp(type, "transport-info")) { + } else if (!strcasecmp(type, "transport-info") || !strcasecmp(type, "candidates")) { char *tid = iks_find_attrib(xml, "id"); dl_signal = LDL_SIGNAL_CANDIDATES; tag = iks_child (xml); - + id = type; if (tag && !strcasecmp(iks_name(tag), "transport")) { tag = iks_child(tag); } @@ -560,7 +562,7 @@ } else if (pak->subtype == IKS_TYPE_GET) { if ((iq = iks_new("iq"))) { int all = 0; - + iks_insert_attrib(iq, "from", handle->login); iks_insert_attrib(iq, "to", pak->from->full); iks_insert_attrib(iq, "id", pak->id); @@ -578,15 +580,32 @@ if (!(tag = iks_insert (query, "identity"))) { goto fail; } - - if (!strcasecmp(ns, FEATURE_DISCO) && !node) { - all++; - } iks_insert_attrib(tag, "category", "gateway"); - iks_insert_attrib(tag, "type", "voice"); + //iks_insert_attrib(tag, "type", "voice"); iks_insert_attrib(tag, "name", "LibDingaLing"); - + + if (!strcasecmp(ns, FEATURE_DISCO_INFO)) { + if (!node) { + all++; + } else { + char *p; + + if ((p = strstr(node, "caps#"))) { + char *what = p + 5; + + if (!strcasecmp(what, "voice-v1")) { + if (!(tag = iks_insert (query, "feature"))) { + goto fail; + } + iks_insert_attrib(tag, "var", FEATURE_VOICE); + goto done; + } + + } + } + } + for (x = 0; FEATURES[x].name; x++) { if (all || !ns || !strcasecmp(ns, FEATURES[x].name)) { if (!(tag = iks_insert (query, "feature"))) { @@ -595,6 +614,9 @@ iks_insert_attrib(tag, "var", FEATURES[x].name); } } + + done: + apr_queue_push(handle->queue, iq); iq = NULL; send = 1; @@ -625,7 +647,7 @@ char *resource; struct ldl_buffer *buffer; ldl_signal_t dl_signal = LDL_SIGNAL_PRESENCE_IN; - + if (type && *type) { @@ -661,7 +683,7 @@ } } - if (resource && strstr(resource, "talk") && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) { + if (resource && (strstr(resource, "talk") || strstr(resource, "telepathy")) && (buffer = apr_hash_get(handle->probe_hash, id, APR_HASH_KEY_STRING))) { apr_cpystrn(buffer->buf, from, buffer->len); fflush(stderr); buffer->hit = 1; @@ -1857,7 +1879,7 @@ iq = NULL; sess = NULL; id = 0; - + new_session_iq(session, &iq, &sess, &id, "transport-info"); tag = iks_insert(sess, "transport"); iks_insert_attrib(tag, "xmlns", "http://www.google.com/transport/p2p"); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Apr 23 15:03:06 2007 @@ -1700,12 +1700,20 @@ user = ldl_handle_get_login(mdl_profile->handle); } else { if (!user) { - if (strchr(outbound_profile->caller_id_number, '@')) { - snprintf(ubuf, sizeof(ubuf), "%s/talk", outbound_profile->caller_id_number); + char *id_num; + + if (!(id_num = outbound_profile->caller_id_number)) { + if (!(id_num = outbound_profile->caller_id_name)) { + id_num = "nobody"; + } + } + + if (strchr(id_num, '@')) { + snprintf(ubuf, sizeof(ubuf), "%s/talk", id_num); user = ubuf; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid User!\n"); - terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", id_num, profile_name); + user = ubuf; } } } @@ -2871,14 +2879,27 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidates %s:%d\n", candidates[x].address, candidates[x].port); - if (!strcasecmp(candidates[x].protocol, "udp") && (!strcasecmp(candidates[x].type, "local") || !strcasecmp(candidates[x].type, "stun")) && ((profile->lanaddr && lanaddr) || (strncasecmp(candidates[x].address, "10.", 3) && strncasecmp(candidates[x].address, "192.168.", 8) && strncasecmp(candidates[x].address, "127.", 4) && strncasecmp(candidates[x].address, "255.", 4) && strncasecmp(candidates[x].address, "0.", 2) && strncasecmp(candidates[x].address, "1.", 2) && strncasecmp(candidates[x].address, "2.", 2) && strncasecmp(candidates[x].address, "172.16.", 7) && strncasecmp(candidates[x].address, "172.17.", 7) && strncasecmp(candidates[x].address, "172.18.", 7) && strncasecmp(candidates[x].address, "172.19.", 7) && strncasecmp(candidates[x].address, "172.2", 5) && strncasecmp(candidates[x].address, "172.30.", 7) && strncasecmp(candidates[x].address, "172.31.", 7) && strncasecmp(candidates[x].address, "192.0.2.", 8) && // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them? - strncasecmp - (candidates - [x]. - address, - "169.254.", - 8) - ))) { + // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them? + if (!strcasecmp(candidates[x].protocol, "udp") && + (!strcasecmp(candidates[x].type, "local") || !strcasecmp(candidates[x].type, "stun")) && + ((profile->lanaddr && + lanaddr) || (strncasecmp(candidates[x].address, "10.", 3) && + strncasecmp(candidates[x].address, "192.168.", 8) && + strncasecmp(candidates[x].address, "127.", 4) && + strncasecmp(candidates[x].address, "255.", 4) && + strncasecmp(candidates[x].address, "0.", 2) && + strncasecmp(candidates[x].address, "1.", 2) && + strncasecmp(candidates[x].address, "2.", 2) && + strncasecmp(candidates[x].address, "172.16.", 7) && + strncasecmp(candidates[x].address, "172.17.", 7) && + strncasecmp(candidates[x].address, "172.18.", 7) && + strncasecmp(candidates[x].address, "172.19.", 7) && + strncasecmp(candidates[x].address, "172.2", 5) && + strncasecmp(candidates[x].address, "172.30.", 7) && + strncasecmp(candidates[x].address, "172.31.", 7) && + strncasecmp(candidates[x].address, "192.0.2.", 8) && + strncasecmp(candidates[x].address, "169.254.", 8) + ))) { ldl_payload_t payloads[5]; memset(payloads, 0, sizeof(payloads)); @@ -2890,6 +2911,11 @@ ldl_session_accept_candidate(dlsession, &candidates[x]); } + if (!strcasecmp(subject, "candidates")) { + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); + } + if (lanaddr) { switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); }

1 0

[Freeswitch-svn] [commit] r5004 - freeswitch/trunk/libs/js
by Freeswitch SVN 23 Apr '07

23 Apr '07

Author: mikej Date: Mon Apr 23 14:12:08 2007 New Revision: 5004 Modified: freeswitch/trunk/libs/js/.update Log: force lib rebuild Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Mon Apr 23 14:12:08 2007 @@ -1 +1 @@ -Wed Feb 14 17:04:43 EST 2007 +Mon Apr 23 14:11:42 EDT 2007

1 0

[Freeswitch-svn] [commit] r5003 - freeswitch/trunk/conf
by Freeswitch SVN 23 Apr '07

23 Apr '07

Author: brian Date: Mon Apr 23 13:47:00 2007 New Revision: 5003 Modified: freeswitch/trunk/conf/sofia.conf.xml Log: add ext-sip-ip to sample config Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Mon Apr 23 13:47:00 2007 @@ -63,6 +63,7 @@    +

1 0

[Freeswitch-svn] [commit] r5002 - in freeswitch/trunk: libs/js/src src src/include src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Apr '07

23 Apr '07

Author: mikej Date: Mon Apr 23 11:33:25 2007 New Revision: 5002 Modified: freeswitch/trunk/libs/js/src/jspubtd.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/switch_apr.c Log: Fix 2 errors in mod_spidermonkey on windows. 1. We need a pool for apr_stat. Expand api and create a pool when necessary. 2. Don't use -1 value in enum for no reason as they can be signed or unsigned (compiler defined) so there is an int overflow. This fixes an incorrect assert in the spidermonkey exception handling caused by an unsigned int overflow. resolve http://jira.freeswitch.org/browse/MODLANG-7. Modified: freeswitch/trunk/libs/js/src/jspubtd.h ============================================================================== --- freeswitch/trunk/libs/js/src/jspubtd.h (original) +++ freeswitch/trunk/libs/js/src/jspubtd.h Mon Apr 23 11:33:25 2007 @@ -552,7 +552,7 @@ * JSEXN_NONE marks an unthrowable error. */ typedef enum JSExnType { - JSEXN_NONE = -1, + JSEXN_NONE, JSEXN_ERR, JSEXN_INTERNALERR, JSEXN_EVALERR, Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Apr 23 11:33:25 2007 @@ -733,7 +733,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_file_write(switch_file_t * thefile, const void *buf, switch_size_t *nbytes); -SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename); +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename, switch_memory_pool_t *pool); /** @} */ Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Apr 23 11:33:25 2007 @@ -2771,7 +2771,7 @@ path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); assert(path != NULL); - if (switch_file_exists(path) == SWITCH_STATUS_SUCCESS) { + if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { cmd = switch_mprintf("%s %s", path, account); assert(cmd != NULL); js_thread_launch(cmd); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Mon Apr 23 11:33:25 2007 @@ -91,7 +91,7 @@ script_name = path; } if (script_name) { - if (switch_file_exists(script_name) == SWITCH_STATUS_SUCCESS) { + if (switch_file_exists(script_name, NULL) == SWITCH_STATUS_SUCCESS) { script = JS_CompileFile(cx, obj, script_name); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Open File: %s\n", script_name); Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Apr 23 11:33:25 2007 @@ -335,17 +335,31 @@ return apr_file_write(thefile, buf, nbytes); } -SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename) +SWITCH_DECLARE(switch_status_t) switch_file_exists(const char *filename, switch_memory_pool_t *pool) { int32_t wanted = APR_FINFO_TYPE; + switch_memory_pool_t *our_pool = NULL; + switch_status_t status = SWITCH_STATUS_FALSE; apr_finfo_t info = { 0 }; + + if (!pool) { + if ((apr_pool_create(&our_pool, NULL)) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_MEMERR; + } + } + if (filename) { - apr_stat(&info, filename, wanted, NULL); + apr_stat(&info, filename, wanted, pool ? pool : our_pool); if (info.filetype != APR_NOFILE) { - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } } - return SWITCH_STATUS_FALSE; + + if (our_pool) { + apr_pool_destroy(our_pool); + } + + return status; } /* thread stubs */

1 0

[Freeswitch-svn] [commit] r5001 - in freeswitch/trunk: libs/sofia-sip src
by Freeswitch SVN 22 Apr '07

22 Apr '07

Author: anthm Date: Sun Apr 22 15:11:22 2007 New Revision: 5001 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_core_session.c Log: Small tweaks so it actually compiles Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun Apr 22 15:11:22 2007 @@ -1 +1 @@ -Tue Apr 19 14:23:59 EDT 2007 +Sat Apr 21 16:48:55 EDT 2007 Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sun Apr 22 15:11:22 2007 @@ -339,7 +339,7 @@ known_opt++; } - if (!known_opt || argv[x] && !strcmp(argv[x], "-help")) { + if ((!known_opt || argv[x]) && !strcmp(argv[x], "-help")) { printf("%s\n", usageDesc); exit(0); } Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sun Apr 22 15:11:22 2007 @@ -693,13 +693,14 @@ switch_core_session_run(session); switch_core_media_bug_remove_all(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %u (%s) Locked, Waiting on external entities\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %"SWITCH_SIZE_T_FMT" (%s) Locked, Waiting on external entities\n", session->id, switch_channel_get_name(session->channel)); switch_core_session_write_lock(session); switch_set_flag(session, SSF_DESTROYED); switch_core_session_rwunlock(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Session %u (%s) Ended\n", session->id, switch_channel_get_name(session->channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Session %"SWITCH_SIZE_T_FMT" (%s) Ended\n", + session->id, switch_channel_get_name(session->channel)); switch_core_session_destroy(&session); return NULL; } @@ -805,7 +806,7 @@ switch_thread_cond_create(&session->cond, session->pool); switch_thread_rwlock_create(&session->rwlock, session->pool); - snprintf(session->name, sizeof(session->name), "%u", session->id); + snprintf(session->name, sizeof(session->name), "%"SWITCH_SIZE_T_FMT, session->id); switch_mutex_lock(runtime.session_table_mutex); session->id = runtime.session_id++; switch_core_hash_insert(runtime.session_table, session->uuid_str, session);

1 0

[Freeswitch-svn] [commit] r5000 - freeswitch/trunk/libs/udns
by Freeswitch SVN 22 Apr '07

22 Apr '07

Author: mikej Date: Sun Apr 22 13:34:23 2007 New Revision: 5000 Modified: freeswitch/trunk/libs/udns/udns.h Log: fix udns/mod_enum msvc build. Modified: freeswitch/trunk/libs/udns/udns.h ============================================================================== --- freeswitch/trunk/libs/udns/udns.h (original) +++ freeswitch/trunk/libs/udns/udns.h Sun Apr 22 13:34:23 2007 @@ -35,6 +35,10 @@ # define UDNS_DATA_API __declspec(dllimport) # endif # endif +#ifdef _MSC_VER +#undef inline +#define inline __inline +#endif #endif #ifndef UDNS_API

1 0

[Freeswitch-svn] [commit] r4999 - in freeswitch/trunk/src: . include include/private mod/applications/mod_commands
by Freeswitch SVN 22 Apr '07

22 Apr '07

Author: mikej Date: Sat Apr 21 21:25:02 2007 New Revision: 4999 Modified: freeswitch/trunk/src/include/private/switch_core.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_session.c Log: add cumulative count of sessions from switch startup. Resolves http://jira.freeswitch.org/browse/FSCORE-18. Updated patch to change data type of session_id to avoid rollover (wouldn't that be nice) and added - 1 to accurately reflect count. Thanks bkw for the patch. Modified: freeswitch/trunk/src/include/private/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core.h (original) +++ freeswitch/trunk/src/include/private/switch_core.h Sat Apr 21 21:25:02 2007 @@ -83,7 +83,7 @@ struct switch_core_session { - uint32_t id; + switch_size_t id; char name[80]; switch_session_flag_t flags; int thread_running; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Apr 21 21:25:02 2007 @@ -442,6 +442,12 @@ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); /*! + \brief Provide the current session_id + \return the total number of allocated sessions since core startup +*/ +SWITCH_DECLARE(switch_size_t) switch_core_session_id(void); + +/*! \brief Allocate and return a new session from the core based on a given endpoint module name \param endpoint_name the name of the endpoint module \param pool the pool to use 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 Sat Apr 21 21:25:02 2007 @@ -84,6 +84,7 @@ duration.sec, duration.sec == 1 ? "" : "s", duration.ms, duration.ms == 1 ? "" : "s", duration.mms, duration.mms == 1 ? "" : "s"); + stream->write_function(stream, "%"SWITCH_SIZE_T_FMT" sessions since startup\n", switch_core_session_id() - 1 ); stream->write_function(stream, "%d sessions\n", switch_core_session_count()); if (html) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sat Apr 21 21:25:02 2007 @@ -40,7 +40,7 @@ switch_mutex_t *session_table_mutex; uint32_t session_count; uint32_t session_limit; - uint32_t session_id; + switch_size_t session_id; } runtime; @@ -820,6 +820,12 @@ return runtime.session_count; } +SWITCH_DECLARE(switch_size_t) switch_core_session_id(void) +{ + return runtime.session_id; +} + + SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(char *endpoint_name, switch_memory_pool_t **pool) { const switch_endpoint_interface_t *endpoint_interface;

1 0

[Freeswitch-svn] [commit] r4998 - freeswitch/trunk/src
by Freeswitch SVN 21 Apr '07

21 Apr '07

Author: mikej Date: Sat Apr 21 12:58:35 2007 New Revision: 4998 Modified: freeswitch/trunk/src/switch.c Log: manually apply patch http://jira.freeswitch.org/browse/FSCORE-24. Thanks dirk. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Apr 21 12:58:35 2007 @@ -210,6 +210,7 @@ int die = 0; char *usageDesc; int alt_dirs = 0; + int known_opt; #ifdef WIN32 SERVICE_TABLE_ENTRY dispatchTable[] = { @@ -238,13 +239,11 @@ #endif for (x = 1; x < argc; x++) { - if (argv[x] && !strcmp(argv[x], "-help")) { - printf("%s\n", usageDesc); - exit(0); - } + known_opt = 0; #ifdef WIN32 if (x == 1) { if (argv[x] && !strcmp(argv[x], "-service")) { + known_opt++; if (StartServiceCtrlDispatcher(dispatchTable) == 0) { /* Not loaded as a service */ fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); @@ -257,6 +256,7 @@ char servicePath[1024]; SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + known_opt++; GetModuleFileName(NULL, exePath, 1024); snprintf(servicePath, sizeof(servicePath), "%s -service", exePath); CreateService(handle, @@ -269,6 +269,7 @@ if (argv[x] && !strcmp(argv[x], "-uninstall")) { SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); SC_HANDLE service = OpenService(handle, SERVICENAME, DELETE); + known_opt++; if (service != NULL) { /* remove the service! */ DeleteService(service); @@ -280,18 +281,22 @@ if (argv[x] && !strcmp(argv[x], "-nf")) { nf++; + known_opt++; } #endif if (argv[x] && !strcmp(argv[x], "-hp")) { set_high_priority(); + known_opt++; } if (argv[x] && !strcmp(argv[x], "-stop")) { die++; + known_opt++; } if (argv[x] && !strcmp(argv[x], "-nc")) { nc++; + known_opt++; } @@ -305,6 +310,7 @@ fprintf(stderr, "When using -conf you must specify a config directory\n"); return 255; } + known_opt++; } if (argv[x] && !strcmp(argv[x], "-log")) { @@ -317,6 +323,7 @@ fprintf(stderr, "When using -log you must specify a log directory\n"); return 255; } + known_opt++; } if (argv[x] && !strcmp(argv[x], "-db")) { @@ -329,6 +336,12 @@ fprintf(stderr, "When using -db you must specify a db directory\n"); return 255; } + known_opt++; + } + + if (!known_opt || argv[x] && !strcmp(argv[x], "-help")) { + printf("%s\n", usageDesc); + exit(0); } }

1 0

[Freeswitch-svn] [commit] r4997 - in freeswitch/trunk/src: include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 21 Apr '07

21 Apr '07

Author: anthm Date: Sat Apr 21 11:04:01 2007 New Revision: 4997 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add reject app to do custom sip rejects Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Apr 21 11:04:01 2007 @@ -363,6 +363,7 @@ SWITCH_MESSAGE_INDICATE_HOLD - indicate hold SWITCH_MESSAGE_INDICATE_UNHOLD - indicate unhold SWITCH_MESSAGE_INDICATE_REDIRECT - indicate redirect + SWITCH_MESSAGE_INDICATE_REJECT - indicate reject </pre> */ typedef enum { @@ -378,7 +379,8 @@ SWITCH_MESSAGE_INDICATE_NOMEDIA, SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, - SWITCH_MESSAGE_INDICATE_REDIRECT + SWITCH_MESSAGE_INDICATE_REDIRECT, + SWITCH_MESSAGE_INDICATE_REJECT } switch_core_session_message_types_t; 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 Sat Apr 21 11:04:01 2007 @@ -298,6 +298,18 @@ } +static void reject_function(switch_core_session_t *session, char *data) +{ + switch_core_session_message_t msg = { 0 }; + + /* Tell the channel to reject the call */ + msg.from = __FILE__; + msg.string_arg = data; + msg.message_id = SWITCH_MESSAGE_INDICATE_REJECT; + switch_core_session_receive_message(session, &msg); + +} + static void set_function(switch_core_session_t *session, char *data) { @@ -711,6 +723,16 @@ /*.next */ &sched_hangup_application_interface }; +static const switch_application_interface_t reject_application_interface = { + /*.interface_name */ "reject", + /*.application_function */ reject_function, + /* long_desc */ "Send a reject message to a session.", + /* short_desc */ "Send session reject", + /* syntax */ "<reject_data>", + /* flags */ SAF_SUPPORT_NOMEDIA, + /*.next */ &queuedtmf_application_interface +}; + static const switch_application_interface_t redirect_application_interface = { /*.interface_name */ "redirect", /*.application_function */ redirect_function, @@ -718,7 +740,7 @@ /* short_desc */ "Send session redirect", /* syntax */ "<redirect_data>", /* flags */ SAF_SUPPORT_NOMEDIA, - /*.next */ &queuedtmf_application_interface + /*.next */ &reject_application_interface }; static const switch_application_interface_t ivr_application_interface = { 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 Sat Apr 21 11:04:01 2007 @@ -767,6 +767,32 @@ nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); } break; + case SWITCH_MESSAGE_INDICATE_REJECT: + if (msg->string_arg) { + int code = 0; + char *reason; + + if (switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Call is already answered, Rejecting with hangup\n"); + switch_channel_hangup(channel, SWITCH_CAUSE_CALL_REJECTED); + } else { + + if ((reason = strchr(msg->string_arg, ' '))) { + reason++; + code = atoi(msg->string_arg); + } else { + reason = "Call Refused"; + } + + if (!(code > 400 && code < 600)) { + code = 488; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rejecting with %d %s\n", code, reason); + nua_respond(tech_pvt->nh, code, reason, TAG_END()); + } + } + break; case SWITCH_MESSAGE_INDICATE_RINGING: nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); switch_channel_mark_ring_ready(channel);

1 0