- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4837 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: anthm Date: Mon Apr 2 21:24:24 2007 New Revision: 4837 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: wtf 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 2 21:24:24 2007 @@ -617,7 +617,11 @@ assert(nh != NULL); id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); - exp = switch_mprintf("active;expires=%ld", time(NULL) - expire_sec); + expire_sec -= time(NULL); + if (expire_sec < 0) { + expire_sec = 3600; + } + exp = switch_mprintf("active;expires=%ld", expire_sec); tmp = contact; contact = sofia_glue_get_url_from_contact(tmp, 0);

1 0

[commit] r4836 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Apr '07

03 Apr '07

Author: anthm Date: Mon Apr 2 21:08:14 2007 New Revision: 4836 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix 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 2 21:08:14 2007 @@ -144,7 +144,7 @@ return; } - if ((sql = switch_mprintf("select user,host,'Registered','unknown','' from sofia_handle_sip_registrations"))) { + if ((sql = switch_mprintf("select user,host,'Registered','unknown','' sip_registrations"))) { switch_mutex_lock(profile->ireg_mutex); switch_core_db_exec(db, sql, sofia_presence_resub_callback, profile, &errmsg); switch_mutex_unlock(profile->ireg_mutex); @@ -383,7 +383,7 @@ if (euser && host && (sql = - switch_mprintf("select user,host,status,rpid,'' from sofia_handle_sip_registrations where user='%q' and host='%q'", + switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", euser, host)) && (profile = sofia_glue_find_profile(host))) { if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); @@ -872,7 +872,7 @@ } if ((sql = - switch_mprintf("update sofia_handle_sip_registrations set status='%q',rpid='%q' where user='%q' and host='%q'", + switch_mprintf("update sip_registrations set status='%q',rpid='%q' where user='%q' and host='%q'", note_txt, rpid, from_user, from_host))) { sofia_glue_execute_sql(profile->dbname, sql, profile->ireg_mutex); switch_safe_free(sql);

1 0

[commit] r4835 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 19:34:58 2007 New Revision: 4835 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c 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 2 19:34:58 2007 @@ -2663,7 +2663,6 @@ for (y = 0; y < argc; y++) { snprintf(buf, sizeof(buf), "~argv[%d] = \"%s\";", x++, argv[y]); eval_some_js(buf, cx, javascript_global_object, &rval); - } } @@ -2764,10 +2763,13 @@ if (account) { char *text; - text = switch_mprintf("mwi.js %s", account); + text = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); assert(text != NULL); - js_thread_launch(text); + if (switch_file_exists(text) == SWITCH_STATUS_SUCCESS) { + js_thread_launch(text); + } + free(text); }

1 0

[commit] r4834 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 17:31:03 2007 New Revision: 4834 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c 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 2 17:31:03 2007 @@ -2651,7 +2651,7 @@ if ((arg = strchr(script, ' '))) { *arg++ = '\0'; - argc = switch_separate_string(arg, ':', argv, (sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(arg, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } if (argc) { /* create a js doppleganger of this argc/argv */ @@ -2757,6 +2757,22 @@ /*.directory_interface */ NULL }; +static void message_query_handler(switch_event_t *event) +{ + char *account = switch_event_get_header(event, "message-account"); + + if (account) { + char *text; + + text = switch_mprintf("mwi.js %s", account); + assert(text != NULL); + + js_thread_launch(text); + free(text); + } + +} + SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) { switch_status_t status; @@ -2765,6 +2781,12 @@ return status; } + if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) + != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = &spidermonkey_module_interface;

1 0

[commit] r4833 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 16:33:06 2007 New Revision: 4833 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: update 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 2 16:33:06 2007 @@ -606,7 +606,8 @@ sofia_profile_t *profile; char *tmp, *id = NULL; nua_handle_t *nh; - + int expire_sec = atoi(expires); + if (!(profile = sofia_glue_find_profile(sub_to_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", host); return 0; @@ -616,7 +617,7 @@ assert(nh != NULL); id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); - exp = switch_mprintf("active;expires=%s", expires ? expires : "3600"); + exp = switch_mprintf("active;expires=%ld", time(NULL) - expire_sec); tmp = contact; contact = sofia_glue_get_url_from_contact(tmp, 0);

1 0

[commit] r4832 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia mod/languages/mod_spidermonkey
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 16:20:46 2007 New Revision: 4832 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_event.c Log: cleanup Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Apr 2 16:20:46 2007 @@ -796,6 +796,8 @@ SWITCH_EVENT_PRESENCE_IN - Presence in SWITCH_EVENT_PRESENCE_OUT - Presence out SWITCH_EVENT_PRESENCE_PROBE - Presence probe + SWITCH_EVENT_MESSAGE_WAITING - A message is waiting + SWITCH_EVENT_MESSAGE_QUERY - A query for MESSAGE_WAITING events SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_DETECTED_SPEECH - Detected Speech @@ -841,6 +843,8 @@ SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_PRESENCE_PROBE, + SWITCH_EVENT_MESSAGE_WAITING, + SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_ROSTER, SWITCH_EVENT_CODEC, SWITCH_EVENT_BACKGROUND_JOB, 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 2 16:20:46 2007 @@ -454,9 +454,8 @@ char *event_name = argv[5]; if (!strcasecmp(event_name, "message-summary")) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "no"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "sip:%s@%s", user, host); + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Account", "sip:%s@%s", user, host); switch_event_fire(&event); } return 0; 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 2 16:20:46 2007 @@ -128,6 +128,7 @@ if ((eo = malloc(sizeof(*eo)))) { if (switch_name_event(ename, &etype) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown event %s\n", ename); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); return JS_TRUE; } @@ -146,7 +147,7 @@ } } else { - if (!switch_event_create(&event, etype) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, etype) != SWITCH_STATUS_SUCCESS) { *rval = BOOLEAN_TO_JSVAL(JS_FALSE); return JS_TRUE; } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Apr 2 16:20:46 2007 @@ -126,6 +126,8 @@ "PRESENCE_IN", "PRESENCE_OUT", "PRESENCE_PROBE", + "MESSAGE_WAITING", + "MESSAGE_QUERY", "ROSTER", "CODEC", "BACKGROUND_JOB", @@ -313,7 +315,7 @@ assert(RUNTIME_POOL != NULL); for (x = 0; x <= SWITCH_EVENT_ALL; x++) { - if (!strcasecmp(name, EVENT_NAMES[x])) { + if ((strlen(name) > 13 && !strcasecmp(name + 13, EVENT_NAMES[x])) || !strcasecmp(name, EVENT_NAMES[x])) { *type = x; return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r4831 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 15:54:25 2007 New Revision: 4831 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 freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: cleanup 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 2 15:54:25 2007 @@ -1008,22 +1008,32 @@ config_sofia(0); - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) + != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) + != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) + != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_ROSTER, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind((char *) modname, SWITCH_EVENT_ROSTER, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_event_handler, NULL) + != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + + if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_WAITING, SWITCH_EVENT_SUBCLASS_ANY, sofia_presence_mwi_event_handler, NULL) + != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } 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 2 15:54:25 2007 @@ -361,6 +361,7 @@ char *sofia_reg_find_reg_url(sofia_profile_t * profile, const char *user, const char *host, char *val, switch_size_t len); void event_handler(switch_event_t *event); void sofia_presence_event_handler(switch_event_t *event); +void sofia_presence_mwi_event_handler(switch_event_t *event); void sofia_presence_cancel(void); switch_status_t config_sofia(int reload); auth_res_t parse_auth(sofia_profile_t * profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen); @@ -394,6 +395,7 @@ outbound_reg_t *sofia_reg_find_gateway(char *key); void sofia_reg_add_gateway(char *key, outbound_reg_t * gateway); void sofia_glue_pass_sdp(private_object_t * tech_pvt, char *sdp); +int sofia_glue_get_user_host(char *in, char **user, char **host); switch_call_cause_t sofia_glue_sip_cause_to_freeswitch(int status); void sofia_glue_do_xfer_invite(switch_core_session_t *session); uint8_t sofia_reg_handle_register(nua_t * nua, sofia_profile_t * profile, nua_handle_t * nh, sip_t const *sip, sofia_regtype_t regtype, char *key, uint32_t keylen); @@ -401,6 +403,4 @@ void sofia_presence_set_chat_hash(private_object_t * tech_pvt, sip_t const *sip); switch_status_t sofia_on_hangup(switch_core_session_t *session); char *sofia_glue_get_url_from_contact(char *buf, uint8_t to_dup); -int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames); -int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames); void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip); 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 2 15:54:25 2007 @@ -29,7 +29,7 @@ * Bret McDanel <trixter AT 0xdecafbad.com> * * - * sofia.c -- SOFIA SIP Endpoint + * sofia.c -- SOFIA SIP Endpoint (sofia code) * */ #include "mod_sofia.h" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon Apr 2 15:54:25 2007 @@ -1,3 +1,37 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> + * Paul D. Tinsley <pdt at jackhammer.org> + * Bret McDanel <trixter AT 0xdecafbad.com> + * + * + * sofia_glue.c -- SOFIA SIP Endpoint (code to tie sofia to freeswitch) + * + */ #include "mod_sofia.h" @@ -1107,4 +1141,32 @@ } +int sofia_glue_get_user_host(char *in, char **user, char **host) +{ + char *p, *h, *u = in; + + *user = NULL; + *host = NULL; + + if (!strncasecmp(u, "sip:", 4)) { + u += 4; + } + + if ((h = strchr(u, '@'))) { + *h++ = '\0'; + } else { + return 0; + } + p = h + strlen(h) - 1; + + if (p && (*p == ':' || *p == ';' || *p == ' ')) { + *p = '\0'; + } + + *user = u; + *host = h; + + return 1; + +} 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 2 15:54:25 2007 @@ -1,5 +1,43 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> + * Paul D. Tinsley <pdt at jackhammer.org> + * Bret McDanel <trixter AT 0xdecafbad.com> + * + * + * sofia_presence.c -- SOFIA SIP Endpoint (presence code) + * + */ #include "mod_sofia.h" +static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char **columnNames); +static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames); +static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames); +static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames); switch_status_t sofia_presence_chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { @@ -154,6 +192,70 @@ return r; } +void sofia_presence_mwi_event_handler(switch_event_t *event) +{ + char *account, *dup_account, *yn, *host, *user; + char *sql; + switch_core_db_t *db; + sofia_profile_t *profile; + char *errmsg = NULL; + switch_stream_handle_t stream = { 0 }; + switch_event_header_t *hp; + + assert(event != NULL); + + if (!(account = switch_event_get_header(event, "mwi-message-account"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Message-Account'\n"); + return; + } + + if (!(yn = switch_event_get_header(event, "mwi-messages-waiting"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing required Header 'MWI-Messages-Waiting'\n"); + return; + } + + dup_account = strdup(account); + assert(dup_account != NULL); + sofia_glue_get_user_host(dup_account, &user, &host); + + if (!host || !(profile = sofia_glue_find_profile(host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", switch_str_nil(host)); + return; + } + + + if (!(db = switch_core_db_open_file(profile->dbname))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); + return; + } + + SWITCH_STANDARD_STREAM(stream); + + for (hp = event->headers; hp; hp = hp->next) { + if (!strncasecmp(hp->name, "mwi-", 4)) { + stream.write_function(&stream, "%s: %s\r\n", hp->name + 4, hp->value); + } + } + + stream.write_function(&stream, "\r\n"); + + sql = switch_mprintf("select *,'%q' from sip_subscriptions where event='message-summary' and sub_to_user='%q' and sub_to_host='%q'", + stream.data, user, host); + + switch_safe_free(stream.data); + + assert (sql != NULL); + + switch_mutex_lock(profile->ireg_mutex); + switch_core_db_exec(db, sql, sofia_presence_mwi_callback, profile, &errmsg); + if (errmsg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR: %s\n", errmsg); + } + switch_mutex_unlock(profile->ireg_mutex); + switch_safe_free(sql); + switch_safe_free(dup_account); +} + void sofia_presence_event_handler(switch_event_t *event) { sofia_profile_t *profile; @@ -341,7 +443,7 @@ switch_safe_free(user); } -int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames) +static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames) { sofia_profile_t *profile = (sofia_profile_t *) pArg; //char *proto = argv[0]; @@ -349,6 +451,17 @@ char *host = argv[2]; switch_event_t *event; char *status = NULL; + char *event_name = argv[5]; + + if (!strcasecmp(event_name, "message-summary")) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "no"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "sip:%s@%s", user, host); + switch_event_fire(&event); + } + return 0; + } + if (switch_strlen_zero(status)) { status = "Available"; } @@ -365,7 +478,7 @@ return 0; } -int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames) +static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames) { sofia_profile_t *profile = (sofia_profile_t *) pArg; char *user = argv[0]; @@ -392,7 +505,7 @@ return 0; } -int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) +static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) { sofia_profile_t *profile = (sofia_profile_t *) pArg; char *pl; @@ -476,6 +589,57 @@ return 0; } +static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + //char *proto = argv[0]; + //char *user = argv[1]; + char *host = argv[2]; + char *sub_to_user = argv[3]; + char *sub_to_host = argv[4]; + char *event = argv[5]; + char *contact = argv[6]; + char *call_id = argv[7]; + char *full_from = argv[8]; + char *full_via = argv[9]; + char *expires = argv[10]; + char *body = argv[11]; + char *exp; + sofia_profile_t *profile; + char *tmp, *id = NULL; + nua_handle_t *nh; + + if (!(profile = sofia_glue_find_profile(sub_to_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", host); + return 0; + } + + nh = nua_handle(profile->nua, NULL, TAG_END()); + assert(nh != NULL); + + id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + exp = switch_mprintf("active;expires=%s", expires ? expires : "3600"); + + tmp = contact; + contact = sofia_glue_get_url_from_contact(tmp, 0); + + nua_notify(nh, + NUTAG_URL(contact), + SIPTAG_TO_STR(full_from), + SIPTAG_FROM_STR(id), + //SIPTAG_CONTACT_STR(profile->url), + SIPTAG_CONTACT_STR(id), + SIPTAG_CALL_ID_STR(call_id), + SIPTAG_VIA_STR(full_via), + SIPTAG_SUBSCRIPTION_STATE_STR(exp), + SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + + + switch_safe_free(id); + switch_safe_free(exp); + return 0; +} + + void sofia_presence_handle_sip_i_subscribe(int status, 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[]) 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 Mon Apr 2 15:54:25 2007 @@ -1,3 +1,37 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> + * Paul D. Tinsley <pdt at jackhammer.org> + * Bret McDanel <trixter AT 0xdecafbad.com> + * + * + * sofia_ref.c -- SOFIA SIP Endpoint (registration code) + * + */ #include "mod_sofia.h"

