- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7432 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:46:34 2008 New Revision: 7432 Modified: freeswitch/trunk/src/switch_odbc.c Log: fix switch_odbc build from intralanman Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Tue Jan 29 16:46:34 2008 @@ -355,7 +355,7 @@ for (x = 1; x <= c; x++) { SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLUINTEGER ColumnSize; + SQLULEN ColumnSize; names[y] = malloc(name_len); memset(names[y], 0, name_len);

1 0

[commit] r7431 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:16:13 2008 New Revision: 7431 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: poke Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 29 16:16:13 2008 @@ -1 +1 @@ -Tue Jan 29 16:15:12 EST 2008 +Tue Jan 29 16:16:02 EST 2008

1 0

[commit] r7430 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 16:15:25 2008 New Revision: 7430 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: whoops from merge conflict Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jan 29 16:15:25 2008 @@ -1 +1 @@ -Sat Jan 26 14:48:35 EST 2008 +Tue Jan 29 16:15:12 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Jan 29 16:15:25 2008 @@ -1049,7 +1049,6 @@ su_msg_t *msg; assert(rmsg); - rmsg[0] = NULL; msg = rmsg[0], rmsg[0] = NULL;

1 0

[commit] r7429 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: anthm Date: Tue Jan 29 15:58:30 2008 New Revision: 7429 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix seg 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 Tue Jan 29 15:58:30 2008 @@ -1746,7 +1746,7 @@ if (holder->http) { char aval[512]; - switch_amp_encode(argv[x], aval, sizeof(aval)); + switch_amp_encode(val, aval, sizeof(aval)); holder->stream->write_function(holder->stream, "<td>"); holder->stream->write_function(holder->stream, "%s%s", aval, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else {

1 0

[commit] r7428 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:58:28 2008 New Revision: 7428 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: typo 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 Tue Jan 29 14:58:28 2008 @@ -1794,7 +1794,7 @@ return SWITCH_STATUS_SUCCESS; } - /* If you changes the field qty or order of any of these select */ + /* If you change the field qty or order of any of these select */ /* statmements, you must also change show_callback and friends to match! */ if (!command) { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX);

1 0

[commit] r7427 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:57:13 2008 New Revision: 7427 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: cleanup, factor out a function. 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 Jan 29 14:57:13 2008 @@ -119,23 +119,44 @@ sip_t const *sip, tagi_t tags[]) { - if (session) { - const char *tmp; - switch_channel_t *channel = switch_core_session_get_channel(session); - if (sip->sip_user_agent && !switch_strlen_zero(sip->sip_user_agent->g_string)){ - switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string); - } - if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-txstat"))) { - switch_channel_set_variable(channel, "sip_rtp_txstat", tmp); - } - if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { - switch_channel_set_variable(channel, "sip_rtp_rxstat", tmp); - } - + const char *tmp; + switch_channel_t *channel; + + if (!session) return; + + channel = switch_core_session_get_channel(session); + if (sip->sip_user_agent && !switch_strlen_zero(sip->sip_user_agent->g_string)){ + switch_channel_set_variable(channel, "sip_user_agent", sip->sip_user_agent->g_string); + } + if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-txstat"))) { + switch_channel_set_variable(channel, "sip_rtp_txstat", tmp); + } + if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { + switch_channel_set_variable(channel, "sip_rtp_rxstat", tmp); } return; } +void sofia_handle_sip_r_message(int status, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip) +{ + 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 sip_user='%q' and sip_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); +} + void sofia_event_callback(nua_event_t event, int status, char const *phrase, @@ -221,27 +242,8 @@ 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 sip_user='%q' and sip_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); - - } + sofia_handle_sip_r_message(status, profile, nh, sip); break; - case nua_r_invite: sofia_handle_sip_r_invite(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; @@ -321,18 +323,15 @@ } done: - if (gateway) { sofia_reg_release_gateway(gateway); } if (session) { switch_core_session_rwunlock(session); - } } - void event_handler(switch_event_t *event) { char *subclass, *sql; @@ -385,8 +384,6 @@ } } - - void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void *obj) { sofia_profile_t *profile = (sofia_profile_t *) obj; @@ -477,7 +474,6 @@ TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), SIPTAG_SUPPORTED_STR("100rel, precondition"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); - } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "activated db for %s\n", profile->name); @@ -549,9 +545,6 @@ switch_mutex_lock(profile->flag_mutex); switch_mutex_unlock(profile->flag_mutex); - - - if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : ""); @@ -631,7 +624,6 @@ } } - static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag) { switch_xml_t gateway_tag, param; @@ -814,7 +806,6 @@ skip: switch_assert(gateway_tag); } - } switch_status_t config_sofia(int reload, char *profile_name) @@ -940,7 +931,6 @@ #else switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ODBC IS NOT AVAILABLE!\n"); #endif - } else if (!strcasecmp(var, "user-agent-string")) { profile->user_agent = switch_core_strdup(profile->pool, val);; } else if (!strcasecmp(var, "dtmf-type")) { @@ -1292,7 +1282,6 @@ } return status; - } static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status, @@ -1326,7 +1315,6 @@ switch_core_session_receive_message(other_session, &msg); switch_core_session_rwunlock(other_session); } - return; } @@ -1806,7 +1794,6 @@ return; } - /*---------------------------------------*/ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) { @@ -2102,7 +2089,6 @@ } } - void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) { /* placeholder for string searching */ @@ -2262,7 +2248,6 @@ return uri; } - void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { switch_core_session_t *session = NULL; @@ -2304,7 +2289,6 @@ nua_respond(nh, 400, "Missing Contact Header", TAG_END()); return; } - get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); @@ -2355,7 +2339,6 @@ for(hp = v_event->headers; hp; hp = hp->next) { switch_channel_set_variable(channel, hp->name, hp->value); } - switch_event_destroy(&v_event); } @@ -2497,7 +2480,6 @@ } if (sip->sip_referred_by) { - referred_by_user = sip->sip_referred_by->b_url->url_user; referred_by_host = sip->sip_referred_by->b_url->url_host; channel_name = url_set_chanvars(session, sip->sip_referred_by->b_url, sip_referred_by); @@ -2868,7 +2850,6 @@ params++; sh = sh_save; } - } /* For Emacs:

