- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3722 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_sofia
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Tue Dec 19 13:04:07 2006 New Revision: 3722 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: xmas presence 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 Tue Dec 19 13:04:07 2006 @@ -312,17 +312,25 @@ switch_core_db_t *db; char *errmsg; char *to = switch_event_get_header(event, "to"); + char *f_host = NULL; + if (to) { + if ((f_host = strchr(to, '@'))) { + f_host++; + } + } - if (to && (sql = switch_mprintf("select * from subscriptions where sub_to='%q'", to))) { - 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; + if (f_host && (profile = switch_core_hash_find(globals.profile_hash, f_host))) { + if (to && (sql = switch_mprintf("select * from subscriptions where sub_to='%q'", to))) { + 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_mutex_lock(profile->mutex); + switch_core_db_exec(db, sql, sin_callback, profile, &errmsg); + switch_mutex_unlock(profile->mutex); + switch_core_db_close(db); + switch_safe_free(sql); } - switch_mutex_lock(profile->mutex); - switch_core_db_exec(db, sql, sin_callback, profile, &errmsg); - switch_mutex_unlock(profile->mutex); - switch_core_db_close(db); - switch_safe_free(sql); } } return; 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 Tue Dec 19 13:04:07 2006 @@ -5346,7 +5346,7 @@ *host++ = '\0'; } if (user && host && - (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) { + (sql = switch_mprintf("select user,host,status,rpid,'' from sip_registrations where user='%q' and host='%q'", user, host))) { switch_mutex_lock(profile->ireg_mutex); switch_core_db_exec(db, sql, resub_callback, profile, &errmsg); switch_mutex_unlock(profile->ireg_mutex);

1 0

[commit] r3721 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_sofia
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Tue Dec 19 12:51:36 2006 New Revision: 3721 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: xmas presence 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 Tue Dec 19 12:51:36 2006 @@ -306,7 +306,8 @@ } switch(event->event_id) { - case SWITCH_EVENT_PRESENCE_PROBE: { + case SWITCH_EVENT_PRESENCE_PROBE: + if (proto && !strcasecmp(proto, MDL_CHAT_PROTO)) { char *sql; switch_core_db_t *db; char *errmsg; @@ -323,7 +324,7 @@ switch_core_db_close(db); switch_safe_free(sql); } - } + } return; case SWITCH_EVENT_PRESENCE_IN: if (!status) { 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 Tue Dec 19 12:51:36 2006 @@ -5326,34 +5326,35 @@ switch(event->event_id) { - case SWITCH_EVENT_PRESENCE_PROBE: { - switch_core_db_t *db; - char *to = switch_event_get_header(event, "to"); - char *user, *host; + case SWITCH_EVENT_PRESENCE_PROBE: + if (proto && !strcasecmp(proto, SOFIA_CHAT_PROTO)) { + switch_core_db_t *db; + char *to = switch_event_get_header(event, "to"); + char *user, *host; - if (!to || !(user = strdup(to))) { - return; - } + if (!to || !(user = strdup(to))) { + 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); + 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); + switch_safe_free(user); + return; + } + + if ((host = strchr(user, '@'))) { + *host++ = '\0'; + } + if (user && host && + (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) { + switch_mutex_lock(profile->ireg_mutex); + switch_core_db_exec(db, sql, resub_callback, profile, &errmsg); + switch_mutex_unlock(profile->ireg_mutex); + switch_safe_free(sql); + } switch_safe_free(user); - return; + switch_core_db_close(db); } - - if ((host = strchr(user, '@'))) { - *host++ = '\0'; - } - if (user && host && - (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) { - switch_mutex_lock(profile->ireg_mutex); - switch_core_db_exec(db, sql, resub_callback, profile, &errmsg); - switch_mutex_unlock(profile->ireg_mutex); - switch_safe_free(sql); - } - switch_safe_free(user); - switch_core_db_close(db); - } return; case SWITCH_EVENT_PRESENCE_IN: sql = switch_mprintf("select 1,'%q','%q',* from sip_subscriptions where proto='%q' and event='%q' and sub_to_user='%q' and sub_to_host='%q'",

1 0

[commit] r3720 - in freeswitch/trunk/src/mod/endpoints: mod_dingaling mod_sofia
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Tue Dec 19 12:48:50 2006 New Revision: 3720 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: xmas presence 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 Tue Dec 19 12:48:50 2006 @@ -190,6 +190,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t dl_signal, char *to, char *from, char *subject, char *msg); static ldl_status handle_response(ldl_handle_t *handle, char *id); static switch_status_t load_config(void); +static int sin_callback(void *pArg, int argc, char **argv, char **columnNames); #define is_special(s) (s && (strstr(s, "ext+") || strstr(s, "user+"))) @@ -305,6 +306,25 @@ } switch(event->event_id) { + case SWITCH_EVENT_PRESENCE_PROBE: { + char *sql; + switch_core_db_t *db; + char *errmsg; + char *to = switch_event_get_header(event, "to"); + + if (to && (sql = switch_mprintf("select * from subscriptions where sub_to='%q'", to))) { + 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_mutex_lock(profile->mutex); + switch_core_db_exec(db, sql, sin_callback, profile, &errmsg); + switch_mutex_unlock(profile->mutex); + switch_core_db_close(db); + switch_safe_free(sql); + } + } + return; case SWITCH_EVENT_PRESENCE_IN: if (!status) { status = "Available"; @@ -1614,6 +1634,11 @@ } if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, pres_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, pres_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.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Dec 19 12:48:50 2006 @@ -5326,6 +5326,35 @@ switch(event->event_id) { + case SWITCH_EVENT_PRESENCE_PROBE: { + switch_core_db_t *db; + char *to = switch_event_get_header(event, "to"); + char *user, *host; + + if (!to || !(user = strdup(to))) { + 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); + switch_safe_free(user); + return; + } + + if ((host = strchr(user, '@'))) { + *host++ = '\0'; + } + if (user && host && + (sql = switch_mprintf("select user,host,'Registered','unknown','' from sip_registrations where user='%q' and host='%q'", user, host))) { + switch_mutex_lock(profile->ireg_mutex); + switch_core_db_exec(db, sql, resub_callback, profile, &errmsg); + switch_mutex_unlock(profile->ireg_mutex); + switch_safe_free(sql); + } + switch_safe_free(user); + switch_core_db_close(db); + } + return; case SWITCH_EVENT_PRESENCE_IN: sql = switch_mprintf("select 1,'%q','%q',* from sip_subscriptions where proto='%q' and event='%q' and sub_to_user='%q' and sub_to_host='%q'", status , rpid, proto, event_type, euser, host); @@ -5402,6 +5431,11 @@ } if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, pres_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, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; }

1 0

[commit] r3719 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Tue Dec 19 12:29:33 2006 New Revision: 3719 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: xmas presence Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Tue Dec 19 12:29:33 2006 @@ -297,7 +297,7 @@ static ldl_status parse_session_code(ldl_handle_t *handle, char *id, char *from, char *to, iks *xml, char *xtype) { ldl_session_t *session = NULL; - ldl_signal_t signal = LDL_SIGNAL_NONE; + ldl_signal_t dl_signal = LDL_SIGNAL_NONE; char *initiator = iks_find_attrib(xml, "initiator"); char *msg = NULL; @@ -327,7 +327,7 @@ if (!strcasecmp(type, "initiate") || !strcasecmp(type, "accept")) { - signal = LDL_SIGNAL_INITIATE; + dl_signal = LDL_SIGNAL_INITIATE; if (!strcasecmp(type, "accept")) { msg = "accept"; } @@ -363,10 +363,10 @@ tag = iks_next_tag(tag); } } else if (!strcasecmp(type, "transport-accept")) { - signal = LDL_SIGNAL_TRANSPORT_ACCEPT; + dl_signal = LDL_SIGNAL_TRANSPORT_ACCEPT; } else if (!strcasecmp(type, "transport-info")) { char *tid = iks_find_attrib(xml, "id"); - signal = LDL_SIGNAL_CANDIDATES; + dl_signal = LDL_SIGNAL_CANDIDATES; tag = iks_child (xml); if (tag && !strcasecmp(iks_name(tag), "transport")) { @@ -458,17 +458,17 @@ tag = iks_next_tag(tag); } } else if (!strcasecmp(type, "terminate")) { - signal = LDL_SIGNAL_TERMINATE; + dl_signal = LDL_SIGNAL_TERMINATE; } else if (!strcasecmp(type, "error")) { - signal = LDL_SIGNAL_ERROR; + dl_signal = LDL_SIGNAL_ERROR; } } xml = iks_child(xml); } - if (handle->session_callback && signal) { - handle->session_callback(handle, session, signal, to, from, id, msg); + if (handle->session_callback && dl_signal) { + handle->session_callback(handle, session, dl_signal, to, from, id, msg); } return LDL_STATUS_SUCCESS; @@ -700,22 +700,24 @@ char id[1024]; char *resource; struct ldl_buffer *buffer; - ldl_signal_t signal; + ldl_signal_t dl_signal = LDL_SIGNAL_PRESENCE_IN; - - if (type && !strcasecmp(type, "unavailable")) { - signal = LDL_SIGNAL_PRESENCE_OUT; - } else if (type && !strcasecmp(type, "probe")) { - signal = LDL_SIGNAL_PRESENCE_PROBE; - } else { - signal = LDL_SIGNAL_PRESENCE_IN; - } + if (type && *type) { + if (!strcasecmp(type, "unavailable")) { + dl_signal = LDL_SIGNAL_PRESENCE_OUT; + } else if (!strcasecmp(type, "probe")) { + dl_signal = LDL_SIGNAL_PRESENCE_PROBE; + } + if (!status) { + status = type; + } + } else { + if (!status) { + status = "Available"; + } + } - if (!status) { - status = type; - } - apr_cpystrn(id, from, sizeof(id)); lowercase(id); @@ -738,7 +740,7 @@ } if (handle->session_callback) { - handle->session_callback(handle, NULL, signal, to, id, status ? status : "n/a", show ? show : "n/a"); + handle->session_callback(handle, NULL, dl_signal, to, id, status ? status : "n/a", show ? show : "n/a"); } return IKS_FILTER_EAT; 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 Tue Dec 19 12:29:33 2006 @@ -187,7 +187,7 @@ switch_io_flag_t flags, int stream_id); static switch_status_t channel_kill_channel(switch_core_session_t *session, int sig); -static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *to, char *from, char *subject, char *msg); +static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t dl_signal, char *to, char *from, char *subject, char *msg); static ldl_status handle_response(ldl_handle_t *handle, char *id); static switch_status_t load_config(void); @@ -2065,7 +2065,7 @@ switch_safe_free(xmlstr); } -static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *to, char *from, char *subject, char *msg) +static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t dl_signal, char *to, char *from, char *subject, char *msg) { struct mdl_profile *profile = NULL; switch_core_session_t *session = NULL; @@ -2085,7 +2085,7 @@ if (!dlsession) { if (profile->user_flags & LDL_FLAG_COMPONENT) { - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_VCARD: do_vcard(handle, to, from, subject); break; @@ -2174,8 +2174,8 @@ switch_event_fire(&event); } } - break; #endif + break; case LDL_SIGNAL_PRESENCE_OUT: @@ -2183,7 +2183,8 @@ execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } - + printf("XXXXXXXXXXXXXXXXXXXXXXXXXXNO FUCKING WAY!!! %d %d\n", dl_signal, LDL_SIGNAL_PRESENCE_OUT); + abort(); if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_PROTO); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); @@ -2196,7 +2197,7 @@ } } - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_MSG: { switch_chat_interface_t *ci; char *proto = MDL_CHAT_PROTO; @@ -2284,7 +2285,7 @@ } } else { - if (signal != LDL_SIGNAL_INITIATE) { + if (dl_signal != LDL_SIGNAL_INITIATE) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n"); status = LDL_STATUS_FALSE; goto done; @@ -2325,7 +2326,7 @@ } - switch(signal) { + switch(dl_signal) { case LDL_SIGNAL_MSG: if (msg) { if (*msg == '+') { @@ -2370,7 +2371,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); break; case LDL_SIGNAL_INITIATE: - if (signal) { + if (dl_signal) { ldl_payload_t *payloads; unsigned int len = 0; int match = 0; @@ -2448,7 +2449,7 @@ break; case LDL_SIGNAL_CANDIDATES: - if (signal) { + if (dl_signal) { ldl_candidate_t *candidates; unsigned int len = 0; unsigned int x; 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 Tue Dec 19 12:29:33 2006 @@ -3234,7 +3234,10 @@ open = "closed"; } - if (strcasecmp(proto, SOFIA_CHAT_PROTO)) { + if (!strcasecmp(sub_to_host, host)) { + /* same host */ + id = switch_mprintf("sip:%s+%s@%s", proto, sub_to_user, sub_to_host); + } else if (strcasecmp(proto, SOFIA_CHAT_PROTO)) { /*encapsulate*/ id = switch_mprintf("sip:%s+%s+%s@%s", proto, sub_to_user, sub_to_host, host); } else { @@ -3268,7 +3271,7 @@ nua_notify(nh, NUTAG_URL(contact), SIPTAG_TO_STR(full_from), - SIPTAG_FROM_STR(to), + SIPTAG_FROM_STR(id), SIPTAG_CONTACT_STR(profile->url), SIPTAG_CALL_ID_STR(callid), SIPTAG_VIA_STR(full_via), @@ -3406,6 +3409,13 @@ exp_raw = (sip->sip_expires ? sip->sip_expires->ex_delta : 3600); exp = (long) time(NULL) + exp_raw; + if (sip && sip->sip_from) { + from_user = (char *) sip->sip_from->a_url->url_user; + from_host = (char *) sip->sip_from->a_url->url_host; + } else { + from_user = "n/a"; + from_host = "n/a"; + } if ((sql = switch_mprintf("delete from sip_subscriptions where " "proto='%q' and user='%q' and host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q';\n"

1 0

[commit] r3718 - freeswitch/trunk
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: mikej Date: Tue Dec 19 09:49:03 2006 New Revision: 3718 Modified: freeswitch/trunk/Freeswitch.sln Log: cleanup dependencies for spidermonkey module builds for windows. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Tue Dec 19 09:49:03 2006 @@ -560,11 +560,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" @@ -582,11 +583,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_etpan", "src\mod\languages\mod_spidermonkey_etpan\mod_spidermonkey_etpan.vcproj", "{D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9}" ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" @@ -595,6 +597,7 @@ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download ETPAN", "libs\win32\Download ETPAN.vcproj", "{EAE4F6B7-B1E3-4975-8580-481E47A9BEAB}" @@ -604,26 +607,14 @@ {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} = {EAE4F6B7-B1E3-4975-8580-481E47A9BEAB} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsangoma", "libs\libsangoma\libsangoma.vcproj", "{7E60CC2D-E818-4712-8F16-C0E6EC64982F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_wanpipe", "src\mod\endpoints\mod_wanpipe\mod_wanpipe.vcproj", "{DEB84241-385F-471F-A6B6-0C93FBB3B03D}" - ProjectSection(ProjectDependencies) = postProject - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {7E60CC2D-E818-4712-8F16-C0E6EC64982F} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Global @@ -1012,10 +1003,6 @@ {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Debug|Win32.Build.0 = Debug|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Release|Win32.ActiveCfg = Release|Win32 {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE}.Release|Win32.Build.0 = Release|Win32 - {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E60CC2D-E818-4712-8F16-C0E6EC64982F}.Release|Win32.ActiveCfg = Release|Win32 - {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEB84241-385F-471F-A6B6-0C93FBB3B03D}.Release|Win32.ActiveCfg = Release|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.ActiveCfg = Debug|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Debug|Win32.Build.0 = Debug|Win32 {AB91A099-7690-4ECF-8994-E458F4EA1ED4}.Release|Win32.ActiveCfg = Release|Win32 @@ -1057,7 +1044,6 @@ {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} - {DEB84241-385F-471F-A6B6-0C93FBB3B03D} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {2D57D093-3F8D-4729-AD9A-68E945C200A5} {07113B25-D3AF-4E04-BA77-4CD1171F022C} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} {A27CCA23-1541-4337-81A4-F0A6413078A0} = {C5F182F9-754A-4EC5-B50F-76ED02BE13F4} @@ -1094,7 +1080,6 @@ {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {BA4DED3C-E56F-4484-BFC3-9C13E461A1BE} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {7E60CC2D-E818-4712-8F16-C0E6EC64982F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} {B0C6CFF9-7DCD-4A21-8BA4-C2011E18DED8} = {0C808854-54D1-4230-BFF5-77B5FD905000} {7B077E7F-1BE7-4291-AB86-55E527B25CAC} = {0C808854-54D1-4230-BFF5-77B5FD905000}

1 0

[commit] r3717 - freeswitch/trunk/src
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: mikej Date: Tue Dec 19 09:28:41 2006 New Revision: 3717 Modified: freeswitch/trunk/src/switch_rtp.c Log: cast, bit-field will always be within the boundaries of (switch_payload_t) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Dec 19 09:28:41 2006 @@ -897,7 +897,7 @@ rtp_session->recv_msg.header.pt = 97; } rtp_session->rseq = ntohs(rtp_session->recv_msg.header.seq); - rtp_session->rpayload = rtp_session->recv_msg.header.pt; + rtp_session->rpayload = (switch_payload_t)rtp_session->recv_msg.header.pt; } else { if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); @@ -945,7 +945,7 @@ } rtp_session->last_read = switch_time_now(); - *payload_type = rtp_session->recv_msg.header.pt; + *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; if (*payload_type == SWITCH_RTP_CNG_PAYLOAD) { @@ -1295,7 +1295,7 @@ if (!rtp_session->mini && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { rtp_session->mini++; - rtp_session->rpayload = send_msg->header.pt; + rtp_session->rpayload = (switch_payload_t)send_msg->header.pt; rtp_session->rseq = ntohs(send_msg->header.seq); }

1 0

[commit] r3715 - freeswitch/trunk/libs/js/nsprpub
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Mon Dec 18 20:37:50 2006 New Revision: 3715 Modified: freeswitch/trunk/libs/js/nsprpub/configure Log: grr Modified: freeswitch/trunk/libs/js/nsprpub/configure ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure (original) +++ freeswitch/trunk/libs/js/nsprpub/configure Mon Dec 18 20:37:50 2006 @@ -3449,7 +3449,6 @@ *-freebsd*) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 - LDFLAGS="$LDFLAGS -lpthread" fi cat >> confdefs.h <<\EOF #define XP_UNIX 1 @@ -5499,12 +5498,7 @@ cat >> confdefs.h <<\EOF #define _THREAD_SAFE 1 EOF - - if test "$ac_cv_have_dash_pthread" = "yes"; then - _PTHREAD_LDFLAGS="-pthread" - else - _PTHREAD_LDFLAGS="-lc_r" - fi + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" ;; *-netbsd*) if test "$ac_cv_have_dash_pthread" = "yes"; then

1 0

[commit] r3714 - freeswitch/trunk/libs/js/nsprpub
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Mon Dec 18 20:31:13 2006 New Revision: 3714 Modified: freeswitch/trunk/libs/js/nsprpub/configure Log: grr Modified: freeswitch/trunk/libs/js/nsprpub/configure ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure (original) +++ freeswitch/trunk/libs/js/nsprpub/configure Mon Dec 18 20:31:13 2006 @@ -3449,6 +3449,7 @@ *-freebsd*) if test -z "$USE_NSPR_THREADS"; then USE_PTHREADS=1 + LDFLAGS="$LDFLAGS -lpthread" fi cat >> confdefs.h <<\EOF #define XP_UNIX 1

