May 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5217 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 12:15:02 2007 New Revision: 5217 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix for FSCORE-30 (part 2) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 25 12:15:02 2007 @@ -751,14 +751,14 @@ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; + + rtp_session->dtmf_data.out_digit_seq++; + if (loops != 1) { - rtp_session->dtmf_data.out_digit_seq++; + rtp_session->dtmf_data.timestamp_dtmf += samples; } for (x = 0; x < loops; x++) { - if (loops == 1) { - rtp_session->dtmf_data.out_digit_seq++; - } switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -818,7 +818,7 @@ rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, 0, rtp_session->dtmf_data.out_digit_seq); } - + rtp_session->dtmf_data.timestamp_dtmf += samples; free(rdigit); } }

1 0

[commit] r5216 - freeswitch/trunk/libs/iax/src
by Freeswitch SVN 25 May '07

25 May '07

Author: mikej Date: Fri May 25 12:14:31 2007 New Revision: 5216 Modified: freeswitch/trunk/libs/iax/src/iax.c Log: dos2unix Modified: freeswitch/trunk/libs/iax/src/iax.c ============================================================================== --- freeswitch/trunk/libs/iax/src/iax.c (original) +++ freeswitch/trunk/libs/iax/src/iax.c Fri May 25 12:14:31 2007 @@ -140,7 +140,7 @@ /* Max timeouts */ static int maxretries = 10; -/* configurable jitterbuffer options */ +/* configurable jitterbuffer options */ static long jb_target_extra = -1; static int do_shutdown = 0; @@ -948,11 +948,11 @@ return do_shutdown++; } -void iax_set_jb_target_extra( long value ) -{ - /* store in jb_target_extra, a static global */ - jb_target_extra = value ; -} +void iax_set_jb_target_extra( long value ) +{ + /* store in jb_target_extra, a static global */ + jb_target_extra = value ; +} int iax_init(char *ip, int preferredportno) { @@ -979,33 +979,33 @@ return -1; } - if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; - if (preferredportno < 0) preferredportno = 0; - - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = 0; - sin.sin_port = htons((short)preferredportno); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { -#if defined(WIN32) || defined(_WIN32_WCE) - if (WSAGetLastError() == WSAEADDRINUSE) -#else - if (errno == EADDRINUSE) -#endif - { - /*the port is already in use, so bind to a free port chosen by the IP stack*/ - DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); - sin.sin_port = htons((short)0); - if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } - } else - { - IAXERROR "Unable to bind UDP socket\n"); - return -1; - } + if (preferredportno == 0) preferredportno = IAX_DEFAULT_PORTNO; + if (preferredportno < 0) preferredportno = 0; + + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = 0; + sin.sin_port = htons((short)preferredportno); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { +#if defined(WIN32) || defined(_WIN32_WCE) + if (WSAGetLastError() == WSAEADDRINUSE) +#else + if (errno == EADDRINUSE) +#endif + { + /*the port is already in use, so bind to a free port chosen by the IP stack*/ + DEBU(G "Unable to bind to preferred port - port is in use. Trying to bind to a free one"); + sin.sin_port = htons((short)0); + if (bind(netfd, (struct sockaddr *) &sin, sizeof(sin)) < 0) + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } + } else + { + IAXERROR "Unable to bind UDP socket\n"); + return -1; + } } sinlen = sizeof(sin); if (getsockname(netfd, (struct sockaddr *) &sin, &sinlen) < 0) { @@ -1587,12 +1587,12 @@ iax_send_pong(event->session, event->ts); iax_event_free(event); break; - case IAX_EVENT_POKE: - event->etype = IAX_EVENT_PONG; - iax_send_pong(event->session, event->ts); - iax_destroy(event->session); - iax_event_free(event); - break; + case IAX_EVENT_POKE: + event->etype = IAX_EVENT_PONG; + iax_send_pong(event->session, event->ts); + iax_destroy(event->session); + iax_event_free(event); + break; default: return event; } @@ -2702,9 +2702,9 @@ e->ts = ts; e = schedule_delivery(e, ts, updatehistory); break; - case IAX_COMMAND_POKE: - e->etype = IAX_EVENT_POKE; - e->ts = ts; + case IAX_COMMAND_POKE: + e->etype = IAX_EVENT_POKE; + e->ts = ts; break; case IAX_COMMAND_PING: /* PINGS and PONGS don't get scheduled; */

1 0

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

25 May '07

Author: mikej Date: Fri May 25 12:14:12 2007 New Revision: 5215 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Process P- headers into channel variables too. 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 Fri May 25 12:14:12 2007 @@ -1924,7 +1924,7 @@ } } else if (!strncasecmp(un->un_name, "Remote-Party-ID", 15)) { process_rpid(un, tech_pvt); - } else if (!strncasecmp(un->un_name, "X-", 2)) { + } else if (!strncasecmp(un->un_name, "X-", 2) || !strncasecmp(un->un_name, "P-", 2)) { if (!switch_strlen_zero(un->un_value)) { char *new_name; if ((new_name = switch_mprintf("%s%s", SOFIA_SIP_HEADER_PREFIX, un->un_name))) {

1 0

[commit] r5214 - freeswitch/trunk/src
by Freeswitch SVN 25 May '07

25 May '07

Author: anthm Date: Fri May 25 11:31:47 2007 New Revision: 5214 Modified: freeswitch/trunk/src/switch_rtp.c Log: possible fix for FSCORE-30 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri May 25 11:31:47 2007 @@ -751,9 +751,14 @@ rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (duration >> 8); rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) duration; + if (loops != 1) { + rtp_session->dtmf_data.out_digit_seq++; + } for (x = 0; x < loops; x++) { - rtp_session->dtmf_data.out_digit_seq++; + if (loops == 1) { + rtp_session->dtmf_data.out_digit_seq++; + } switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, @@ -769,6 +774,8 @@ if (loops == 1) { rtp_session->last_write_seq = 0; + } else { + rtp_session->dtmf_data.out_digit_seq = 0; } } @@ -1409,7 +1416,7 @@ } - if (rtp_session->last_write_seq >0 && rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { + if (rtp_session->last_write_seq > 0 && rtp_session->last_write_seq <= rtp_session->dtmf_data.out_digit_seq) { send = 0; }

1 0

[commit] r5213 - freeswitch/trunk/src
by Freeswitch SVN 24 May '07

24 May '07

Author: anthm Date: Thu May 24 11:30:31 2007 New Revision: 5213 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix unload Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu May 24 11:30:31 2007 @@ -785,7 +785,6 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_unload_module(char *dir, char *fname, const char **err) { - switch_size_t len = 0; char *path = NULL; char *file = NULL; switch_loadable_module_t *module = NULL; @@ -808,17 +807,9 @@ path = strdup(file); } else { if (strchr(file, '.')) { - len = strlen(dir); - len += strlen(file); - len += 4; - path = (char *) switch_core_alloc(loadable_modules.pool, len); - snprintf(path, len, "%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); + path = switch_mprintf("%s%s%s", dir, SWITCH_PATH_SEPARATOR, file); } else { - len = strlen(dir); - len += strlen(file); - len += 8; - path = (char *) malloc(len); - snprintf(path, len, "%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); + path = switch_mprintf("%s%s%s%s", dir, SWITCH_PATH_SEPARATOR, file, ext); } } @@ -833,6 +824,7 @@ do_shutdown(module); } } else { + *err = "No such module!"; status = SWITCH_STATUS_FALSE; } switch_mutex_unlock(loadable_modules.mutex);

1 0

[commit] r5212 - freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 24 May '07

24 May '07

Author: cparker Date: Thu May 24 11:21:45 2007 New Revision: 5212 Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Add Start/Stop Functionality and new initializer function Modified: freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/branches/cparker/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu May 24 11:21:45 2007 @@ -45,7 +45,84 @@ static char * my_retries; /* 3 */ static char my_servers[SERVER_MAX][255]; -static switch_status_t my_on_hangup(switch_core_session_t *session) +static rc_handle * my_radius_init(void) +{ + rc_handle *rad_config; + + rad_config = rc_new(); + + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); + return NULL; + } + + rad_config = rc_config_init(rad_config); + + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); + rc_destroy(rad_config); + return NULL; + } + + /* Some hardcoded ( for now ) defaults needed to initialize radius */ + if (rc_add_config(rad_config, "auth_order", "radius", "mod_radius_cdr.c", 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "[mod_radius_cdr] failed setting auth_order = radius\n"); + rc_destroy(rad_config); + return NULL; + } + + if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "mod_radius_cdr.c", 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed setting seqfile = /var/run/radius.seq\n"); + rc_destroy(rad_config); + return NULL; + } + + + /* Add the module configs to initialize rad_config */ + + for (int i = 0; i < SERVER_MAX && my_servers[i][0] != '\0'; i++) { + if (rc_add_config(rad_config, "acctserver", my_servers[i], cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting acctserver = %s failed\n", my_servers[i]); + rc_destroy(rad_config); + return NULL; + } + } + + if (rc_add_config(rad_config, "dictionary", my_dictionary, cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed setting dictionary = %s failed\n", my_dictionary); + rc_destroy(rad_config); + return NULL; + } + + if (rc_add_config(rad_config, "radius_timeout", my_timeout, cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed setting radius_timeout = %s failed\n", my_timeout); + rc_destroy(rad_config); + return NULL; + } + + if (rc_add_config(rad_config, "radius_retries", my_retries, cf, 0) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed setting radius_retries = %s failed\n", my_retries); + rc_destroy(rad_config); + return NULL; + } + + /* Read the dictionary file(s) */ + if (rc_read_dictionary(rad_config, rc_conf_str(rad_config, "dictionary")) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed reading dictionary file(s): %s\n", my_dictionary); + rc_destroy(rad_config); + return NULL; + } + + return rad_config; +} + +static switch_status_t my_on_ring(switch_core_session_t *session) { switch_xml_t cdr; switch_channel_t *channel = switch_core_session_get_channel(session); @@ -53,87 +130,141 @@ int retval = 0; VALUE_PAIR *send = NULL; UINT4 client_port = 0; - UINT4 status_type = PW_STATUS_STOP; + UINT4 status_type = PW_STATUS_START; char *uuid_str; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_ring\n"); - rad_config = rc_new(); + rad_config = my_radius_init(); if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing rc_handle!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, Start packet not logged.\n"); return SWITCH_STATUS_TERM; } - rad_config = rc_config_init(rad_config); + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + uuid_str = switch_core_session_get_uuid(session); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n"); + return SWITCH_STATUS_TERM; + } - if (rad_config == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius config!\n"); + /* Create the radius packet */ + + /* Set Status Type */ + if (rc_avpair_add(rad_config, &send, PW_ACCT_STATUS_TYPE, &status_type, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed setting Acct-Status-Type: Start\n"); rc_destroy(rad_config); return SWITCH_STATUS_TERM; - } + } - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - uuid_str = switch_core_session_get_uuid(session); + if (rc_avpair_add(rad_config, &send, PW_ACCT_SESSION_ID, uuid_str, -1, 0) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed adding Acct-Session-ID: %s\n", uuid_str); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + + /* Add VSAs */ + + if(channel) { + /*switch_call_cause_t cause;*/ + switch_caller_profile_t *profile; - /* Some hardcoded ( for now ) defaults needed to initialize radius */ - if (rc_add_config(rad_config, "auth_order", "radius", "internal radius config", 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting auth_order = radius failed\n"); + /* + cause = switch_channel_get_cause(channel); + if (rc_avpair_add(rad_config, &send, PW_FS_HANGUPCAUSE, &cause, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Hangupcause: %d\n", cause); rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + return SWITCH_STATUS_TERM; } + */ + + profile = switch_channel_get_caller_profile(channel); - if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "internal radius config", 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting seqfile = /var/run/radius.seq\n"); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; + if(profile) { + if(profile->caller_id_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_SRC, profile->caller_id_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->caller_id_name) { + if (rc_avpair_add(rad_config, &send, PW_FS_CLID, profile->caller_id_name, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->destination_number) { + if (rc_avpair_add(rad_config, &send, PW_FS_DST, profile->destination_number, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dst: %s\n", profile->destination_number); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->dialplan) { + if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, profile->dialplan, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + if(profile->source) { + if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, profile->source, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Lastapp: %s\n", profile->source); + rc_destroy(rad_config); + return SWITCH_STATUS_TERM; + } + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "profile == NULL\n"); } + } + if(rc_acct(rad_config, client_port, send) == OK_RC) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] RADIUS Accounting OK\n"); + retval = SWITCH_STATUS_SUCCESS; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] RADIUS Accounting Failed\n"); + retval = SWITCH_STATUS_TERM; + } + rc_avpair_free(send); - /* Add the module configs to initialize rad_config */ + return(retval); +} - for (int i = 0; i < SERVER_MAX && my_servers[i][0] != '\0'; i++) { - if (rc_add_config(rad_config, "acctserver", my_servers[i], cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting acctserver = %s failed\n", my_servers[i]); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } - } +static switch_status_t my_on_hangup(switch_core_session_t *session) +{ + switch_xml_t cdr; + switch_channel_t *channel = switch_core_session_get_channel(session); + rc_handle *rad_config; + int retval = 0; + VALUE_PAIR *send = NULL; + UINT4 client_port = 0; + UINT4 status_type = PW_STATUS_STOP; - if (rc_add_config(rad_config, "dictionary", my_dictionary, cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting dictionary = %s failed\n", my_dictionary); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + char *uuid_str; - if (rc_add_config(rad_config, "radius_timeout", my_timeout, cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_timeout = %s failed\n", my_timeout); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Entering my_on_hangup\n"); - if (rc_add_config(rad_config, "radius_retries", my_retries, cf, 0) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed setting radius_retries = %s failed\n", my_retries); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + rad_config = my_radius_init(); - /* Read the dictionary file(s) */ - if (rc_read_dictionary(rad_config, rc_conf_str(rad_config, "dictionary")) != 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed reading dictionary file(s): %s\n", my_dictionary); - rc_destroy(rad_config); - return SWITCH_STATUS_TERM; - } + if (rad_config == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error initializing radius, session not logged.\n"); + return SWITCH_STATUS_TERM; + } + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + uuid_str = switch_core_session_get_uuid(session); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Generating Data!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "[mod_radius_cdr] Error Generating Data!\n"); return SWITCH_STATUS_TERM; } @@ -283,7 +414,7 @@ static const switch_state_handler_table_t state_handlers = { /*.on_init */ NULL, - /*.on_ring */ NULL, + /*.on_ring */ my_on_ring, /*.on_execute */ NULL, /*.on_hangup */ my_on_hangup, /*.on_loopback */ NULL,

1 0

[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