- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4867 - in freeswitch/trunk: . conf
by Freeswitch SVN 06 Apr '07

06 Apr '07

Author: mikej Date: Fri Apr 6 04:55:37 2007 New Revision: 4867 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/conf/freeswitch.xml freeswitch/trunk/conf/freeswitch_combined.xml Log: add mod_cdr config files. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Apr 6 04:55:37 2007 @@ -492,6 +492,7 @@ conf\ivr.conf.xml = conf\ivr.conf.xml conf\lang_en.xml = conf\lang_en.xml conf\lang_fr.xml = conf\lang_fr.xml + conf\mod_cdr.conf.xml = conf\mod_cdr.conf.xml conf\modules.conf.xml = conf\modules.conf.xml conf\portaudio.conf.xml = conf\portaudio.conf.xml conf\rss.conf.xml = conf\rss.conf.xml @@ -524,6 +525,7 @@ release\conf\ivr.conf.xml = release\conf\ivr.conf.xml release\conf\lang_en.xml = release\conf\lang_en.xml release\conf\lang_fr.xml = release\conf\lang_fr.xml + release\conf\mod_cdr.conf.xml = release\conf\mod_cdr.conf.xml release\conf\modules.conf.xml = release\conf\modules.conf.xml release\conf\portaudio.conf.xml = release\conf\portaudio.conf.xml release\conf\rss.conf.xml = release\conf\rss.conf.xml @@ -556,6 +558,7 @@ debug\conf\ivr.conf.xml = debug\conf\ivr.conf.xml debug\conf\lang_en.xml = debug\conf\lang_en.xml debug\conf\lang_fr.xml = debug\conf\lang_fr.xml + debug\conf\mod_cdr.conf.xml = debug\conf\mod_cdr.conf.xml debug\conf\modules.conf.xml = debug\conf\modules.conf.xml debug\conf\portaudio.conf.xml = debug\conf\portaudio.conf.xml debug\conf\rss.conf.xml = debug\conf\rss.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Fri Apr 6 04:55:37 2007 @@ -40,6 +40,7 @@    +  </section> <section name="dialplan" description="Regex/XML Dialplan"> Modified: freeswitch/trunk/conf/freeswitch_combined.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch_combined.xml (original) +++ freeswitch/trunk/conf/freeswitch_combined.xml Fri Apr 6 04:55:37 2007 @@ -524,7 +524,32 @@ <entry action="menu-top" digits="*"/> </menu> </menus> - </configuration> + </configuration> + <configuration name="mod_cdr.conf" description="CDR Configuration"> + <pddcdr> + <param name="path" value="/work/temp/pddcdr"/> +  +  + </pddcdr> + <csvcdr> + <param name="path" value="/work/temp/csvcdr"/> + <param name="size_limit" value="25"/> +  +  +  + </csvcdr> + <mysqlcdr> + <param name="hostname" value="10.0.0.1"/> + <param name="username" value="test"/> + <param name="password" value="test"/> + <param name="dbname" value="testing"/> +  +  +  + <param name="chanvars_supp" value="*"/> + <param name="chanvars_supp_repeat_fixed" value="0"/> + </mysqlcdr> + </configuration> </section>

1 0

[commit] r4866 - freeswitch/trunk
by Freeswitch SVN 06 Apr '07

06 Apr '07