1 0

[commit] r4830 - freeswitch/trunk/build
by Freeswitch SVN 02 Apr '07

02 Apr '07

Author: anthm Date: Mon Apr 2 11:36:05 2007 New Revision: 4830 Modified: freeswitch/trunk/build/turbo_build.sh Log: update Modified: freeswitch/trunk/build/turbo_build.sh ============================================================================== --- freeswitch/trunk/build/turbo_build.sh (original) +++ freeswitch/trunk/build/turbo_build.sh Mon Apr 2 11:36:05 2007 @@ -5,7 +5,7 @@ fi if [ -z $arg ] ; then - $MAKE -j8 core + $MAKE -j20 freeswitch MODS=`cat modules.conf | grep -v \#` for i in $MODS ; do MOD_NAME=`echo $i | sed -e 's|^.*/||'`

1 0

[commit] r4829 - in freeswitch/trunk/libs/js/nsprpub: . pr/src/md/unix
by Freeswitch SVN 01 Apr '07

01 Apr '07

Author: mikej Date: Sun Apr 1 19:12:57 2007 New Revision: 4829 Modified: freeswitch/trunk/libs/js/nsprpub/configure.in freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s Log: fix nspr sun cc build on linux Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Sun Apr 1 19:12:57 2007 @@ -1391,15 +1391,13 @@ AC_DEFINE(LINUX) ;; esac - CFLAGS="$CFLAGS -Wall" - CXXFLAGS="$CXXFLAGS -Wall" MDCPUCFG_H=_linux.cfg PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + _DEBUG_FLAGS="-g" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined # functions (even when using DWARF2 as the # debugging format) @@ -1872,7 +1870,7 @@ *-sunos*) AC_DEFINE(XP_UNIX) AC_DEFINE(SUNOS4) - CFLAGS="$CFLAGS -Wall -Wno-format" +# CFLAGS="$CFLAGS -Wall -Wno-format" if test "$USE_MDUPDATE"; then CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" fi Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s Sun Apr 1 19:12:57 2007 @@ -91,4 +91,4 @@ ret / Magic indicating no need for an executable stack -.section .note.GNU-stack, "", @progbits ; .previous +/.section .note.GNU-stack, "", @progbits ; .previous

