- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4121 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 18:04:16 2007 New Revision: 4121 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: don't depend on a session c= line in the sdp and use the one from the media if it's there. Patch via jira from Mikael Magnusson 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 Sun Feb 4 18:04:16 2007 @@ -2267,11 +2267,6 @@ channel = switch_core_session_get_channel(session); - if (!sdp->sdp_connection) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp!\n"); - return 0; - } - if ((tech_pvt->origin = switch_core_session_strdup(session, (char *) sdp->sdp_origin->o_username))) { if (strstr(tech_pvt->origin, "CiscoSystemsSIP-GW-UserAgent")) { switch_set_flag_locked(tech_pvt, TFLAG_BUGGY_2833); @@ -2290,6 +2285,19 @@ } for (m = sdp->sdp_media; m ; m = m->m_next) { + sdp_connection_t *connection; + + connection = sdp->sdp_connection; + if (m->m_connections) { + connection = m->m_connections; + } + + if (!connection) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n"); + match = 0; + break; + } + ptime = dptime; for (a = m->m_attributes; a; a = a->a_next) { if (!strcasecmp(a->a_name, "ptime")) { @@ -2362,7 +2370,7 @@ tech_pvt->pt = (switch_payload_t)map->rm_pt; tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; - tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); + tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)connection->c_address); tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt;

1 0

[commit] r4120 - freeswitch/branches/achaloyan
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: sphere Date: Sun Feb 4 16:45:10 2007 New Revision: 4120 Added: freeswitch/branches/achaloyan/ Log: Creating empty folder for achaloyan

1 0

[commit] r4119 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:53:35 2007 New Revision: 4119 Modified: freeswitch/trunk/src/switch_ivr.c Log: small fix to dtmf handling in ivr menus Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Feb 4 14:53:35 2007 @@ -4121,6 +4121,7 @@ uint32_t len; char *ptr; switch_status_t status = SWITCH_STATUS_FALSE; + switch_input_args_t args= {0}; if (session != NULL && menu != NULL && !switch_strlen_zero(sound)) { memset(menu->buf, 0, menu->inlen); @@ -4133,17 +4134,13 @@ len = menu->inlen; ptr = menu->ptr; } + args.buf = ptr; + args.buflen = len; if (*sound == '/' || *sound == '\\') { - switch_input_args_t args = {0}; - args.buf = ptr; - args.buflen = need ? 1 : 0; status = switch_ivr_play_file(session, NULL, sound, &args); } else { if (menu->tts_engine && menu->tts_voice) { - switch_input_args_t args = {0}; - args.buf = ptr; - args.buflen = len; status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, 0, sound, &args); } }

1 0