Author: mikej Date: Fri Apr 6 04:23:54 2007 New Revision: 4866 Modified: freeswitch/trunk/configure.in Log: fix mysql configure check (reported by bblack via irc) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Apr 6 04:23:54 2007 @@ -322,7 +322,7 @@ AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) AM_CONDITIONAL([ADD_ODBC],[test "x$enable_core_odbc_support" != "xno"]) -AM_CONDITIONAL([HAVE_MYSQL],[test "$have_mysql" = "yes"]) +AM_CONDITIONAL([HAVE_MYSQL],[test "x$have_mysql" != "x"]) AC_CONFIG_FILES([Makefile src/Makefile

1 0

[commit] r4865 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 18:31:47 2007 New Revision: 4865 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: shrug Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 5 18:31:47 2007 @@ -798,6 +798,7 @@ int fd = -1; size_t bytes; char *key; + char hash[128] = ""; if (from && (ap = (ldl_avatar_t *) apr_hash_get(globals.avatar_hash, from, APR_HASH_KEY_STRING))) { return ap; @@ -828,7 +829,8 @@ ap = malloc(sizeof(*ap)); assert(ap != NULL); memset(ap, 0, sizeof(*ap)); - sha1_hash(ap->hash, (char *)image, bytes); + ldl_random_string(hash, sizeof(hash) -1, NULL); + sha1_hash(ap->hash, hash, strlen(hash)); ap->path = strdup(path); key = ldl_handle_strdup(handle, from);

1 0

[commit] r4864 - in freeswitch/trunk: libs/libdingaling/src src/mod/applications/mod_conference src/mod/endpoints/mod_dingaling
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 16:29:14 2007 New Revision: 4864 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Log: fix Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 5 16:29:14 2007 @@ -81,7 +81,7 @@ static int opt_timeout = 30; -static void sha1_hash(char *out, char *in); +static void sha1_hash(char *out, char *in, unsigned int len); static int b64encode(unsigned char *in, size_t ilen, unsigned char *out, size_t olen); static void ldl_random_string(char *buf, uint16_t len, char *set); @@ -828,7 +828,7 @@ ap = malloc(sizeof(*ap)); assert(ap != NULL); memset(ap, 0, sizeof(*ap)); - sha1_hash(ap->hash, (char *)image); + sha1_hash(ap->hash, (char *)image, bytes); ap->path = strdup(path); key = ldl_handle_strdup(handle, from); @@ -1110,7 +1110,7 @@ return 0; } -static void sha1_hash(char *out, char *in) +static void sha1_hash(char *out, char *in, unsigned int len) { sha_context_t sha; char *p; @@ -1119,7 +1119,7 @@ SHA1Init(&sha); - SHA1Update(&sha, (unsigned char *) in, (unsigned int)strlen(in)); + SHA1Update(&sha, (unsigned char *) in, len); SHA1Final(digest, &sha); @@ -1146,7 +1146,7 @@ char handshake[512] = ""; snprintf(secret, sizeof(secret), "%s%s", pak->id, handle->password); - sha1_hash(hash, secret); + sha1_hash(hash, secret, strlen(secret)); snprintf(handshake, sizeof(handshake), "<handshake>%s</handshake>", hash); iks_send_raw(handle->parser, handshake); handle->state = CS_START; 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 Thu Apr 5 16:29:14 2007 @@ -3429,7 +3429,7 @@ } } else { stream->write_function(stream, "Conference %s not found\n", argv[0]); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s not found\n", argv[0]); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Thu Apr 5 16:29:14 2007 @@ -9,7 +9,7 @@ DING_DIR=$(BASE)/libs/libdingaling LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) - +LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c include $(BASE)/build/modmake.rules $(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update

1 0

[commit] r4863 - in freeswitch/trunk: conf src src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 15:29:48 2007 New Revision: 4863 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: fix rtp issue Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Thu Apr 5 15:29:48 2007 @@ -31,6 +31,9 @@ <param name="rtp-ip" value="auto"/> <param name="sip-ip" value="auto"/> +  +  +   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 Apr 5 15:29:48 2007 @@ -829,15 +829,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); - flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ; + flags = SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; //flags = SWITCH_RTP_FLAG_AUTOADJ; if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { flags |= SWITCH_RTP_FLAG_USE_TIMER; } - flags |= SWITCH_RTP_FLAG_AUTO_CNG; - if (!(tech_pvt->rtp_session = switch_rtp_new(tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Apr 5 15:29:48 2007 @@ -105,7 +105,8 @@ PFLAG_FULL_ID = (1 << 3), PFLAG_PRESENCE = (1 << 4), PFLAG_PASS_RFC2833 = (1 << 5), - PFLAG_DISABLE_TRANSCODING = (1 << 6) + PFLAG_DISABLE_TRANSCODING = (1 << 6), + PFLAG_REWRITE_TIMESTAMPS = (1 << 7) } PFLAGS; typedef enum { 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 Thu Apr 5 15:29:48 2007 @@ -547,6 +547,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_DISABLE_TRANSCODING; } + } else if (!strcasecmp(var, "rtp-rewrite-timestamps")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_REWRITE_TIMESTAMPS; + } } else if (!strcasecmp(var, "auth-calls")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_CALLS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Apr 5 15:29:48 2007 @@ -682,7 +682,7 @@ bw = tech_pvt->read_codec.implementation->bits_per_second; ms = tech_pvt->read_codec.implementation->microseconds_per_frame; - flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT); + flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT); if (switch_test_flag(tech_pvt, TFLAG_BUGGY_2833)) { flags |= SWITCH_RTP_FLAG_BUGGY_2833; @@ -693,6 +693,11 @@ flags |= SWITCH_RTP_FLAG_PASS_RFC2833; } + if (!((tech_pvt->profile->pflags & PFLAG_REWRITE_TIMESTAMPS) || + ((val = switch_channel_get_variable(channel, "rtp_rewrite_timestamps")) && switch_true(val)))) { + flags |= SWITCH_RTP_FLAG_RAW_WRITE; + } + if (tech_pvt->cng_pt) { flags |= SWITCH_RTP_FLAG_AUTO_CNG; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Apr 5 15:29:48 2007 @@ -1307,6 +1307,7 @@ switch_core_timer_check(&rtp_session->timer); rtp_session->last_write_samplecount = rtp_session->timer.samplecount; } + switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void *) send_msg, &bytes); } @@ -1410,7 +1411,6 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_frame_t *frame, uint32_t ts) { uint8_t fwd = 0; - uint8_t packetize = 0; void *data; uint32_t len; switch_payload_t payload; @@ -1421,7 +1421,6 @@ } fwd = (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RAW_WRITE) && switch_test_flag(frame, SFF_RAW_RTP)) ? 1 : 0; - packetize = (rtp_session->samples_per_interval > frame->datalen && (frame->payload == rtp_session->payload)) ? 1 : 0; if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) || !rtp_session->remote_addr) { return -1; @@ -1435,7 +1434,7 @@ payload = rtp_session->payload; } - if (fwd && !packetize) { + if (fwd) { data = frame->packet; len = frame->packetlen; } else {

1 0

[commit] r4862 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 13:52:35 2007 New Revision: 4862 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Thu Apr 5 13:52:35 2007 @@ -982,16 +982,18 @@ nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Invite with no SDP activating no-media-mode\n"); - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); - - switch_set_flag(tech_pvt, TFLAG_LATE_NEGOTIATION); - switch_set_flag_locked(tech_pvt, TFLAG_NOMEDIA); - switch_channel_set_flag(channel, CF_NOMEDIA); - switch_channel_set_state(channel, CS_INIT); - switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_core_session_thread_launch(session); - goto done; + if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { + goto done; + } else { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); + switch_set_flag(tech_pvt, TFLAG_LATE_NEGOTIATION); + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); + + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + goto done; + } } }

1 0

[commit] r4861 - freeswitch/trunk/libs/libdingaling/src
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 11:08:54 2007 New Revision: 4861 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: remove unused struct member Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Apr 5 11:08:54 2007 @@ -165,7 +165,6 @@ struct ldl_avatar { char *path; - char *from; char *base64; char hash[256]; };

1 0

[commit] r4860 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 10:58:07 2007 New Revision: 4860 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix contact thing for gateway calls Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Apr 5 10:58:07 2007 @@ -416,7 +416,10 @@ char *url = sofia_glue_get_url_from_contact(tech_pvt->dest, 1); tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url), - SIPTAG_TO_STR(tech_pvt->dest_to), SIPTAG_FROM_STR(tech_pvt->from_str), SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SIPTAG_TO_STR(tech_pvt->dest_to), + SIPTAG_FROM_STR(tech_pvt->from_str), + TAG_IF(tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->invite_contact)), + TAG_IF(!tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->profile->url)), TAG_END()); switch_safe_free(url); @@ -472,7 +475,6 @@ TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), - TAG_IF(tech_pvt->invite_contact, SIPTAG_CONTACT_STR(tech_pvt->invite_contact)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END());

1 0

[commit] r4859 - freeswitch/trunk/build
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: anthm Date: Thu Apr 5 10:57:20 2007 New Revision: 4859 Modified: freeswitch/trunk/build/turbo_build.sh Log: make turbo install too Modified: freeswitch/trunk/build/turbo_build.sh ============================================================================== --- freeswitch/trunk/build/turbo_build.sh (original) +++ freeswitch/trunk/build/turbo_build.sh Thu Apr 5 10:57:20 2007 @@ -21,8 +21,8 @@ fi done if [ $x = 0 ] ; then - sleep 1 - echo done + echo Build finished. Making install + $MAKE install exit; fi sleep 1

1 0

[commit] r4858 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Apr '07

05 Apr '07

Author: mikej Date: Thu Apr 5 06:54:08 2007 New Revision: 4858 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: silly cast. 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 Thu Apr 5 06:54:08 2007 @@ -583,7 +583,7 @@ assert(nh != NULL); id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); - expire_sec -= time(NULL); + expire_sec = (int)(expire_sec - time(NULL)); if (expire_sec < 0) { expire_sec = 3600; }

1 0