- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5211 - freeswitch/trunk/src
by Freeswitch SVN 23 May '07

23 May '07

Author: anthm Date: Wed May 23 09:37:35 2007 New Revision: 5211 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: tweak from eariler patch (reported by Dale Thatcher) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed May 23 09:37:35 2007 @@ -177,13 +177,13 @@ (early_ok && len == 1 && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA))) && !switch_channel_test_flag(peer_channels[i], CF_TAGGED)) { - if (key) { + if (!switch_strlen_zero(key)) { struct key_collect *collect; if ((collect = switch_core_session_alloc(peer_sessions[i], sizeof(*collect)))) { switch_channel_set_flag(peer_channels[i], CF_TAGGED); collect->key = key; - if (file) { + if (!switch_strlen_zero(file)) { collect->file = switch_core_session_strdup(peer_sessions[i], file); }

1 0

[commit] r5210 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 May '07

22 May '07

Author: anthm Date: Tue May 22 11:03:21 2007 New Revision: 5210 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: improve connectile-dysfunction mode to send message packets from the server end to keep the connection open 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 Tue May 22 11:03:21 2007 @@ -110,6 +110,28 @@ su_root_break(profile->s_root); } break; + + case nua_r_message: + { + if (status == 503) { + const char *user = NULL, *host = NULL; + char *sql; + + if (sip->sip_to && sip->sip_to->a_url) { + user = sip->sip_to->a_url->url_user; + host = sip->sip_to->a_url->url_host; + + sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", user, host); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Deleting registration for %s@%s\n", user, host); + sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); + switch_safe_free(sql); + } + } + + nua_handle_destroy(nh); + + } + break; case nua_r_get_params: case nua_r_invite: case nua_r_unregister: @@ -120,7 +142,6 @@ case nua_i_bye: case nua_r_unsubscribe: case nua_r_publish: - case nua_r_message: case nua_r_notify: case nua_i_notify: case nua_i_cancel: 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 Tue May 22 11:03:21 2007 @@ -94,7 +94,7 @@ nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), TAG_END()); - + switch_safe_free(ffrom); free(user); 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 Tue May 22 11:03:21 2007 @@ -136,6 +136,24 @@ return 0; } +int sofia_reg_nat_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + sofia_profile_t *profile = (sofia_profile_t *) pArg; + nua_handle_t *nh; + char *contact; + char to[128] = ""; + + snprintf(to, sizeof(to), "%s@%s", argv[0], argv[1]); + contact = sofia_glue_get_url_from_contact(argv[2], 1); + + nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(profile->url), SIPTAG_TO_STR(to), NUTAG_URL(contact), SIPTAG_CONTACT_STR(profile->url), TAG_END()); + + nua_message(nh, SIPTAG_CONTENT_TYPE_STR("text/plain"), + SIPTAG_PAYLOAD_STR("You suffer from Connectile Dysfunction.\nYou should use stun....\n"), TAG_END()); + + return 0; +} + int sofia_reg_del_callback(void *pArg, int argc, char **argv, char **columnNames) { switch_event_t *s_event; @@ -153,6 +171,7 @@ return 0; } + void sofia_reg_check_expire(sofia_profile_t *profile, time_t now) { char sql[1024]; @@ -205,6 +224,16 @@ } sofia_glue_execute_sql(profile, SWITCH_TRUE, sql, NULL); + if (now) { + snprintf(sql, sizeof(sql), "select * from sip_registrations where status like '%%NATHACK%%'"); + sofia_glue_execute_sql_callback(profile, + SWITCH_TRUE, + NULL, + sql, + sofia_reg_nat_callback, + profile); + } + switch_mutex_unlock(profile->ireg_mutex); } @@ -264,6 +293,7 @@ const char *display = "\"user\""; char network_ip[80]; int network_port; + int cd = 0; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -342,6 +372,7 @@ } else { snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); } + cd = 1; } else { char *p; switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); @@ -397,8 +428,8 @@ if (exptime) { if (!sofia_reg_find_reg_url(profile, from_user, from_host, buf, sizeof(buf))) { - sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','Registered', '%q', %ld)", - from_user, from_host, contact_str, rpid, (long) time(NULL) + (long) exptime * 2); + sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','%q', '%q', %ld)", + from_user, from_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); } else { sql =

1 0

[commit] r5209 - freeswitch/trunk/src
by Freeswitch SVN 21 May '07

21 May '07

Author: anthm Date: Mon May 21 17:57:20 2007 New Revision: 5209 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix for FSCORE-29 (needs testing) Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon May 21 17:57:20 2007 @@ -260,7 +260,7 @@ switch_codec_t write_codec = { 0 }; switch_frame_t write_frame = { 0 }; uint8_t fdata[1024], pass = 0; - char *file = NULL, *key = NULL, *odata, *var; + char key[80] = "", file[512] = "", *odata, *var; switch_call_cause_t reason = SWITCH_CAUSE_UNALLOCATED; uint8_t to = 0; char *var_val, *vars = NULL, *ringback_data = NULL; @@ -362,9 +362,9 @@ } if ((var = switch_event_get_header(var_event, "group_confirm_key"))) { - key = switch_core_session_strdup(session, var); + switch_copy_string(key, var, sizeof(key)); if ((var = switch_event_get_header(var_event, "group_confirm_file"))) { - file = switch_core_session_strdup(session, var); + switch_copy_string(file, var, sizeof(file)); } } // When using the AND operator, the fail_on_single_reject flag may be set in order to indicate that a single @@ -373,8 +373,8 @@ fail_on_single_reject = 1; } - if (file && !strcmp(file, "undef")) { - file = NULL; + if (!switch_strlen_zero(file) && !strcmp(file, "undef")) { + *file = '\0'; } if ((var_val = switch_event_get_header(var_event, "ignore_early_media")) && switch_true(var_val)) { @@ -440,8 +440,6 @@ read_frame = NULL; pool = NULL; pass = 0; - file = NULL; - key = NULL; var = NULL; to = 0;

