- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3046 - freeswitch/branches/alex
by Freeswitch SVN 13 Oct '06

13 Oct '06

Author: sphere Date: Fri Oct 13 14:41:47 2006 New Revision: 3046 Added: freeswitch/branches/alex/ Log: Creating empty folder for alex

1 0

[commit] r3045 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 13 Oct '06

13 Oct '06

Author: anthm Date: Fri Oct 13 10:32:38 2006 New Revision: 3045 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: dont write nulls in event_socket Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Oct 13 10:32:38 2006 @@ -327,9 +327,9 @@ if (data) { snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", strlen(data)); - len = strlen(buf) + 1; + len = strlen(buf); switch_socket_send(listener->sock, buf, &len); - len = strlen(data) + 1; + len = strlen(data); switch_socket_send(listener->sock, data, &len); free(data); @@ -367,16 +367,16 @@ } } - len = strlen(packet) + 1; + len = strlen(packet); snprintf(hbuf, sizeof(hbuf), "Content-Length: %"APR_SSIZE_T_FMT"\n" "Content-Type: text/event-%s\n" "\n", len, etype); - len = strlen(hbuf) + 1; + len = strlen(hbuf); switch_socket_send(listener->sock, hbuf, &len); - len = strlen(packet) + 1; + len = strlen(packet); switch_socket_send(listener->sock, packet, &len); if (xmlstr) { @@ -430,11 +430,11 @@ } else { switch_size_t len; char buf[1024]; - len = strlen(stream.data) + 1; + len = strlen(stream.data); snprintf(buf, sizeof(buf), "Content-Type: api/response\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", len); - len = strlen(buf) + 1; + len = strlen(buf); switch_socket_send(acs->listener->sock, buf, &len); - len = strlen(stream.data) + 1; + len = strlen(stream.data); switch_socket_send(acs->listener->sock, stream.data, &len); } } @@ -781,7 +781,7 @@ snprintf(buf, sizeof(buf), "Content-Type: auth/request\n\n"); - len = strlen(buf) + 1; + len = strlen(buf); switch_socket_send(listener->sock, buf, &len); @@ -800,7 +800,7 @@ } if (!switch_strlen_zero(reply)) { snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); - len = strlen(buf) + 1; + len = strlen(buf); switch_socket_send(listener->sock, buf, &len); } break; @@ -830,7 +830,7 @@ if (!switch_strlen_zero(reply)) { snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); - len = strlen(buf) + 1; + len = strlen(buf); switch_socket_send(listener->sock, buf, &len); }

1 0

[commit] r3044 - freeswitch/branches/m_p_pl
by Freeswitch SVN 13 Oct '06

13 Oct '06

Author: sphere Date: Fri Oct 13 03:15:44 2006 New Revision: 3044 Added: freeswitch/branches/m_p_pl/ Log: Creating empty folder for m_p_pl

1 0

[commit] r3043 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: anthm Date: Thu Oct 12 16:37:08 2006 New Revision: 3043 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: in the name of interop Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Oct 12 16:37:08 2006 @@ -182,6 +182,7 @@ SWITCH_RTP_FLAG_BREAK - Stop what you are doing and return SWITCH_STATUS_BREAK SWITCH_RTP_FLAG_MINI - Use mini RTP when possible SWITCH_RTP_FLAG_DATAWAIT - Do not return from reads unless there is data even when non blocking + SWITCH_RTP_FLAG_BUGGY_2833 - Emulate the bug in cisco equipment to allow interop </pre> */ typedef enum { @@ -196,7 +197,8 @@ SWITCH_RTP_FLAG_VAD = (1 << 8), SWITCH_RTP_FLAG_BREAK = ( 1 << 9), SWITCH_RTP_FLAG_MINI = ( 1 << 10), - SWITCH_RTP_FLAG_DATAWAIT = (1 << 11) + SWITCH_RTP_FLAG_DATAWAIT = (1 << 11), + SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12) } switch_rtp_flag_t; /*! 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 Thu Oct 12 16:37:08 2006 @@ -142,7 +142,8 @@ TFLAG_REFER = (1 << 17), TFLAG_NOHUP = (1 << 18), TFLAG_XFER = (1 << 19), - TFLAG_NOMEDIA = (1 << 20) + TFLAG_NOMEDIA = (1 << 20), + TFLAG_BUGGY_2833 = (1 << 21) } TFLAGS; static struct { @@ -275,6 +276,7 @@ char *key; char *xferto; char *kick; + char *origin; unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; @@ -1226,6 +1228,10 @@ flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT); + if (switch_test_flag(tech_pvt, TFLAG_BUGGY_2833)) { + flags |= SWITCH_RTP_FLAG_BUGGY_2833; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, @@ -1822,6 +1828,13 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); + 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); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Activate Buggy RFC2833 Mode!\n"); + } + } + for (m = sdp->sdp_media; m ; m = m->m_next) { if (m->m_type == sdp_media_audio) { sdp_rtpmap_t *map; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Oct 12 16:37:08 2006 @@ -732,7 +732,7 @@ switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, - 1, + switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_seq++,

1 0

[commit] r3042 - freeswitch/branches/pinky
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: sphere Date: Thu Oct 12 13:52:46 2006 New Revision: 3042 Added: freeswitch/branches/pinky/ Log: Creating empty folder for pinky

1 0

[commit] r3041 - in freeswitch/trunk: conf src/mod/endpoints/mod_dingaling
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: anthm Date: Thu Oct 12 10:06:09 2006 New Revision: 3041 Modified: freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: add auto-reply option to dingaling to allow the gateway bot to auto-reply to chat msgs recieved outside the context of a call Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Oct 12 10:06:09 2006 @@ -278,6 +278,7 @@ <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="10.0.0.1"/> <param name="auto-login" value="true"/> + <param name="auto-reply" value="Press *Call* to call FreeSWITCH and be sure to come to ClueCon! http://www.cluecon.com"/>  <param name="sasl" value="plain"/>  Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Oct 12 10:06:09 2006 @@ -95,6 +95,7 @@ char *login; char *password; char *message; + char *auto_reply; char *dialplan; char *ip; char *extip; @@ -1302,6 +1303,8 @@ switch_set_flag(profile, TFLAG_TIMER); } else if (!strcasecmp(var, "dialplan")) { profile->dialplan = switch_core_strdup(module_pool, val); + } else if (!strcasecmp(var, "auto-reply")) { + profile->auto_reply = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "name")) { profile->name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "message")) { @@ -1551,6 +1554,11 @@ if (msg) { switch_event_add_body(event, msg); } + + if (profile->auto_reply) { + ldl_handle_send_msg(handle, from, "", profile->auto_reply); + } + switch_event_fire(&event); } break;

1 0

[commit] r3040 - freeswitch/branches/jmls
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: sphere Date: Thu Oct 12 06:45:44 2006 New Revision: 3040 Added: freeswitch/branches/jmls/ Log: Creating empty folder for jmls

1 0

[commit] r3039 - freeswitch/branches/dtasia
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: sphere Date: Thu Oct 12 00:30:02 2006 New Revision: 3039 Added: freeswitch/branches/dtasia/ Log: Creating empty folder for dtasia

1 0

[commit] r3038 - freeswitch/branches/gwinkler
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: sphere Date: Wed Oct 11 22:42:45 2006 New Revision: 3038 Added: freeswitch/branches/gwinkler/ Log: Creating empty folder for gwinkler

1 0

[commit] r3037 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Oct '06

12 Oct '06

Author: anthm Date: Wed Oct 11 22:26:20 2006 New Revision: 3037 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: udpate 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 Wed Oct 11 22:26:20 2006 @@ -2281,13 +2281,15 @@ break; case nua_callstate_terminated: if (session) { - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - if (switch_test_flag(tech_pvt, TFLAG_NOHUP)) { - switch_clear_flag_locked(tech_pvt, TFLAG_NOHUP); - nua_handle_destroy(tech_pvt->nh); - tech_pvt->nh = NULL; - } else { - terminate_session(&session, sip_cause_to_freeswitch(status), __LINE__); + if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + if (switch_test_flag(tech_pvt, TFLAG_NOHUP)) { + switch_clear_flag_locked(tech_pvt, TFLAG_NOHUP); + nua_handle_destroy(tech_pvt->nh); + tech_pvt->nh = NULL; + } else { + terminate_session(&session, sip_cause_to_freeswitch(status), __LINE__); + } } } break;

1 0