1 0

[commit] r3713 - freeswitch/trunk/libs/js/nsprpub/pr/include/md
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Mon Dec 18 20:26:41 2006 New Revision: 3713 Modified: freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h Log: sigh Modified: freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h (original) +++ freeswitch/trunk/libs/js/nsprpub/pr/include/md/_freebsd.h Mon Dec 18 20:26:41 2006 @@ -106,6 +106,11 @@ #define _PR_IPV6_V6ONLY_PROBE #endif +#if __FreeBSD_version >= 601103 +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R +#endif + #define USE_SETJMP #ifndef _PR_PTHREADS

1 0

[commit] r3712 - freeswitch/trunk/libs/js/nsprpub
by Freeswitch SVN 19 Dec '06

19 Dec '06

Author: anthm Date: Mon Dec 18 20:21:49 2006 New Revision: 3712 Modified: freeswitch/trunk/libs/js/nsprpub/configure Log: going mad Modified: freeswitch/trunk/libs/js/nsprpub/configure ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure (original) +++ freeswitch/trunk/libs/js/nsprpub/configure Mon Dec 18 20:21:49 2006 @@ -5226,8 +5226,8 @@ ;; *) -echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5243: checking for pthread_create in -lpthreads" >&5 +echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:5243: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { return v; } @@ -5238,13 +5238,13 @@ } return 0; }" > dummy.c ; - echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS" 1>&5; - ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS 2>&5; + echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS" 1>&5; + ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthread $LDFLAGS $LIBS 2>&5; _res=$? ; rm -f dummy.c dummy${ac_exeext} ; if test "$_res" = "0"; then echo "$ac_t""yes" 1>&6 - _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads" + _HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread" else echo "$ac_t""no" 1>&6

1 0