1 0

[commit] r7426 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:53:24 2008 New Revision: 7426 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: whoops 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 Tue Jan 29 14:53:24 2008 @@ -1794,7 +1794,7 @@ return SWITCH_STATUS_SUCCESS; } - /* If you changes the field qty or order of any of these select /* + /* If you changes the field qty or order of any of these select */ /* statmements, you must also change show_callback and friends to match! */ if (!command) { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX);

1 0

[commit] r7425 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:35:06 2008 New Revision: 7425 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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 Tue Jan 29 14:35:06 2008 @@ -220,20 +220,18 @@ switch_core_session_t *a_session; private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_channel_t *channel = switch_core_session_get_channel(session); - switch_call_cause_t cause; - int sip_cause; - + switch_call_cause_t cause = switch_channel_get_cause(channel); + int sip_cause = hangup_cause_to_sip(cause); + if (tech_pvt->profile->rtpip && tech_pvt->local_sdp_audio_port) { switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); } - cause = switch_channel_get_cause(channel); - if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { const char *buuid; - switch_core_session_t *bsession; - switch_channel_t *bchannel; - const char *lost_ext; + switch_core_session_t *bsession; + switch_channel_t *bchannel; + const char *lost_ext; if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); @@ -241,39 +239,33 @@ switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); if ((buuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { - if ((bsession = switch_core_session_locate(buuid))) { - bchannel = switch_core_session_get_channel(bsession); - if (switch_channel_test_flag(bchannel, CF_BROADCAST)) { - if ((lost_ext = switch_channel_get_variable(bchannel, "left_hanging_extension"))) { - switch_ivr_session_transfer(bsession, lost_ext, NULL, NULL); - } + if ((bsession = switch_core_session_locate(buuid))) { + bchannel = switch_core_session_get_channel(bsession); + if (switch_channel_test_flag(bchannel, CF_BROADCAST)) { + if ((lost_ext = switch_channel_get_variable(bchannel, "left_hanging_extension"))) { + switch_ivr_session_transfer(bsession, lost_ext, NULL, NULL); + } switch_channel_stop_broadcast(bchannel); - } - switch_core_session_rwunlock(bsession); - } - } - + } + switch_core_session_rwunlock(bsession); + } + } switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - } - sip_cause = hangup_cause_to_sip(cause); - sofia_glue_deactivate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n", - switch_channel_get_name(channel), switch_channel_cause2str(cause)); + switch_channel_get_name(channel), switch_channel_cause2str(cause)); if (tech_pvt->hash_key) { switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); } if (session) { - const char *call_id = tech_pvt->call_id; - char *sql; - sql = switch_mprintf("delete from sip_dialogs where call_id='%q'", call_id); + char *sql = switch_mprintf("delete from sip_dialogs where call_id='%q'", tech_pvt->call_id); switch_assert(sql); - sofia_glue_execute_sql(tech_pvt->profile, SWITCH_FALSE, sql, tech_pvt->profile->ireg_mutex); + sofia_glue_execute_sql(tech_pvt->profile, SWITCH_FALSE, sql, tech_pvt->profile->ireg_mutex); free(sql); } @@ -292,10 +284,10 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_call_cause_t causecode = switch_channel_get_cause(channel); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); nua_cancel(tech_pvt->nh, TAG_IF(causecode == SWITCH_CAUSE_PICKED_OFF, - SIPTAG_REASON_STR("SIP;cause=200;text=\"Call completed elsewhere\"")), TAG_END()); + SIPTAG_REASON_STR("SIP;cause=200;text=\"Call completed elsewhere\"")), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), TAG_END()); @@ -379,7 +371,6 @@ } } - if ((val = switch_channel_get_variable(channel, SOFIA_SESSION_TIMEOUT))) { int v_session_timeout = atoi(val); if (v_session_timeout >= 0) { @@ -399,8 +390,6 @@ return SWITCH_STATUS_SUCCESS; } - - static switch_status_t sofia_read_video_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) { private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); @@ -497,7 +486,6 @@ return status; } - static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) { private_object_t *tech_pvt = switch_core_session_get_private(session); @@ -536,7 +524,6 @@ switch_assert(tech_pvt->rtp_session != NULL); tech_pvt->read_frame.datalen = 0; - while (switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) { tech_pvt->read_frame.flags = SFF_NONE; @@ -556,7 +543,6 @@ switch_channel_queue_dtmf(channel, &dtmf); } - if (tech_pvt->read_frame.datalen > 0) { size_t bytes = 0; int frames = 1; @@ -636,8 +622,6 @@ return status; } - - static switch_status_t sofia_kill_channel(switch_core_session_t *session, int sig) { private_object_t *tech_pvt = switch_core_session_get_private(session); @@ -694,7 +678,6 @@ case DTMF_INFO: snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8); nua_info(tech_pvt->nh, - //NUTAG_WITH_THIS(tech_pvt->profile->nua), SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), SIPTAG_PAYLOAD_STR(message), TAG_END()); @@ -1542,7 +1525,6 @@ return SWITCH_STATUS_SUCCESS; } - static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session, switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags)

1 0

[commit] r7424 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:01:35 2008 New Revision: 7424 Modified: freeswitch/trunk/src/switch_event.c Log: cleanup Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Jan 29 14:01:35 2008 @@ -469,11 +469,11 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name) { switch_event_header_t *hp; - if (header_name) { - for (hp = event->headers; hp; hp = hp->next) { - if (!strcasecmp(hp->name, header_name)) { - return hp->value; - } + if (!header_name) return NULL; + + for (hp = event->headers; hp; hp = hp->next) { + if (!strcasecmp(hp->name, header_name)) { + return hp->value; } } return NULL; @@ -481,11 +481,7 @@ SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event) { - if (event) { - return event->body; - } - - return NULL; + return (event ? event->body : NULL); } SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name) @@ -792,9 +788,9 @@ static switch_xml_t add_xml_header(switch_xml_t xml, char *name, char *value, int offset) { - switch_xml_t header = NULL; + switch_xml_t header = switch_xml_add_child_d(xml, "header", offset); - if ((header = switch_xml_add_child_d(xml, "header", offset))) { + if (header) { switch_xml_set_attr_d(header, "name", name); switch_xml_set_attr_d(header, "value", value); }

1 0

[commit] r7423 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 13:28:32 2008 New Revision: 7423 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup 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 Tue Jan 29 13:28:32 2008 @@ -1274,16 +1274,17 @@ if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", BREAK_SYNTAX); - } else { - if ((psession = switch_core_session_locate(cmd))) { - switch_channel_t *channel = switch_core_session_get_channel(psession); - switch_channel_set_flag(channel, CF_BREAK); - switch_core_session_rwunlock(psession); - } else { - stream->write_function(stream, "-ERR No Such Channel!\n"); - } + return SWITCH_STATUS_SUCCESS; } + if (!(psession = switch_core_session_locate(cmd))) { + stream->write_function(stream, "-ERR No Such Channel!\n"); + return SWITCH_STATUS_SUCCESS; + } + + switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK); + switch_core_session_rwunlock(psession); + return SWITCH_STATUS_SUCCESS; }

1 0