[commit] r4118 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:38:13 2007 New Revision: 4118 Modified: freeswitch/trunk/src/switch_ivr.c Log: menu->inlen is allways max bound size +1 (for terminating null) so we need to pass -1 to play or say. Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Feb 4 14:38:13 2007 @@ -4209,7 +4209,7 @@ memset(arg, 0, sizeof(arg)); memset(menu->buf, 0, menu->inlen); - status = play_or_say(session, menu, greeting_sound, menu->inlen); + status = play_or_say(session, menu, greeting_sound, menu->inlen - 1); if (!switch_strlen_zero(menu->buf)) { for(ap = menu->actions; ap ; ap = ap->next) {

1 0

[commit] r4117 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:12:48 2007 New Revision: 4117 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: use same signedness var type for ptime. 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 Sun Feb 4 14:12:48 2007 @@ -684,7 +684,7 @@ { char buf[1024]; switch_time_t now = switch_time_now(); - uint32_t ptime = 0; + int ptime = 0; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return;

1 0

[commit] r4116 - freeswitch/trunk/src
by Freeswitch SVN 04 Feb '07

04 Feb '07

Author: mikej Date: Sun Feb 4 14:12:14 2007 New Revision: 4116 Modified: freeswitch/trunk/src/switch_event.c Log: don't use uninitialized value of data, return error if null fmt string passed. Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sun Feb 4 14:12:14 2007 @@ -531,13 +531,15 @@ ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); - } - if (ret == -1) { - return SWITCH_STATUS_GENERR; + if (ret == -1) { + return SWITCH_STATUS_GENERR; + } else { + event->body = data; + return SWITCH_STATUS_SUCCESS; + } } else { - event->body = data; - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_GENERR; } }

1 0

[commit] r4115 - freeswitch/trunk/src
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 17:17:36 2007 New Revision: 4115 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 3 17:17:36 2007 @@ -150,7 +150,6 @@ uint32_t ms_per_packet; uint32_t remote_port; uint8_t stuncount; - switch_buffer_t *packet_buffer; struct switch_rtp_vad_data vad_data; struct switch_rtp_rfc2833_data dtmf_data; switch_payload_t te; @@ -551,9 +550,6 @@ switch_mutex_lock((*rtp_session)->flag_mutex); - if ((*rtp_session)->packet_buffer) { - switch_buffer_destroy(&(*rtp_session)->packet_buffer); - } if ((*rtp_session)->dtmf_data.dtmf_buffer) { switch_buffer_destroy(&(*rtp_session)->dtmf_data.dtmf_buffer); } @@ -1073,7 +1069,6 @@ static int rtp_common_write(switch_rtp_t *rtp_session, void *data, uint32_t datalen, uint8_t m, switch_payload_t payload, switch_frame_flag_t *flags) { switch_size_t bytes; - uint8_t packetize = (rtp_session->packet_size > datalen && (payload == rtp_session->payload)) ? 1 : 0; uint8_t fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && (*flags & SFF_RAW_RTP)) ? 1 : 0; rtp_msg_t *send_msg; uint8_t send = 1; @@ -1085,24 +1080,8 @@ send_msg = &rtp_session->send_msg; send_msg->header.pt = payload; send_msg->header.m = m ? 1 : 0; - if (packetize) { - if (!rtp_session->packet_buffer) { - if (switch_buffer_create_dynamic(&rtp_session->packet_buffer, rtp_session->packet_size, rtp_session->packet_size * 2, 0) - != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Buffer memory error\n"); - return -1; - } - } - switch_buffer_write(rtp_session->packet_buffer, data, datalen); - if (switch_buffer_inuse(rtp_session->packet_buffer) >= rtp_session->packet_size) { - switch_buffer_read(rtp_session->packet_buffer, send_msg->body, rtp_session->packet_size); - datalen = rtp_session->packet_size; - } else { - return datalen; - } - } else { - memcpy(send_msg->body, data, datalen); - } + memcpy(send_msg->body, data, datalen); + bytes = datalen + rtp_header_len; }

1 0

[commit] r4114 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 14:47:21 2007 New Revision: 4114 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: I...HATES...PTIME 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 Sat Feb 3 14:47:21 2007 @@ -684,6 +684,7 @@ { char buf[1024]; switch_time_t now = switch_time_now(); + uint32_t ptime = 0; if (!force && !ip && !sr && switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -727,7 +728,11 @@ int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", imp->ianacode); + if (!ptime) { + ptime = imp->microseconds_per_frame / 1000; + } } } @@ -742,19 +747,21 @@ if (tech_pvt->fmtp_out) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); } - if (tech_pvt->read_codec.implementation) { - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", tech_pvt->read_codec.implementation->microseconds_per_frame / 1000); + if (tech_pvt->read_codec.implementation && ! ptime) { + ptime = tech_pvt->read_codec.implementation->microseconds_per_frame / 1000; } } else if (tech_pvt->num_codecs) { int i; for (i = 0; i < tech_pvt->num_codecs; i++) { const switch_codec_implementation_t *imp = tech_pvt->codecs[i]; + if (ptime && ptime != imp->microseconds_per_frame / 1000) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ptime %u != advertised ptime %u\n", imp->microseconds_per_frame / 1000, ptime); + } snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", imp->ianacode, imp->iananame, imp->samples_per_second); if (imp->fmtp) { snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", imp->ianacode, imp->fmtp); } - snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", imp->microseconds_per_frame / 1000); } } @@ -762,6 +769,10 @@ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } + if (ptime) { + snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=ptime:%d\n", ptime); + } + tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, buf); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Feb 3 14:47:21 2007 @@ -141,6 +141,7 @@ char *ice_user; char *user_ice; + char *timer_name; switch_time_t last_stun; uint32_t packet_size; uint32_t conf_packet_size; @@ -428,6 +429,7 @@ rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->packet_size = rtp_session->conf_packet_size = packet_size; + rtp_session->timer_name = switch_core_strdup(rtp_session->pool, timer_name); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { err_status_t stat; @@ -760,15 +762,36 @@ if (bytes > 0 && rtp_session->recv_msg.header.version == 2) { uint32_t effective_size = (uint32_t)(bytes - rtp_header_len); + uint32_t new_ms = 0, old_size = 0; + if (effective_size && rtp_session->packet_size && rtp_session->recv_msg.header.pt == rtp_session->payload && effective_size != rtp_session->packet_size) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Configured packet size %u != inbound packet size %u: auto-correcting..\n", rtp_session->packet_size, effective_size ); + + old_size = rtp_session->packet_size; + new_ms = (((rtp_session->ms_per_packet / 1000) * effective_size) / old_size); + + rtp_session->ms_per_packet = new_ms * 1000; rtp_session->packet_size = effective_size; + + if (rtp_session->timer.timer_interface) { + switch_core_timer_destroy(&rtp_session->timer); + if (!switch_strlen_zero(rtp_session->timer_name)) { + if (switch_core_timer_init(&rtp_session->timer, + rtp_session->timer_name, + rtp_session->ms_per_packet / 1000, + rtp_session->packet_size, + rtp_session->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting timer [%s] %d bytes per %dms\n", + rtp_session->timer_name, rtp_session->packet_size, rtp_session->ms_per_packet / 1000); + } + } + } } - } + } if (rtp_session->timer.interval) { check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS);

1 0

[commit] r4113 - freeswitch/trunk/src
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 12:06:57 2007 New Revision: 4113 Modified: freeswitch/trunk/src/switch_event.c Log: fix events with large bodies Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sat Feb 3 12:06:57 2007 @@ -519,19 +519,24 @@ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) { int ret = 0; - char data[2048]; + char *data; va_list ap; if (fmt) { va_start(ap, fmt); - ret = vsnprintf(data, sizeof(data), fmt, ap); +#ifdef HAVE_VASPRINTF + ret = vasprintf(&data, fmt, ap); +#else + data = (char *) malloc(2048); + ret = vsnprintf(data, 2048, fmt, ap); +#endif va_end(ap); } if (ret == -1) { return SWITCH_STATUS_GENERR; } else { - event->body = DUP(data); + event->body = data; return SWITCH_STATUS_SUCCESS; } }

1 0

[commit] r4112 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 03 Feb '07

03 Feb '07

Author: anthm Date: Sat Feb 3 11:44:00 2007 New Revision: 4112 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: minor conference tweak (needs testing) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Feb 3 11:44:00 2007 @@ -25,6 +25,7 @@ * * Anthony Minessale II <anthmct(a)yahoo.com> * Neal Horman <neal at wanlink dot com> + * Bret McDanel <trixter at 0xdecafbad dot com> * * * mod_conference.c -- Software Conference Bridge @@ -177,6 +178,9 @@ char *caller_id_name; char *caller_id_number; char *sound_prefix; + uint32_t max_members; + char *maxmember_sound; + uint32_t anounce_count; switch_ivr_digit_stream_parser_t *dtmf_parser; char *pin; char *pin_sound; @@ -470,6 +474,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; switch_event_t *event; + char msg[512]; // for conference count anouncement assert(conference != NULL); assert(member != NULL); @@ -498,19 +503,27 @@ switch_event_fire(&event); } - - if (conference->enter_sound) { + if (conference->count > 1 && conference->enter_sound) { conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session)); } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + // anounce the total number of members in the conference + if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { + snprintf(msg, sizeof(msg), "There are %d callers", conference->count); + conference_member_say(member, msg, 0); + } else if (conference->count == 1) { + if (conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); + } else { + snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count); + conference_member_say(member, msg, 0); + } } if (conference->min && conference->count >= conference->min) { switch_set_flag(conference, CFLAG_ENFORCE_MIN); } - + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_channel_t *channel = switch_core_session_get_channel(member->session); switch_channel_event_set_data(channel, event); @@ -3779,6 +3792,21 @@ } goto done; } + + /* dont allow more callers than the max_members allows for -- I explicitly didnt allow outbound calls + * someone else can add that (see above) if they feel that outbound calls should be able to violate the + * max_members limit -- TRX + */ + if((conference->max_members > 0) && (conference->count >= conference->max_members)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is full.\n",conf_name); + if(conference->maxmember_sound) { + /* Answer the channel */ + switch_channel_answer(channel); + conference_local_play_file(conference, session, conference->maxmember_sound, 20, NULL, 0); + } + goto done; + } + } /* Release the config registry handle */ @@ -4363,6 +4391,9 @@ char *caller_id_name = NULL; char *caller_id_number = NULL; char *caller_controls = NULL; + uint32_t max_members = 0; + uint32_t anounce_count = 0; + char *maxmember_sound = NULL; uint32_t rate = 8000, interval = 20; switch_status_t status; @@ -4439,6 +4470,24 @@ caller_controls = val; } else if (!strcasecmp(var, "sound-prefix")) { sound_prefix = val; + } else if (!strcasecmp(var, "max-members")) { + errno = 0; // sanity first + max_members = strtol(val,NULL,0); // base 0 lets 0x... for hex 0... for octal and base 10 otherwise through + if(errno == ERANGE || errno == EINVAL || max_members < 0 || max_members == 1) { + // a negative wont work well, and its foolish to have a conference limited to 1 person unless the outbound + // stuff is added, see comments above + max_members = 0; // set to 0 to disable max counts + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "max-members %s is invalid, not setting a limit\n",val); + } + } else if(!strcasecmp(var, "max-members-sound")) { + maxmember_sound = val; + } else if(!strcasecmp(var, "anounce-count")) { + errno = 0; // safety first + anounce_count = strtol(val,NULL,0); + if(errno == ERANGE || errno == EINVAL) { + anounce_count = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "anounce-count is invalid, not anouncing member counts\n"); + } } } @@ -4565,6 +4614,14 @@ conference->energy_level = atoi(energy_level); } + if (!switch_strlen_zero(maxmember_sound)) { + conference->maxmember_sound = switch_core_strdup(conference->pool, maxmember_sound); + } + + // its going to be 0 by default, set to a value otherwise so this should be safe + conference->max_members = max_members; + conference->anounce_count = anounce_count; + conference->name = switch_core_strdup(conference->pool, name); if (domain) { conference->domain = switch_core_strdup(conference->pool, domain);

1 0