December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6626 - freeswitch/trunk/libs/apr/include/arch/win32
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Tue Dec 11 04:52:42 2007 New Revision: 6626 Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h Log: msvc 9 build tweak. Modified: freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h ============================================================================== --- freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h (original) +++ freeswitch/trunk/libs/apr/include/arch/win32/apr_arch_networkio.h Tue Dec 11 04:52:42 2007 @@ -20,6 +20,9 @@ #include "apr_network_io.h" #include "apr_general.h" #include "apr_poll.h" +#ifdef _MSC_VER +#undef MCAST_JOIN_SOURCE_GROUP +#endif typedef struct sock_userdata_t sock_userdata_t; struct sock_userdata_t {

1 0

[commit] r6625 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 23:21:54 2007 New Revision: 6625 Modified: freeswitch/trunk/src/switch_ivr.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Dec 10 23:21:54 2007 @@ -74,7 +74,6 @@ } } - return status; } @@ -128,28 +127,27 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (switch_channel_test_flag(channel, CF_UNICAST)) { - if ((conninfo = switch_channel_get_private(channel, "unicast"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down unicast connection\n"); - switch_clear_flag_locked(conninfo, SUF_READY); - switch_socket_shutdown(conninfo->socket, SWITCH_SHUTDOWN_READWRITE); - while(switch_test_flag(conninfo, SUF_THREAD_RUNNING)) { - switch_yield(10000); - if (++sanity >= 10000) { - break; - } - } - if (conninfo->read_codec.implementation) { - switch_core_codec_destroy(&conninfo->read_codec); + if (!switch_channel_test_flag(channel, CF_UNICAST)) { + return SWITCH_STATUS_FALSE; + } + + if ((conninfo = switch_channel_get_private(channel, "unicast"))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down unicast connection\n"); + switch_clear_flag_locked(conninfo, SUF_READY); + switch_socket_shutdown(conninfo->socket, SWITCH_SHUTDOWN_READWRITE); + while(switch_test_flag(conninfo, SUF_THREAD_RUNNING)) { + switch_yield(10000); + if (++sanity >= 10000) { + break; } - switch_socket_close(conninfo->socket); } - switch_channel_clear_flag(channel, CF_UNICAST); - return SWITCH_STATUS_SUCCESS; + if (conninfo->read_codec.implementation) { + switch_core_codec_destroy(&conninfo->read_codec); + } + switch_socket_close(conninfo->socket); } - - return SWITCH_STATUS_FALSE; - + switch_channel_clear_flag(channel, CF_UNICAST); + return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(switch_status_t) switch_ivr_activate_unicast(switch_core_session_t *session, @@ -219,7 +217,6 @@ conninfo->write_frame.data = conninfo->write_frame_data; conninfo->write_frame.buflen = sizeof(conninfo->write_frame_data); conninfo->write_frame.codec = switch_test_flag(conninfo, SUF_NATIVE) ? read_codec : &conninfo->read_codec; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "connect %s:%d->%s:%d\n", conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port); @@ -256,8 +253,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure creating unicast connection %s:%d->%s:%d\n", conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port); return SWITCH_STATUS_FALSE; - - } SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *session, switch_event_t *event) @@ -290,7 +285,6 @@ switch_channel_set_flag(channel, CF_EVENT_LOCK); } - if (lead_frames) { switch_frame_t *read_frame; int frame_count = atoi(lead_frames); @@ -380,7 +374,6 @@ switch_channel_clear_flag(channel, CF_EVENT_LOCK); return status; - } SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session) @@ -814,22 +807,17 @@ } if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - //switch_ivr_parse_all_events(session); switch_core_session_receive_message(session, &msg); if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); - //switch_ivr_parse_all_events(other_session); switch_core_session_receive_message(other_session, &msg); switch_channel_clear_state_handler(other_channel, NULL); - } - - if (other_channel) { switch_channel_clear_state_handler(channel, NULL); if (swap) { @@ -959,7 +947,6 @@ prefix = 1; } - if (var && !prefix) { if ((val = switch_channel_get_variable(chana, var))) { switch_channel_set_variable(chanb, var, val); @@ -1112,7 +1099,6 @@ parser->minlen = 0; parser->maxlen = 0; } - } } if (status != SWITCH_STATUS_SUCCESS) { @@ -1289,30 +1275,25 @@ SWITCH_DECLARE(int) switch_ivr_set_xml_chan_vars(switch_xml_t xml, switch_channel_t *channel, int off) { - switch_event_header_t *hi; switch_xml_t variable; + switch_event_header_t *hi = switch_channel_variable_first(channel); - if ((hi = switch_channel_variable_first(channel))) { - for (; hi; hi = hi->next) { - char *vvar = hi->name; - char *vval = hi->value; - if (vvar && vval) { - if ((variable = switch_xml_add_child_d(xml, (char *) vvar, off++))) { - char *data; - char *value = (char *) vval; - switch_size_t dlen = strlen(value) * 3; - - if ((data = malloc(dlen))) { - memset(data, 0, dlen); - switch_url_encode(value, data, dlen); - switch_xml_set_txt_d(variable, data); - free(data); - } - } + if (!hi) return off; + + for (; hi; hi = hi->next) { + if (hi->name && hi->value && ((variable = switch_xml_add_child_d(xml, hi->name, off++)))) { + char *data; + switch_size_t dlen = strlen(hi->value) * 3; + + if ((data = malloc(dlen))) { + memset(data, 0, dlen); + switch_url_encode(hi->value, data, dlen); + switch_xml_set_txt_d(variable, data); + free(data); } } - switch_channel_variable_last(channel); } + switch_channel_variable_last(channel); return off; } @@ -1430,10 +1411,8 @@ } } } - } - if (!(x_main_cp = switch_xml_add_child_d(x_callflow, "caller_profile", cf_off++))) { goto error; } @@ -1469,7 +1448,6 @@ } } - if (caller_profile->times) { int t_off = 0; if (!(x_times = switch_xml_add_child_d(x_callflow, "times", cf_off++))) { @@ -1503,9 +1481,6 @@ caller_profile = caller_profile->next; } - - - *xml_cdr = cdr; return SWITCH_STATUS_SUCCESS;

1 0

[commit] r6624 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 22:57:15 2007 New Revision: 6624 Modified: freeswitch/trunk/src/switch_rtp.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Dec 10 22:57:15 2007 @@ -177,33 +177,34 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session) { + uint8_t buf[256] = { 0 }; + switch_stun_packet_t *packet; + unsigned int elapsed; + switch_size_t bytes; assert(rtp_session != NULL); assert(rtp_session->ice_user != NULL); - if (rtp_session->stuncount == 0) { - uint8_t buf[256] = { 0 }; - switch_stun_packet_t *packet; - unsigned int elapsed; - switch_size_t bytes; + if (rtp_session->stuncount != 0) { + rtp_session->stuncount--; + return SWITCH_STATUS_SUCCESS; + } - if (rtp_session->last_stun) { - elapsed = (unsigned int) ((switch_time_now() - rtp_session->last_stun) / 1000); + if (rtp_session->last_stun) { + elapsed = (unsigned int) ((switch_time_now() - rtp_session->last_stun) / 1000); - if (elapsed > 30000) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); - return SWITCH_STATUS_FALSE; - } + if (elapsed > 30000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n"); + return SWITCH_STATUS_FALSE; } - - packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, buf); - switch_stun_packet_attribute_add_username(packet, rtp_session->ice_user, 32); - bytes = switch_stun_packet_length(packet); - switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) packet, &bytes); - rtp_session->stuncount = 25; - } else { - rtp_session->stuncount--; } + + packet = switch_stun_packet_build_header(SWITCH_STUN_BINDING_REQUEST, NULL, buf); + switch_stun_packet_attribute_add_username(packet, rtp_session->ice_user, 32); + bytes = switch_stun_packet_length(packet); + switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) packet, &bytes); + rtp_session->stuncount = 25; + return SWITCH_STATUS_SUCCESS; } @@ -218,7 +219,6 @@ packet = switch_stun_packet_parse(buf, sizeof(buf)); rtp_session->last_stun = switch_time_now(); - switch_stun_packet_first_attribute(packet, attr); do { @@ -238,7 +238,6 @@ } } while (switch_stun_packet_next_attribute(attr)); - /* printf("[%s] [%s] [%s]\n", rtp_session->user_ice, username, !strcmp(rtp_session->user_ice, username) ? "yes" : "no"); */ if ((packet->header.type == SWITCH_STUN_BINDING_REQUEST) && !strcmp(rtp_session->user_ice, username)) { uint8_t buf[512]; switch_stun_packet_t *rpacket; @@ -249,11 +248,7 @@ memset(buf, 0, sizeof(buf)); rpacket = switch_stun_packet_build_header(SWITCH_STUN_BINDING_RESPONSE, packet->header.id, buf); switch_stun_packet_attribute_add_username(rpacket, username, 32); - /* switch_sockaddr_ip_get(&remote_ip, rtp_session->from_addr); */ - remote_ip = switch_get_addr(ipbuf, sizeof(ipbuf), rtp_session->from_addr); - - switch_stun_packet_attribute_add_binded_address(rpacket, (char *)remote_ip, switch_sockaddr_get_port(rtp_session->from_addr)); bytes = switch_stun_packet_length(rpacket); switch_socket_sendto(rtp_session->sock, rtp_session->from_addr, 0, (void *) rpacket, &bytes); @@ -459,7 +454,6 @@ return SWITCH_STATUS_MEMERR; } - rtp_session->dtmf_data.out_digit_ssrc = ssrc; rtp_session->pool = pool; rtp_session->te = 101; @@ -486,9 +480,7 @@ policy.rtp.sec_serv = sec_serv_conf_and_auth; policy.rtcp.sec_serv = sec_serv_none; - /* - * read key from hexadecimal on command line into an octet string - */ + /* read key from hexadecimal on command line into an octet string */ len = hex_string_to_octet_string(key, crypto_key, MASTER_KEY_LEN * 2); /* check that hex string is the right length */ @@ -506,16 +498,12 @@ return SWITCH_STATUS_FALSE; } - /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "set master key/salt to %s/", octet_string_hex_string(key, 16)); - * switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "%s\n", octet_string_hex_string(key+16, 14)); - */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activating Secure RTP!\n"); } rtp_session->seq = (uint16_t) rand(); rtp_session->send_msg.header.ssrc = htonl(ssrc); rtp_session->send_msg.header.ts = 0; - //rtp_session->send_msg.header.seq = (uint16_t) rand(); rtp_session->send_msg.header.m = 0; rtp_session->send_msg.header.pt = (switch_payload_t) htonl(payload); rtp_session->send_msg.header.version = 2; @@ -602,7 +590,6 @@ } rtp_session->ready = 1; - return rtp_session; } @@ -615,15 +602,12 @@ SWITCH_DECLARE(void) switch_rtp_set_cng_pt(switch_rtp_t *rtp_session, switch_payload_t pt) { - rtp_session->cng_pt = pt; - } SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { rtp_session->jb = stfu_n_init(queue_frames); - return SWITCH_STATUS_SUCCESS; } @@ -700,7 +684,6 @@ } switch_mutex_unlock((*rtp_session)->flag_mutex); - return; } @@ -736,7 +719,6 @@ SWITCH_DECLARE(void) switch_rtp_set_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_set_flag_locked(rtp_session, flags); if (flags & SWITCH_RTP_FLAG_AUTOADJ) { rtp_session->autoadj_window = 20; @@ -746,16 +728,12 @@ SWITCH_DECLARE(uint8_t) switch_rtp_test_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - return (uint8_t) switch_test_flag(rtp_session, flags); - } SWITCH_DECLARE(void) switch_rtp_clear_flag(switch_rtp_t *rtp_session, switch_rtp_flag_t flags) { - switch_clear_flag_locked(rtp_session, flags); - } @@ -777,14 +755,9 @@ duration = rtp_session->dtmf_data.out_digit_sofar; } - 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.timestamp_dtmf += samples; - for (x = 0; x < loops; x++) { rtp_session->seq++; @@ -799,14 +772,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, duration, rtp_session->seq); - - } if (loops != 1) { rtp_session->sending_dtmf = 0; } - } if (!rtp_session->dtmf_data.out_digit_dur && rtp_session->dtmf_data.dtmf_queue && switch_queue_size(rtp_session->dtmf_data.dtmf_queue)) { @@ -975,9 +945,6 @@ *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; return 2 + rtp_header_len; } - - - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { int sbytes = (int) bytes; @@ -1003,7 +970,6 @@ } return 0; } - if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ) && switch_sockaddr_get_port(rtp_session->from_addr)) { const char *tx_host; @@ -1032,21 +998,16 @@ } } - - if (bytes && rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) { goto do_continue; } - - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_GOOGLEHACK) && rtp_session->recv_msg.header.pt == 102) { rtp_session->recv_msg.header.pt = 97; } rtp_session->rseq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); rtp_session->rpayload = (switch_payload_t) rtp_session->recv_msg.header.pt; - /* RFC2833 ... TBD try harder to honor the duration etc. */ if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) @@ -1057,7 +1018,6 @@ char key = switch_rfc2833_to_char(packet[0]); uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); - /* SHEESH.... Curse you RFC2833 inventors!!!! */ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { rtp_session->dtmf_data.last_digit = 0; @@ -1084,11 +1044,8 @@ rtp_session->dtmf_data.dc = 0; } } - goto do_continue; } - - break; do_continue: @@ -1102,7 +1059,6 @@ *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt; - if (*payload_type == SWITCH_RTP_CNG_PAYLOAD) { *flags |= SFF_CNG; } @@ -1114,8 +1070,6 @@ return (int) bytes; } - - SWITCH_DECLARE(switch_size_t) switch_rtp_has_dtmf(switch_rtp_t *rtp_session) { switch_size_t has = 0; @@ -1181,7 +1135,6 @@ switch_mutex_unlock(rtp_session->dtmf_data.dtmf_mutex); return bytes; - } @@ -1209,7 +1162,6 @@ return SWITCH_STATUS_MEMERR; } } - return SWITCH_STATUS_SUCCESS; } @@ -1275,8 +1227,6 @@ } frame->datalen = bytes; - - return SWITCH_STATUS_SUCCESS; } @@ -1285,7 +1235,6 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read(switch_rtp_t *rtp_session, void **data, uint32_t * datalen, switch_payload_t *payload_type, switch_frame_flag_t *flags) { - int bytes = 0; if (!switch_rtp_ready(rtp_session)) { @@ -1383,7 +1332,6 @@ if (rtp_session->vad_data.scan_freq && rtp_session->vad_data.next_scan <= now) { rtp_session->vad_data.bg_count = rtp_session->vad_data.bg_level = 0; rtp_session->vad_data.next_scan = now + rtp_session->vad_data.scan_freq; - /* printf("RESCAN\n"); */ } if (switch_core_codec_decode(&rtp_session->vad_data.vad_codec, @@ -1417,9 +1365,6 @@ rtp_session->vad_data.bg_level += score; if (++rtp_session->vad_data.bg_count == rtp_session->vad_data.bg_len) { rtp_session->vad_data.bg_level /= rtp_session->vad_data.bg_len; - /* rtp_session->vad_data.bg_level += (rtp_session->vad_data.bg_level / 3); - * printf("AVG %u\n", rtp_session->vad_data.bg_level); - */ } send = 1; } else { @@ -1502,7 +1447,6 @@ } return (int) bytes; - } @@ -1590,7 +1534,6 @@ } return rtp_common_write(rtp_session, data, datalen, rtp_session->payload, flags); - } SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, uint32_t ts) @@ -1600,7 +1543,6 @@ uint32_t len; switch_payload_t payload; - if (!switch_rtp_ready(rtp_session)) { return -1; } @@ -1624,7 +1566,6 @@ (uint32_t)(frame->timestamp), frame->seq, frame->ssrc, &frame->flags); } - if (fwd) { data = frame->packet; len = frame->packetlen; @@ -1648,7 +1589,6 @@ } return rtp_common_write(rtp_session, data, len, payload, &frame->flags); - } SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session, @@ -1690,13 +1630,10 @@ bytes = sbytes; } - if (switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) &send_msg, &bytes) != SWITCH_STATUS_SUCCESS) { return -1; } return (int) bytes; - - //return rtp_common_write(rtp_session, (void *) &send_msg, rtp_header_len + datalen, m, payload); } SWITCH_DECLARE(uint32_t) switch_rtp_get_ssrc(switch_rtp_t *rtp_session)

1 0

[commit] r6623 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 22:44:23 2007 New Revision: 6623 Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload Log: cleanup Modified: freeswitch/trunk/conf/directory/default/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/sipphone.com.noload (original) +++ freeswitch/trunk/conf/directory/default/sipphone.com.noload Mon Dec 10 22:44:23 2007 @@ -7,7 +7,6 @@ <param name="username" value="%SPUERNAME%"/> <param name="password" value="%SPPASSWORD%"/> <param name="from-domain" value="proxy01.sipphone.com"/> - <param name="proxy" value="proxy01.sipphone.com"/> <param name="caller-id-in-from" value="true"/> <param name="expire-seconds" value="600"/> <param name="register" value="true"/>

1 0

[commit] r6622 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: mikej Date: Mon Dec 10 22:32:21 2007 New Revision: 6622 Modified: freeswitch/trunk/src/switch_console.c Log: reduce indentation / cleanup Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Dec 10 22:32:21 2007 @@ -146,44 +146,48 @@ char *data = NULL; int ret = 0; va_list ap; - FILE *handle; + FILE *handle = switch_core_data_channel(channel); const char *filep = switch_cut_path(file); + char date[80] = ""; + switch_size_t retsize; + switch_time_exp_t tm; + switch_event_t *event; va_start(ap, fmt); - - handle = switch_core_data_channel(channel); - ret = switch_vasprintf(&data, fmt, ap); va_end(ap); + if (ret == -1) { fprintf(stderr, "Memory Error\n"); - } else { - char date[80] = ""; + goto done; + } - if (channel == SWITCH_CHANNEL_ID_LOG_CLEAN) { - fprintf(handle, "%s", data); - } else { - switch_size_t retsize; - switch_time_exp_t tm; - switch_event_t *event; - switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + if (channel == SWITCH_CHANNEL_ID_LOG_CLEAN) { + fprintf(handle, "%s", data); + goto done; + } - if (channel == SWITCH_CHANNEL_ID_LOG) { - fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data); - } + switch_time_exp_lt(&tm, switch_timestamp_now()); + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); - else if (channel == SWITCH_CHANNEL_ID_EVENT && - switch_event_running() == SWITCH_STATUS_SUCCESS && switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) { + if (channel == SWITCH_CHANNEL_ID_LOG) { + fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data); + goto done; + } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line); - switch_event_fire(&event); - } - } + if (channel == SWITCH_CHANNEL_ID_EVENT && + switch_event_running() == SWITCH_STATUS_SUCCESS && + switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) { + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line); + switch_event_fire(&event); } + + +done: if (data) { free(data); }