1 0

[commit] r4828 - in freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub: . pr/src/md/unix
by Freeswitch SVN 01 Apr '07

01 Apr '07

Author: mikej Date: Sun Apr 1 18:49:10 2007 New Revision: 4828 Modified: freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/configure.in freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s Log: fix sun cc build of nspr Modified: freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/configure.in (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/configure.in Sun Apr 1 18:49:10 2007 @@ -1391,15 +1391,13 @@ AC_DEFINE(LINUX) ;; esac - CFLAGS="$CFLAGS -Wall" - CXXFLAGS="$CXXFLAGS -Wall" MDCPUCFG_H=_linux.cfg PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that + _DEBUG_FLAGS="-g" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined # functions (even when using DWARF2 as the # debugging format) @@ -1872,7 +1870,7 @@ *-sunos*) AC_DEFINE(XP_UNIX) AC_DEFINE(SUNOS4) - CFLAGS="$CFLAGS -Wall -Wno-format" +# CFLAGS="$CFLAGS -Wall -Wno-format" if test "$USE_MDUPDATE"; then CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)" fi Modified: freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s ============================================================================== --- freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s (original) +++ freeswitch/branches/mikej/sofiasip-upgrade/libs/js/nsprpub/pr/src/md/unix/os_Linux_x86_64.s Sun Apr 1 18:49:10 2007 @@ -91,4 +91,4 @@ ret / Magic indicating no need for an executable stack -.section .note.GNU-stack, "", @progbits ; .previous +/.section .note.GNU-stack, "", @progbits ; .previous

1 0