1 0

[commit] r5208 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 May '07

21 May '07

Author: anthm Date: Mon May 21 17:44:35 2007 New Revision: 5208 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: make contact: match the to: in 200OK for the sake of interop 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 May 21 17:44:35 2007 @@ -317,7 +317,7 @@ } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SIPTAG_CONTACT_STR(tech_pvt->to_uri), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); } @@ -680,7 +680,7 @@ sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SIPTAG_CONTACT_STR(tech_pvt->to_uri), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); switch_channel_mark_answered(channel); } 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 May 21 17:44:35 2007 @@ -1812,7 +1812,13 @@ } if (sip->sip_to && sip->sip_to->a_url) { + char *val; url_set_chanvars(session, sip->sip_to->a_url, sip_to); + if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { + tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s", val); + } else { + tech_pvt->to_uri = tech_pvt->profile->url; + } } if (sip->sip_contact && sip->sip_contact->m_url) {

1 0

[commit] r5207 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 May '07

21 May '07

Author: anthm Date: Mon May 21 15:11:37 2007 New Revision: 5207 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: help cure connectile-dysfunction 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 May 21 15:11:37 2007 @@ -263,12 +263,14 @@ const char *rpid = "unknown"; const char *display = "\"user\""; char network_ip[80]; + int network_port; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); - + network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); + expires = sip->sip_expires; authorization = sip->sip_authorization; contact = sip->sip_contact; @@ -333,11 +335,20 @@ } if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { - char *p; - switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); - for(p = contact_str; p && *p; p++) { - if (*p == '\'' || *p == '[' || *p == ']') { - *p = '"'; + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction")) { + if (contact->m_url->url_params) { + snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", + display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); + } else { + snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); + } + } else { + char *p; + switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + for(p = contact_str; p && *p; p++) { + if (*p == '\'' || *p == '[' || *p == ']') { + *p = '"'; + } } } }

1 0

[commit] r5205 - freeswitch/trunk/src
by Freeswitch SVN 21 May '07

21 May '07

Author: anthm Date: Mon May 21 10:45:35 2007 New Revision: 5205 Modified: freeswitch/trunk/src/switch_rtp.c Log: resolve FSCORE-28 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon May 21 10:45:35 2007 @@ -578,7 +578,7 @@ SWITCH_DECLARE(void) switch_rtp_set_telephony_event(switch_rtp_t *rtp_session, switch_payload_t te) { - if (te > 96) { + if (te > 95) { rtp_session->te = te; } }

1 0

[commit] r5204 - freeswitch/trunk/src
by Freeswitch SVN 20 May '07

20 May '07

Author: anthm Date: Sat May 19 20:38:25 2007 New Revision: 5204 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix for FSCORE-27 @8000k and @8000h both count as rate qualifiers advertising h going forward Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat May 19 20:38:25 2007 @@ -1259,7 +1259,7 @@ if (cur != name) { if (strchr(cur, 'i')) { interval = atoi(cur); - } else if (strchr(cur, 'k')) { + } else if (strchr(cur, 'k' || strchr(cur, 'h'))) { rate = atoi(cur); } }

1 0

[commit] r5201 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 17 May '07

17 May '07

Author: anthm Date: Thu May 17 14:19:37 2007 New Revision: 5201 Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: update Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/layer3.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/layer3.c Thu May 17 14:19:37 2007 @@ -836,11 +836,11 @@ v = gr_info->pow2gain[sanity]; cb = *m++; } else { - return 0; + return 1; } } else { - return 0; + return 1; } } Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Thu May 17 14:19:37 2007 @@ -271,7 +271,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Decoder Error!\n"); } dlen = 0; - continue; + //continue; + goto error; } context->mp3err = 0; @@ -728,7 +729,11 @@ } else if (context->fp) { *cur_sample = fseek(context->fp, *cur_sample, whence); } + + ExitMP3(&context->mp); + InitMP3(&context->mp, OUTSCALE, context->samplerate); switch_buffer_zero(context->audio_buffer); + } else { context->err++; }

1 0

[commit] r5200 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 17 May '07

17 May '07

Author: anthm Date: Thu May 17 13:11:48 2007 New Revision: 5200 Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c Log: maybe fix the stupid bug in the mp3 decoder code Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/layer3.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/layer3.c Thu May 17 13:11:48 2007 @@ -836,11 +836,11 @@ v = gr_info->pow2gain[sanity]; cb = *m++; } else { - return 1; + return 0; } } else { - return 1; + return 0; } }

1 0

[commit] r5198 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 17 May '07

17 May '07

Author: anthm Date: Thu May 17 12:33:45 2007 New Revision: 5198 Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c Log: maybe fix the stupid bug in the mp3 decoder code Modified: freeswitch/trunk/src/mod/formats/mod_shout/layer3.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/layer3.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/layer3.c Thu May 17 12:33:45 2007 @@ -826,9 +826,23 @@ int x, y; if (!mc) { + unsigned sanity; mc = *m++; - v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift]; - cb = *m++; + if ((unsigned)*scf < 100 && (unsigned)*pretab < 100) { + sanity = (((*scf++) + (*pretab++)) << shift); + + //v = gr_info->pow2gain[((*scf++) + (*pretab++)) << shift]; + if (sanity < 100) { + v = gr_info->pow2gain[sanity]; + cb = *m++; + } else { + return 1; + } + + } else { + return 1; + } + } { register short *val = h->table;

1 0