1 0

[commit] r6621 - freeswitch/trunk/conf/dialplan/extensions
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 22:30:21 2007 New Revision: 6621 Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Log: update this to be correct Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Mon Dec 10 22:30:21 2007 @@ -1,6 +1,6 @@ <include> <extension name="sipphone.com"> - <condition field="destination_number" expression="^(1222.*)$|^(1747.*)$"> + <condition field="destination_number" expression="^((1222.*)$|^(1747.*))$"> <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> </condition> </extension>

1 0

[commit] r6620 - freeswitch/trunk/src
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 22:28:35 2007 New Revision: 6620 Modified: freeswitch/trunk/src/switch_regex.c Log: this wasn't right wrap in paren to get in multi pipe sep regexp. Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Mon Dec 10 22:28:35 2007 @@ -146,12 +146,7 @@ } index[z++] = '\0'; z = 0; - if (match_count > 1) { - int offset = match_count - 2; - num = atoi(index) + offset; - } else { - num = atoi(index); - } + num = atoi(index); if (pcre_copy_substring(field_data, ovector, match_count, num, replace, sizeof(replace)) > 0) { switch_size_t r;

1 0

[commit] r6619 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 21:21:15 2007 New Revision: 6619 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: fix xmlrpc Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Dec 10 21:21:15 2007 @@ -165,7 +165,7 @@ NextToken(&p); x = GetToken(&p); if (x) { - if (!strcasecmp(x,"basic")) { + if (!strcasecmp(x, "basic")) { NextToken(&p); @@ -187,12 +187,18 @@ } if (!domain_name) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s] no domain!\n", user); goto fail; } + + snprintf(z, sizeof(z), "%s:%s", globals.user, globals.pass); + Base64Encode(z, t); + + if (!strcmp(p, t)) { + r->user=strdup(user); + goto authed; + } if (switch_xml_locate_user("id", user, domain_name, NULL, &x_domain_root, &x_domain, &x_user, "mailbox=check") != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain_name); goto fail; } @@ -315,7 +321,7 @@ switch_xml_free(x_domain_root); } - snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name); + snprintf(z, sizeof(z), "Basic realm=\"%s\"", domain_name ? domain_name : globals.realm); ResponseAddField(r, "WWW-Authenticate", z); ResponseStatus(r, 401); return FALSE; @@ -389,9 +395,6 @@ } else { if (globals.realm && strncmp(r->uri, "/pub", 4)) { ret = !http_directory_auth(r, NULL); - if (ret) { - ret = !RequestAuth(r, globals.realm, globals.user, globals.pass); - } } } @@ -460,8 +463,12 @@ } } - if (fs_user && fs_domain && !j) { - auth = 0; + if (!fs_user || !strcmp(fs_user, globals.user)) { + auth = 1; + } else { + if (!j) { + auth = 0; + } } if (auth) {

1 0

[commit] r6618 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Mon Dec 10 20:30:43 2007 New Revision: 6618 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: fix regexp here Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Dec 10 20:30:43 2007 @@ -43,7 +43,7 @@ <extension name="eavesdrop"> - <condition field="destination_number" expression="^88(.*)$|^*0(.*)$"> + <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> <action application="answer"/> <action application="eavesdrop" data="${db(select/spymap/$1)}"/> </condition>

1 0

[commit] r6617 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Mon Dec 10 20:05:52 2007 New Revision: 6617 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Dec 10 20:05:52 2007 @@ -1488,6 +1488,16 @@ d_dest = switch_channel_expand_variables(channel, dest); if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { + const char *context; + switch_caller_profile_t *cp; + switch_channel_t *new_channel = switch_core_session_get_channel(*new_session); + + if ((context = switch_channel_get_variable(new_channel, "inbound_context"))) { + if ((cp = switch_channel_get_caller_profile(new_channel))) { + cp->context = switch_core_strdup(cp->pool, context); + } + } + switch_core_session_rwunlock(*new_session); }

1 0