October 2006 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3107 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling mod/endpoints/mod_sofia
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mikej Date: Thu Oct 19 12:42:41 2006 New Revision: 3107 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: change to switch_mprintf 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 19 12:42:41 2006 @@ -264,7 +264,7 @@ *p = '\0'; } - sql = switch_core_db_mprintf("select *,'%q','%q' from subscriptions where sub_to='%q'", type ? type : "", status ? status : "unavailable", from); + sql = switch_mprintf("select *,'%q','%q' from subscriptions where sub_to='%q'", type ? type : "", status ? status : "unavailable", from); for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) { char *errmsg; switch_hash_this(hi, NULL, NULL, &val); @@ -346,7 +346,7 @@ event_type="presence"; } - sql = switch_core_db_mprintf("select *,'%q' from subscriptions", show ? show : "unavilable"); + sql = switch_mprintf("select *,'%q' from subscriptions", show ? show : "unavilable"); for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) { char *errmsg; @@ -1805,7 +1805,7 @@ case LDL_SIGNAL_UNSUBSCRIBE: if ((profile->user_flags & LDL_FLAG_COMPONENT)) { - if ((sql = switch_core_db_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { + if ((sql = switch_mprintf("delete from subscriptions where sub_from='%q' and sub_to='%q';", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } @@ -1815,7 +1815,7 @@ case LDL_SIGNAL_SUBSCRIBE: if ((profile->user_flags & LDL_FLAG_COMPONENT)) { - if ((sql = switch_core_db_mprintf("insert into subscriptions values('%q','%q')", from, to))) { + if ((sql = switch_mprintf("insert into subscriptions values('%q','%q')", from, to))) { execute_sql(profile->dbname, sql, profile->mutex); switch_core_db_free(sql); } 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 19 12:42:41 2006 @@ -893,8 +893,8 @@ static void do_invite(switch_core_session_t *session) { char rpid[1024] = { 0 }; - char alert_info[1024] = { 0 }; - char *alertbuf; + char alert_info[1024] = { 0 }; + char *alertbuf; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -923,11 +923,11 @@ ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); - - if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { - snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); - } + if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { + snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); + } + tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); @@ -981,7 +981,7 @@ nua_invite(tech_pvt->nh, TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), - TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), + TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 19 12:42:41 2006 @@ -3402,10 +3402,10 @@ switch (event->event_id) { case SWITCH_EVENT_CHANNEL_DESTROY: - sql = switch_core_db_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); + sql = switch_mprintf("delete from channels where uuid='%s'", switch_event_get_header(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_CREATE: - sql = switch_core_db_mprintf("insert into channels (uuid,created,name,state) values('%q','%q','%q','%q')", + sql = switch_mprintf("insert into channels (uuid,created,name,state) values('%q','%q','%q','%q')", switch_event_get_header(event, "unique-id"), switch_event_get_header(event, "event-date-local"), switch_event_get_header(event, "channel-name"), @@ -3413,7 +3413,7 @@ ); break; case SWITCH_EVENT_CODEC: - sql = switch_core_db_mprintf("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", + sql = switch_mprintf("update channels set read_codec='%q',read_rate='%q',write_codec='%q',write_rate='%q' where uuid='%q'", switch_event_get_header(event, "channel-read-codec-name"), switch_event_get_header(event, "channel-read-codec-rate"), switch_event_get_header(event, "channel-write-codec-name"), @@ -3421,7 +3421,7 @@ switch_event_get_header(event, "unique-id")); break; case SWITCH_EVENT_CHANNEL_EXECUTE: - sql = switch_core_db_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", + sql = switch_mprintf("update channels set application='%q',application_data='%q' where uuid='%q'", switch_event_get_header(event, "application"), switch_event_get_header(event, "application-data"), switch_event_get_header(event, "unique-id") @@ -3437,7 +3437,7 @@ case CS_DONE: break; case CS_RING: - sql = switch_core_db_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q'" + sql = switch_mprintf("update channels set state='%s',cid_name='%q',cid_num='%q',ip_addr='%s',dest='%q'" "where uuid='%s'", switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "caller-caller-id-name"), @@ -3448,7 +3448,7 @@ ); break; default: - sql = switch_core_db_mprintf("update channels set state='%s' where uuid='%s'", + sql = switch_mprintf("update channels set state='%s' where uuid='%s'", switch_event_get_header(event, "channel-state"), switch_event_get_header(event, "unique-id") ); @@ -3458,7 +3458,7 @@ } break; case SWITCH_EVENT_CHANNEL_BRIDGE: - sql = switch_core_db_mprintf("insert into calls values ('%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", + sql = switch_mprintf("insert into calls values ('%s','%q','%q','%q','%q','%s','%q','%q','%q','%q','%s')", switch_event_get_header(event, "event-calling-function"), switch_event_get_header(event, "caller-caller-id-name"), switch_event_get_header(event, "caller-caller-id-number"), @@ -3473,15 +3473,15 @@ ); break; case SWITCH_EVENT_CHANNEL_UNBRIDGE: - sql = switch_core_db_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); + sql = switch_mprintf("delete from calls where caller_uuid='%s'", switch_event_get_header(event, "caller-unique-id")); break; case SWITCH_EVENT_SHUTDOWN: - sql = switch_core_db_mprintf("delete from channels;delete from interfaces;delete from calls"); + sql = switch_mprintf("delete from channels;delete from interfaces;delete from calls"); break; case SWITCH_EVENT_LOG: return; case SWITCH_EVENT_MODULE_LOAD: - sql = switch_core_db_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", + sql = switch_mprintf("insert into interfaces (type,name,description,syntax) values('%q','%q','%q','%q')", switch_event_get_header(event, "type"), switch_event_get_header(event, "name"), switch_event_get_header(event, "description"),

1 0

[commit] r3106 - in freeswitch/trunk: libs/libdingaling/src src src/include src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: anthm Date: Thu Oct 19 12:33:54 2006 New Revision: 3106 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: tidy up, note yesterday's propagate_vars was changed to export_vars Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Oct 19 12:33:54 2006 @@ -1698,7 +1698,7 @@ elapsed = (unsigned int)((apr_time_now() - started) / 1000); if (elapsed > 5000 && ! again) { msg = iks_make_s10n (IKS_TYPE_SUBSCRIBE, id, notice); - iks_insert_attrib(pres, "from", from); + iks_insert_attrib(msg, "from", from); apr_queue_push(handle->queue, msg); again++; } Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Thu Oct 19 12:33:54 2006 @@ -1706,6 +1706,7 @@ */ DoxyDefine(char *switch_core_db_mprintf(const char*,...);) #define switch_core_db_mprintf sqlite3_mprintf +#define switch_mprintf sqlite3_mprintf /** * This routine is a variant of the "sprintf()" from the 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 19 12:33:54 2006 @@ -2127,14 +2127,17 @@ if (!strcmp(exten, "_auto_")) { if ((t = ldl_session_get_callee(dlsession))) { if ((them = strdup(t))) { - char *p; + char *a, *b, *p; if ((p = strchr(them, '/'))) { *p = '\0'; } + + if ((a = strchr(them, '+')) && (b = strrchr(them, '+')) && a != b) { + *b = '@'; + } exten = them; } } - } } 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 19 12:33:54 2006 @@ -486,14 +486,14 @@ npassword = np; - if ((input = switch_core_db_mprintf("%s:%q", regstr, uri))) { + if ((input = switch_mprintf("%s:%q", regstr, uri))) { su_md5_init(&ctx); su_md5_strupdate(&ctx, input); su_md5_hexdigest(&ctx, uridigest); su_md5_deinit(&ctx); } - if ((input2 = switch_core_db_mprintf("%q:%q:%q:%q:%q:%q", npassword, nonce, nc, cnonce, qop, uridigest))) { + if ((input2 = switch_mprintf("%q:%q:%q:%q:%q:%q", npassword, nonce, nc, cnonce, qop, uridigest))) { memset(&ctx, 0, sizeof(ctx)); su_md5_init(&ctx); su_md5_strupdate(&ctx, input2); @@ -509,10 +509,10 @@ end: if (input) { - switch_core_db_free(input); + switch_safe_free(input); } if (input2) { - switch_core_db_free(input2); + switch_safe_free(input2); } switch_safe_free(nonce); switch_safe_free(uri); @@ -595,7 +595,7 @@ if (errmsg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s][%s]\n", sql, errmsg); - switch_core_db_free(errmsg); + switch_safe_free(errmsg); errmsg = NULL; } @@ -635,7 +635,7 @@ if (errmsg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s][%s]\n", val, errmsg); - switch_core_db_free(errmsg); + switch_safe_free(errmsg); errmsg = NULL; } @@ -916,7 +916,7 @@ cid_num = cid_num_p; } - if ((tech_pvt->from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", + if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", cid_name, cid_num, tech_pvt->profile->sipip @@ -1014,7 +1014,7 @@ - if ((tech_pvt->from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", + if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", (char *) caller_profile->caller_id_name, (char *) caller_profile->caller_id_number, tech_pvt->profile->sipip @@ -1227,7 +1227,7 @@ } if (tech_pvt->from_str) { - switch_core_db_free(tech_pvt->from_str); + switch_safe_free(tech_pvt->from_str); } switch_set_flag_locked(tech_pvt, TFLAG_BYE); @@ -2230,10 +2230,10 @@ } } else { - to_addr = switch_core_db_mprintf("%s@%s", to_user, to_host); + to_addr = switch_mprintf("%s@%s", to_user, to_host); } - from_addr = switch_core_db_mprintf("%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); + from_addr = switch_mprintf("%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); set_hash_key(hash_key, sizeof(hash_key), sip); if ((tech_pvt = (private_object_t *) switch_core_hash_find(profile->chat_hash, hash_key))) { @@ -2598,7 +2598,7 @@ goto end; } - sql = switch_core_db_mprintf("select passwd from sip_authentication where nonce='%q'", nonce); + sql = switch_mprintf("select passwd from sip_authentication where nonce='%q'", nonce); if(switch_core_db_prepare(db, sql, -1, &stmt, 0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Statement Error!\n"); @@ -2638,7 +2638,7 @@ } if (sql) { - switch_core_db_free(sql); + switch_safe_free(sql); } return ret; @@ -2767,17 +2767,17 @@ char hexdigest[2 * SU_MD5_DIGEST_SIZE + 1]; char *input; - input = switch_core_db_mprintf("%s:%s:%s", from_user, from_host, passwd); + input = switch_mprintf("%s:%s:%s", from_user, from_host, passwd); su_md5_init(&ctx); su_md5_strupdate(&ctx, input); su_md5_hexdigest(&ctx, hexdigest); su_md5_deinit(&ctx); - switch_core_db_free(input); + switch_safe_free(input); switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); - sql = switch_core_db_mprintf("delete from sip_authentication where user='%q'and host='%q';\n" + sql = switch_mprintf("delete from sip_authentication where user='%q'and host='%q';\n" "insert into sip_authentication values('%q','%q','%q','%q', %ld)", from_user, from_host, @@ -2787,7 +2787,7 @@ uuid_str, time(NULL) + 60); - auth_str = switch_core_db_mprintf("Digest realm=\"%q\", nonce=\"%q\",%s algorithm=MD5, qop=\"auth\"", from_host, uuid_str, + auth_str = switch_mprintf("Digest realm=\"%q\", nonce=\"%q\",%s algorithm=MD5, qop=\"auth\"", from_host, uuid_str, stale ? " stale=\"true\"," : ""); @@ -2804,8 +2804,8 @@ } execute_sql(profile->dbname, sql, profile->ireg_mutex); - switch_core_db_free(sql); - switch_core_db_free(auth_str); + switch_safe_free(sql); + switch_safe_free(auth_str); ret = 1; } else { ret = 0; @@ -2820,14 +2820,14 @@ reg: if (!find_reg_url(profile, from_user, from_host, buf, sizeof(buf))) { - sql = switch_core_db_mprintf("insert into sip_registrations values ('%q','%q','%q',%ld)", + sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q',%ld)", from_user, from_host, contact_str, (long) time(NULL) + (long)exptime); } else { - sql = switch_core_db_mprintf("update sip_registrations set contact='%q', expires=%ld where user='%q' and host='%q'", + sql = switch_mprintf("update sip_registrations set contact='%q', expires=%ld where user='%q' and host='%q'", contact_str, (long) time(NULL) + (long)exptime, from_user, @@ -2846,7 +2846,7 @@ if (sql) { execute_sql(profile->dbname, sql, profile->ireg_mutex); - switch_core_db_free(sql); + switch_safe_free(sql); sql = NULL; } @@ -2939,18 +2939,18 @@ } if (contact->m_url->url_params) { - contact_str = switch_core_db_mprintf("sip:%s@%s:%s;%s", + contact_str = switch_mprintf("sip:%s@%s:%s;%s", contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); } else { - contact_str = switch_core_db_mprintf("sip:%s@%s:%s", + contact_str = switch_mprintf("sip:%s@%s:%s", contact->m_url->url_user, contact->m_url->url_host, port); } } if (to) { - to_str = switch_core_db_mprintf("sip:%s@%s", to->a_url->url_user, to->a_url->url_host);//, to->a_url->url_port); + to_str = switch_mprintf("sip:%s@%s", to->a_url->url_user, to->a_url->url_host);//, to->a_url->url_port); } if (to) { @@ -2983,7 +2983,7 @@ exp = (long) time(NULL) + (sip->sip_expires ? sip->sip_expires->ex_delta : 60); - if ((sql = switch_core_db_mprintf("delete from sip_subscriptions where " + if ((sql = switch_mprintf("delete from sip_subscriptions where " "proto='%q' and user='%q' and host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q';\n" "insert into sip_subscriptions values ('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q',%ld)", proto, @@ -3005,7 +3005,7 @@ exp ))) { execute_sql(profile->dbname, sql, profile->ireg_mutex); - switch_core_db_free(sql); + switch_safe_free(sql); } @@ -3074,7 +3074,7 @@ channel_a = switch_core_session_get_channel(session); - if (!sip->sip_cseq || !(etmp = switch_core_db_mprintf("refer;id=%u", sip->sip_cseq->cs_seq))) { + if (!sip->sip_cseq || !(etmp = switch_mprintf("refer;id=%u", sip->sip_cseq->cs_seq))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); goto done; } @@ -3093,7 +3093,7 @@ if ((refer_to = sip->sip_refer_to)) { if (profile->pflags & PFLAG_FULL_ID) { - exten = switch_core_db_mprintf("%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); + exten = switch_mprintf("%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); } else { exten = (char *) refer_to->r_url->url_user; } @@ -3200,7 +3200,7 @@ channel = switch_core_session_get_channel(asession); - exten = switch_core_db_mprintf("sofia/%s/%s@%s:%s", + exten = switch_mprintf("sofia/%s/%s@%s:%s", profile->name, (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host, @@ -3279,7 +3279,7 @@ SIPTAG_EVENT_STR(etmp), TAG_END()); } else { - exten = switch_core_db_mprintf("sip:%s@%s:%s", + exten = switch_mprintf("sip:%s@%s:%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host, refer_to->r_url->url_port); @@ -3301,10 +3301,10 @@ done: if (exten && strchr(exten, '@')) { - switch_core_db_free(exten); + switch_safe_free(exten); } if (etmp) { - switch_core_db_free(etmp); + switch_safe_free(etmp); } } @@ -3423,10 +3423,10 @@ sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; - char *username, *to_username; + char *username, *to_username = NULL; char *url_user = (char *) from->a_url->url_user; char *to_user, *to_host; - + char *a,*b; if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); @@ -3474,16 +3474,22 @@ displayname = url_user; } - if (!(username = switch_core_db_mprintf("%s@%s", url_user, (char *) from->a_url->url_host))) { + if (!(username = switch_mprintf("%s@%s", url_user, (char *) from->a_url->url_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); return; } - if (!(to_username = switch_core_db_mprintf("%s@%s", (char *) to_user, (char *) to_host))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_core_db_free(username); - return; + + if (profile->pflags & PFLAG_FULL_ID) { + if (!(to_username = switch_mprintf("%s@%s", (char *) to_user, (char *) to_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_safe_free(username); + return; + } } + if ((a = strchr(to_user, '+')) && (b = strrchr(to_user, '+')) && a != b) { + *b = '@'; + } attach_private(session, profile, tech_pvt, username); @@ -3504,11 +3510,10 @@ (char *)modname, (profile->context && !strcasecmp(profile->context, "_domain_")) ? (char *) from->a_url->url_host : profile->context, - (profile->pflags & PFLAG_FULL_ID) ? - to_username : (char *) to_user + to_username ? to_username : (char *) to_user )) != 0) { - + for (un=sip->sip_unknown; un; un=un->un_next) { // Loop thru Known Headers Here so we can do something with them // John Doe <sip:+19018577141@209.247.16.1>;party=calling;screen=yes;privacy=off @@ -3559,8 +3564,8 @@ } switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); - switch_core_db_free(username); - switch_core_db_free(to_username); + switch_safe_free(username); + switch_safe_free(to_username); } switch_set_flag_locked(tech_pvt, TFLAG_INBOUND); @@ -4362,13 +4367,13 @@ if (!find_reg_url(profile, from_user, from_host, buf, sizeof(buf))) { - sql = switch_core_db_mprintf("insert into sip_registrations values ('%q','%q','%q',%ld)", + sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q',%ld)", from_user, from_host, contact_str, expires); } else { - sql = switch_core_db_mprintf("update sip_registrations set contact='%q', expires=%ld where user='%q' and host='%q'", + sql = switch_mprintf("update sip_registrations set contact='%q', expires=%ld where user='%q' and host='%q'", contact_str, expires, from_user, @@ -4378,7 +4383,7 @@ if (sql) { execute_sql(profile->dbname, sql, profile->ireg_mutex); - switch_core_db_free(sql); + switch_safe_free(sql); sql = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Propagating registration for %s@%s->%s\n", from_user, from_host, contact_str); @@ -4411,7 +4416,7 @@ if (in) { - note = switch_core_db_mprintf("<dm:note>%s</dm:note>", msg); + note = switch_mprintf("<dm:note>%s</dm:note>", msg); doing="available"; open = "open"; } else { @@ -4422,13 +4427,13 @@ if (strcasecmp(proto, "sip")) { /*encapsulate*/ - id = switch_core_db_mprintf("sip:%s+%s+%s@%s", proto, sub_to_user, sub_to_host, host); + id = switch_mprintf("sip:%s+%s+%s@%s", proto, sub_to_user, sub_to_host, host); } else { - id = switch_core_db_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); } - to = switch_core_db_mprintf("sip:%s@%s", user, host); - pl = switch_core_db_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" + to = switch_mprintf("sip:%s@%s", user, host); + pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model'\r\n" "xmlns:rpid='urn:ietf:params:xml:ns:pidf:rpid'\r\n" @@ -4503,7 +4508,7 @@ if (!p) { p = from; } - from_pp = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", p, from_p, host); + from_pp = switch_mprintf("\"%s\" <sip:%s@%s>", p, from_p, host); from = from_pp; } else { from = hint; @@ -4552,7 +4557,7 @@ if (event->event_id == SWITCH_EVENT_ROSTER) { - sql = switch_core_db_mprintf("select 1,'%q',* from sip_subscriptions where event='presence'", status ? status : "Available"); + sql = switch_mprintf("select 1,'%q',* from sip_subscriptions where event='presence'", status ? status : "Available"); for (hi = switch_hash_first(apr_hash_pool_get(globals.profile_hash), globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -4615,14 +4620,14 @@ status = "Available"; } - sql = switch_core_db_mprintf("select 1,'%q',* from sip_subscriptions where event='%q' and sub_to_user='%q' and sub_to_host='%q'", + sql = switch_mprintf("select 1,'%q',* from sip_subscriptions where event='%q' and sub_to_user='%q' and sub_to_host='%q'", status , event_type, user, host); break; case SWITCH_EVENT_PRESENCE_OUT: if (!status) { status = "Unavailable"; } - sql = switch_core_db_mprintf("select 0,'%q',* from sip_subscriptions where event='%q' and sub_to_user='%q' and sub_to_host='%q'", + sql = switch_mprintf("select 0,'%q',* from sip_subscriptions where event='%q' and sub_to_user='%q' and sub_to_host='%q'", status, event_type, user, host); break; default: Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 19 12:33:54 2006 @@ -1375,10 +1375,10 @@ } if (channel && peer_channel) { - char *propagate_vars; + char *export_vars; /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ - if ((propagate_vars = switch_channel_get_variable(channel, "propagate_vars"))) { - char *cptmp = switch_core_session_strdup(session, propagate_vars); + if ((export_vars = switch_channel_get_variable(channel, "export_vars"))) { + char *cptmp = switch_core_session_strdup(session, export_vars); int argc; char *argv[256];

1 0

[commit] r3105 - freeswitch/trunk/libs/codec/g726
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mikej Date: Thu Oct 19 12:10:46 2006 New Revision: 3105 Modified: freeswitch/trunk/libs/codec/g726/libg726.vcproj Log: tweak up another warning level. Modified: freeswitch/trunk/libs/codec/g726/libg726.vcproj ============================================================================== --- freeswitch/trunk/libs/codec/g726/libg726.vcproj (original) +++ freeswitch/trunk/libs/codec/g726/libg726.vcproj Thu Oct 19 12:10:46 2006 @@ -46,6 +46,7 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> @@ -106,6 +107,7 @@ RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" />

1 0

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

19 Oct '06

Author: mikej Date: Thu Oct 19 12:10:24 2006 New Revision: 3104 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add Alert-Info: Thanks Ken. 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 19 12:10:24 2006 @@ -892,7 +892,9 @@ static void do_invite(switch_core_session_t *session) { - char rpid[1024]; + char rpid[1024] = { 0 }; + char alert_info[1024] = { 0 }; + char *alertbuf; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -921,7 +923,10 @@ ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); - + + if ((alertbuf = switch_channel_get_variable(channel, "alert_info"))) { + snprintf(alert_info, sizeof(alert_info) - 1, "Alert-Info: %s", alertbuf); + } tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); @@ -976,6 +981,7 @@ nua_invite(tech_pvt->nh, TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), + TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),

1 0

[commit] r3103 - in freeswitch/branches/mishehu/src: . mod mod/event_handlers mod/event_handlers/mod_cdr
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mishehu Date: Thu Oct 19 11:38:42 2006 New Revision: 3103 Added: freeswitch/branches/mishehu/src/ freeswitch/branches/mishehu/src/mod/ freeswitch/branches/mishehu/src/mod/event_handlers/ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.mysql freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.odbc freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h Log: We're going to try just keeping my specific code in this branch. Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/Makefile Thu Oct 19 11:38:42 2006 @@ -0,0 +1,24 @@ + +CFLAGS += $(shell mysql_config --include) +LDFLAGS += $(shell mysql_config --libs) + +CPPCC = g++ +OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o xmlcdr.o + +all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp + $(CPPCC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o + $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + + +%.o: %.cpp + $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $< + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/README Thu Oct 19 11:38:42 2006 @@ -0,0 +1,114 @@ +/* +* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module +* +* Copyright 2006, Author: Yossi Neiman, president of Cartis Solutions, Inc. +* <freeswitch AT cartissolutions.com> +* +* Description: We don't need any documentation, do we? +* +* Version: MPL 1.1 +* The contents of this file are subject to the Mozilla Public License Version +* 1.1 (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* http://www.mozilla.org/MPL/ +* +* Software distributed under the License is distributed on an "AS IS" basis, +* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +* for the specific language governing rights and limitations under the +* License +* +* The Core API is the FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application by +* Anthony Minnesale II <anthmct(a)yahoo.com> +* +* README +* +*/ + +mod_cdr has been written in C++ using class inheritence and virtual methods, and registers all classes that +have been built in at load time. It then calls up the connect() method on each particular object and if successful at initializing the object, it adds it to a data structure that contains 1 instance of every sucessfully configured and connected object. This means that at any time after loading, it will only try to create objects that are functional, skipping any that are built in but are not desired for use at the current time. + +In order to use mod_cdr, you must uncomment this line in the freeswitch.xml configuration file located in the conf directory: <load module="mod_cdr"/> in the <modules> section. Then below this section, you need to uncomment this section <configuration name="mod_cdr.conf" description="CDR Configuration"> and input the per class configurations. All class specific configurations go within this parent section as a subsection. + +There are currently the following types of loggers: + +Class: CsvCDR, located in csvcdr.h and csvcdr.cpp +Description: This is the standard CSV output class. It has a default list of CDR elements that it always + logs, and the user can specify channel variables to be logged in a fixed order (chanvars_fixed) starting after the last default value to be logged. Additionally, the user can specify additional channel variables to be logged after the fixed order channel variables as key=value pairs. +Configuration: Section name: <csvcdr> + <param name="path" value=""/> value is the location to put the files (required) <param name="size_limit" value=""/> value is the size limit of the output file, default value of 10MB (optional) + <param name="chanvars_fixed" value=""/> value is a comma separated list of fixed channel variables to log. This cannot be a wildcard (*). (optional) + <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. It can be a wildcard (*). (optional) + <param name="repeat_fixed_in_supp" value=""/> value is a 0 for no, 1 for yes, and is for the case that you might want any fixed channel variables to be repeated in the supplemental list. + +Class: PddCDR, located in pddcdr.h and pddcdr.cpp +Description: This is the Perl Data Dumper output class. It writes each record to an individual text file + containing all the information. It does not distinguish between fixed and supplemental channel variables. If you are running freeswitch in a high volume environment, it is important to note that these individual files are small, often times between 750 and 1500 bytes. It is therefore recommended to use a partition with small cluster sizes or (on systems supporting) on reiserfs or reiser4 filesystems which are both excellent handlers of large numbers of small files. +Configuration: Section name: <pddcdr> + <param name="path" value=""/> value is the path where you want the output files (required) + <param name="chanvars" value=""/> value is a comma separated list of channel variables to log. It can accept a wildcard (*) (optional) + +Class: MysqlCDR, located in mysqlcdr.h and mysqlcdr.cpp +Description: This class logs the call detail record to a MySQL 4.1.x or greater database using prepared + statements. This class is a little more complex than the prior two in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the callid of the call. Recommended to use at least one other logger in conjuction with this one just to be on the safe side, as failover handling of errors to write to the db are not yet implemented, and therefore there is a risk of data loss if the database connection is lost entirely (it will be limited to only those records created at the time of the loss of connection) or some other fatal error is encountered. +Configuration: Section: <mysqlcdr> + <param name="hostname" value=""/> value is the hostname or IP of the MySQL server (required) + <param name="username" value=""/> value is the username to connect to the MySQL server with (required) + <param name="password" value=""/> value is the password to use to authenticate to the MySQL server with (required) + <param name="dbname" value=""/> value is the name of the database to connect to (required) + <param name="chanvars_fixed" value=""/> Is a comma separated list of key=type pairs. Types are x for decimal, s for string (varchar), d for double, i for integer, t for tiny. If no type is provided, it defaults that column to string (varchar). It cannot accept wildcards (*). (optional) + <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. Can be a wildcard (*) (optional) + <param name="chanvars_supp_repeat_fixed" value=""/> value is 0 for no, 1 for yes, and determines whether or not to repeat any of the fixed channel variables as key / value pairs in the chanvars table. + +Class: OdbcCDR, located in odbccdr.h and odbccdr.cpp + This class logs the call detail record to an ODBC database using prepared + statements. This class is similar to MysqlCDR in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the myuuid of the call. Recommended to use at least one other logger in conjuction with this one just to be on the safe side, as failover handling of errors to write to the db are not yet implemented, and therefore there is a risk of data loss if the database connection is lost entirely (it will be limited to only those records created at the time of the loss of connection) or some other fatal error is encountered. Additionally, since there is no uniform method to handling columns of type sequence/autoincrement/autonumber in the rdbms world, it should be noted that each row in the chanvars (supplemental channel variables) table will cost 36 bytes for the myuuid to be posted to it instead of 8 bytes for a bigint as in MysqlCDR. +Configuration: Section <odbccdr> + <param name="dsn" value=""/> - Not yet implemented, but meant for future use in ease of config + <param name="hostname" value=""/> - The hostname or IP of the backend server + <param name="username" value=""/> - The username used to authenticate to the backend server + <param name="password" value=""/> - The password used to authenticate to the backend server + <param name="dbname" value=""/> - The database to use for logging + <param name="main_db_table" value=""/> - Optional: the name of the main logging table (defaults to freeswitchcdr) + <param name="supp_chanvars_db_table" value=""/> - Optional: the name of the supplemental chanvars table (defaults to chanvars) + <param name="chanvars_fixed" value=""/> Is a comma separated list of key=type pairs. Types are x for decimal, s for string (varchar), d for double, i for integer, t for tiny. If no type is provided, it defaults that column to string (varchar). It cannot accept wildcards (*). (optional) + <param name="chanvars_supp" value=""/> value is a comma separated list of supplemental channel variables to log. Can be a wildcard (*) (optional) + <param name="chanvars_supp_repeat_fixed" value=""/> value is 0 for no, 1 for yes, and determines whether or not to repeat any of the fixed channel variables as key / value pairs in the chanvars table. + +FAQ: + +Q: Why C++? +A: Why not? It works well in this design. + +Q: Why is there a distinction between fixed and supplemental channel variables? +A: There is a distinction so that a level of uniformity can be maintain on those loggers that require uniformity. For example, if you expect that channel variable FOO will always been at a specific location on a CSV row, then it is required that it be a fixed channel variable. The fixed means that it is a fixed position, and needs to be logged even if it is blank. Supplemental channel variables, on the other hand, are more dynamic, and will only log those channel variables that actually exist on that given leg of the call. That means that if you supply a wildcard, it will simply iterate all the channel variables. If you do not want to repeat the fixed channel variables in the supplemental channel variables, it will then remove the fixed channel variables from the data structure holding the supplemental channel variables even before the process_record() method is called up. + +Q: What would an example configuration look like? +A: Here is an excerpt from the freeswitch XML configuration file: + +Q: What happened to the ani2 field? +A: Oops, you caught us. The real name for is it aniii. You will need to update any database schemas or external handlers for this change. + + <configuration name="mod_cdr.conf" description="CDR Configuration"> + <pddcdr> + <param name="path" value="/work/temp/pddcdr"/> + <param name="chanvars" value="username,accountcode"/> + <param name="chanvars_fixed" value="*"/> + </pddcdr> + <csvcdr> + <param name="path" value="/work/temp/csvcdr"/> + <param name="size_limit" value="25"/> + <param name="chanvars_fixed" value="username"/> + <param name="chanvars_supp" value="*"/> + <param name="repeat_fixed_in_supp" value="0"/> + </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_fixed" value="username=s,The_Kow=t"/> +  + <param name="chanvars_supp" value="*"/> + <param name="chanvars_supp_repeat_fixed" value="0"/> + </mysqlcdr> + </configuration> Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,360 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the BaseCDR class that all other CDR classes inherit from. + * It handles the bulk of the processing of data from the switch_channel_t objects. + * + * basecdr.cpp + * + */ + +#include "basecdr.h" +#include <iostream> +#include <string> +#include <cstring> +#include <switch.h> + +BaseCDR::BaseCDR() +{ + callstartdate = 0; + callanswerdate = 0; + callenddate = 0; + strncpy(clid,"Unknown",7); + strncpy(src,"-1",2); + strncpy(dst,"-1",2); + strncpy(srcchannel,"-1",2); + strncpy(dstchannel,"-1",2); + strncpy(lastapp,"-1",2); + billusec = 0; + disposition=0; + amaflags = 0; + errorstate = 0; +} + +BaseCDR::BaseCDR(switch_mod_cdr_newchannel_t *newchannel) +{ + if(newchannel != 0) + { + errorstate = 0; + memset(clid,0,80); + memset(dialplan,0,80); + memset(myuuid,0,37); + memset(destuuid,0,37); + memset(dialplan,0,80); + memset(&hangupcause,0,sizeof(hangupcause)); + hangupcause_text = 0; + memset(src,0,80); + memset(dst,0,80); + memset(srcchannel,0,80); + memset(dstchannel,0,80); + memset(network_addr,0,40); + memset(ani,0,80); + memset(aniii,0,80); + memset(lastapp,0,80); + memset(lastdata,0,255); + + coresession = newchannel->session; + callstartdate= newchannel->timetable->created; + callanswerdate = newchannel->timetable->answered; + callenddate = newchannel->timetable->hungup; + + if (newchannel->callerprofile) { + if(newchannel->callerprofile->caller_id_name != 0) + { + strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); + strncat(clid," <",2); + if(newchannel->callerprofile->caller_id_number != 0 ) + strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); + strncat(clid,">",1); + } + + // Get the ANI information if it's set + if(newchannel->callerprofile->ani != 0) + strncpy(ani,newchannel->callerprofile->ani,strlen(newchannel->callerprofile->ani)); + if(newchannel->callerprofile->aniii != 0) + strncpy(aniii,newchannel->callerprofile->aniii,strlen(newchannel->callerprofile->aniii)); + + if(newchannel->callerprofile->dialplan != 0) + strncpy(dialplan,newchannel->callerprofile->dialplan,strlen(newchannel->callerprofile->dialplan)); + + if(newchannel->callerprofile->network_addr != 0) + strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); + } + + originated = newchannel->originate; + + if(newchannel->originateprofile && newchannel->originateprofile->uuid != 0) + strncpy(destuuid,newchannel->originateprofile->uuid,strlen(newchannel->originateprofile->uuid)); + + // We still need to check if this is originated or not + if(originated == 0) + { + if (newchannel->callerprofile) { + if(newchannel->callerprofile->destination_number != 0) + strncpy(src,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + if(newchannel->callerprofile->caller_id_number != 0) + strncpy(dst,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); + } + if(newchannel->originateprofile && newchannel->originateprofile->chan_name != 0) + strncpy(dstchannel,newchannel->originateprofile->chan_name,strlen(newchannel->originateprofile->chan_name)); + } + else + { + if (newchannel->callerprofile) { + if(newchannel->callerprofile->caller_id_number != 0) + strncpy(src,newchannel->callerprofile->caller_id_number,strlen(newchannel->callerprofile->caller_id_number)); + if(newchannel->callerprofile->destination_number != 0) + strncpy(dst,newchannel->callerprofile->destination_number,strlen(newchannel->callerprofile->destination_number)); + } + if(newchannel->originateprofile && newchannel->originateprofile->chan_name != 0) + strncpy(dstchannel,newchannel->originateprofile->chan_name,strlen(newchannel->originateprofile->chan_name)); + } + + strncpy(myuuid,newchannel->callerprofile->uuid,strlen(newchannel->callerprofile->uuid)); + strncpy(srcchannel,newchannel->callerprofile->chan_name,strlen(newchannel->callerprofile->chan_name)); + + if(switch_channel_test_flag(newchannel->channel,CF_ANSWERED)) + { + disposition=1; + billusec = newchannel->timetable->hungup - newchannel->timetable->answered; + } + else + { + disposition=0; + billusec = 0; + } + + // What was the hangup cause? + hangupcause = switch_channel_get_cause(newchannel->channel); + hangupcause_text = switch_channel_cause2str(hangupcause); + + if(newchannel->callerextension != 0) + if(newchannel->callerextension->last_application != 0) + { + if(newchannel->callerextension->last_application->application_name != 0) + strncpy(lastapp,newchannel->callerextension->last_application->application_name,strlen(newchannel->callerextension->last_application->application_name)); + if(newchannel->callerextension->last_application->application_data != 0) + strncpy(lastdata,newchannel->callerextension->last_application->application_data,strlen(newchannel->callerextension->last_application->application_data)); + } + + amaflags=0; + } +} + +BaseCDR::~BaseCDR() +{ + +} + +/* bool fixed is for checking if this is the fixed or supplemental list */ +void BaseCDR::parse_channel_variables_xconfig(std::string& unparsed,std::list<std::string>& chanvarlist,bool fixed) +{ + std::string tempstring; + for(std::string::size_type i = 0, j = 0; j != std::string::npos; ) + { + j = unparsed.find(',',i); + if(j > 0) + { + tempstring = unparsed.substr(i,(j-i)); + chanvarlist.push_back(tempstring); + i =j+1; + } + else + { + tempstring = unparsed.substr(i); + chanvarlist.push_back(tempstring); + } + } + + // Now we need to clean up in case somebody put in a '*' in the chanvars fixed list + std::list<std::string>::iterator iBeg,iItr,iEnd; + iBeg = chanvarlist.begin(); + iEnd = chanvarlist.end(); + bool exitcode = 1; + for(iItr = chanvarlist.begin(); iItr != iEnd && exitcode ; ) + { + if(iItr->find('*',0) != std::string::npos) + { + if(fixed) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Wildcards are not allow in the fixed chanvars list. Item removed.\n"); + iItr = chanvarlist.erase(iItr); + } + else + { + if(chanvarlist.size() > 1) + chanvarlist.clear(); + std::string all = "*"; + chanvarlist.push_back(all); + exitcode = 0; + } + } + else + iItr++; + } +} + +void BaseCDR::parse_channel_variables_xconfig(std::string& unparsed,std::list<std::string>& chanvarlist,std::vector<switch_mod_cdr_sql_types_t>& chanvars_fixed_types) +{ + bool fixed = 1; + std::string tempstring, tempstring2; + switch_mod_cdr_sql_types_t sql_type; + parse_channel_variables_xconfig(unparsed,chanvarlist,fixed); + std::list<std::string> tempchanvarlist; // = chanvarlist; + std::list<std::string>::iterator iEnd, iItr; + + for(iItr = chanvarlist.begin(), iEnd = chanvarlist.end() ; iItr != iEnd ; iItr++) + { + sql_type = CDR_STRING; + std::string::size_type i = 0, j = 0; + j = iItr->find('=',i); + if(j > 0 ) + { + tempstring = iItr->substr(i,(j-i)); + i =j+1; + tempstring2 = iItr->substr(i); + if(tempstring2.size() == 1) + { + switch(tempstring2[0]) + { + case 'I': + case 'i': + sql_type = CDR_INTEGER; + break; + case 'S': + case 's': + sql_type = CDR_STRING; + break; + case 'D': + case 'd': + sql_type = CDR_DOUBLE; + break; + case 'T': + case 't': + sql_type = CDR_TINY; + break; + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n",tempstring2.c_str(),tempstring.c_str()); + sql_type = CDR_STRING; + } + } + else + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Valid fixed channel variable types are x (decimal), d (double), i (integer), t (tiny), s (string). You tried to give a type of %s to chanvar %s.\nReverting this chanvar type to a string type.\n",tempstring2.c_str(),tempstring.c_str()); + sql_type = CDR_STRING; + } + } + else + { + switch_console_printf(SWITCH_CHANNEL_LOG,"No parameter set, for channel variable %s, using default type of string.\n",iItr->c_str()); + sql_type = CDR_STRING; + tempstring = *iItr; + } + + tempchanvarlist.push_back(tempstring); + chanvars_fixed_types.push_back(sql_type); + } + + chanvarlist.clear(); + chanvarlist = tempchanvarlist; +} + +// This is for processing the fixed channel variables +void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist,switch_channel_t *channel) +{ + std::list<std::string>::const_iterator iItr,iEnd; + iEnd = stringlist.end(); + + for(iItr = stringlist.begin(); iItr != iEnd; iItr++) + { + std::vector<char> tempstringvector(iItr->begin(), iItr->end()); + tempstringvector.push_back('\0'); + char* tempstring= &tempstringvector[0]; + + char *tempvariable; + tempvariable = switch_channel_get_variable(channel,tempstring); + + + std::pair<std::string,std::string> temppair; + temppair.first = *iItr; + + if(tempvariable != 0) + temppair.second = tempvariable; + + chanvars_fixed.push_back(temppair); + } +} + +// This one is for processing of supplemental chanvars +void BaseCDR::process_channel_variables(const std::list<std::string>& stringlist, const std::list<std::string>& fixedlist, switch_channel_t *channel,bool repeat) +{ + if(stringlist.front() == "*") + { + switch_hash_index_t *hi; + void *val; + const void *var; + switch_memory_pool_t *sessionpool; + sessionpool = switch_core_session_get_pool(coresession); + for (hi = switch_channel_variable_first(channel,sessionpool); hi; hi = switch_hash_next(hi)) + { + switch_hash_this(hi, &var, 0, &val); + std::string tempstring_first, tempstring_second; + tempstring_first = (char *) var; + tempstring_second = (char *) val; + chanvars_supp[tempstring_first] = tempstring_second; + } + } + else + { + std::list<std::string>::const_iterator iItr,iEnd; + iEnd = stringlist.end(); + + for(iItr = stringlist.begin(); iItr != iEnd; iItr++) + { + std::vector<char> tempstringvector(iItr->begin(), iItr->end()); + tempstringvector.push_back('\0'); + char* tempstring= &tempstringvector[0]; + + char *tempvariable; + tempvariable = switch_channel_get_variable(channel,tempstring); + if(tempvariable != 0) + chanvars_supp[*iItr] = tempvariable; + } + } + + if(!repeat) + { + std::map<std::string,std::string>::iterator MapItr; + std::list<std::string>::const_iterator iItr,iEnd; + for(iItr = fixedlist.begin(), iEnd = fixedlist.end(); iItr != iEnd; iItr++) + { + MapItr = chanvars_supp.find(*iItr); + if(MapItr != chanvars_supp.end() ) + chanvars_supp.erase(MapItr); + } + } +} Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/basecdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,107 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This header describes the switch_mod_cdr_newchannel_t struct, the BaseCDR base class that all + * CDR loggers will inherit from, and the switch_mod_cdr_sql_types_t enum for use with the SQL type loggers + * (i.e. MySQL). This is part of the mod_cdr module for Freeswitch by Anthony Minnesale and friends. + * + * basecdr.h + * + */ + +#ifndef BASECDR +#define BASECDR + +#ifdef __cplusplus +#include <vector> +#include <list> +#include <vector> +#include <map> +#include <switch.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + +struct switch_mod_cdr_newchannel_t +{ + switch_core_session_t *session; + switch_channel_t *channel; + switch_channel_timetable_t *timetable; + switch_caller_extension_t *callerextension; + switch_caller_profile_t *callerprofile; + switch_caller_profile_t *originateprofile; + bool originate; +}; + +enum switch_mod_cdr_sql_types_t { CDR_INTEGER,CDR_STRING,CDR_DECIMAL,CDR_DOUBLE,CDR_TINY }; + +class BaseCDR { + public: + BaseCDR(); + virtual ~BaseCDR(); + BaseCDR(switch_mod_cdr_newchannel_t *newchannel); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) = 0; + virtual void disconnect() = 0; + virtual bool process_record() = 0; + virtual bool is_activated() = 0; + virtual void tempdump_record() = 0; + virtual void reread_tempdumped_records() = 0; + protected: + void parse_channel_variables_xconfig(std::string& unparsed,std::list<std::string>& chanvarslist,bool fixed); + void parse_channel_variables_xconfig(std::string& unparsed,std::list<std::string>& chanvarslist,std::vector<switch_mod_cdr_sql_types_t>& chanvars_fixed_types); // Typically used for SQL types + void process_channel_variables(const std::list<std::string>& stringlist,const std::list<std::string>& fixedlist,switch_channel_t *channel,bool repeat = 1); //This is used for supplemental chanvars + void process_channel_variables(const std::list<std::string>& stringlist,switch_channel_t *channel); // This is used for fixed chanvars + switch_time_t callstartdate; + switch_time_t callanswerdate; + switch_time_t callenddate; + switch_call_cause_t hangupcause; + char *hangupcause_text; + char clid[80]; + bool originated; // Did they originate this call? + char dialplan[80]; + char myuuid[37]; // 36 + 1 to hold \0 + char destuuid[37]; + char src[80]; + char dst[80]; + char srcchannel[80]; + char dstchannel[80]; + char ani[80]; + char aniii[80]; + char network_addr[40]; + char lastapp[80]; + char lastdata[255]; + switch_time_t billusec; // Yes, you heard me, we're measuring in microseconds + int disposition; // Currently 0 = Busy/Unanswered, 1 = Answered + int amaflags; + switch_core_session_t *coresession; + std::list<std::pair<std::string,std::string> > chanvars_fixed; + std::map<std::string,std::string> chanvars_supp; + bool errorstate; // True if there is an error writing the log +}; + +#endif +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,81 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source describes the BaseRegistry and BaseRegistration classes that implement + * the factory routine with the aid of the templated base_factory() function. + * + * baseregistry.cpp + * + */ + +#include "baseregistry.h" + +BaseRegistry& BaseRegistry::get() +{ + static BaseRegistry instance; + return instance; +} + +void BaseRegistry::add(basecdr_creator creator) +{ + m_bases.push_back(creator); +} + +BaseRegistry::iterator BaseRegistry::begin() +{ + return m_bases.begin(); +} + +BaseRegistry::iterator BaseRegistry::end() +{ + return m_bases.end(); +} + +void BaseRegistry::reset_active() +{ + active_bases.clear(); +} + +void BaseRegistry::add_active(iterator tempobject) +{ + active_bases.push_back(*tempobject); +} + +BaseRegistry::iterator BaseRegistry::active_begin() +{ + return active_bases.begin(); +} + +BaseRegistry::iterator BaseRegistry::active_end() +{ + return active_bases.end(); +} + +BaseRegistration::BaseRegistration(basecdr_creator creator) +{ + BaseRegistry::get().add(creator); +} Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/baseregistry.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,78 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: BaseRegistry and BaseRegistration classes and AUTO_REGISTER_BASECDR macro provided in part by David + * Terrell from his blog posting http://meat.net/2006/03/cpp-runtime-class-registration/ Much thanks to him + * for his help. + * + * baseregistry.h + * + */ + +#include "basecdr.h" +#include <iostream> + +#ifndef BASECDRREGISTRY +#define BASECDRREGISTRY + +#ifdef __cplusplus +#include <vector> + +template<class T> BaseCDR* basecdr_factory(switch_mod_cdr_newchannel_t *newchannel) +{ + return new T(newchannel); +} + +typedef BaseCDR* (*basecdr_creator)(switch_mod_cdr_newchannel_t *newchannel); + +class BaseRegistry +{ + private: + std::vector<basecdr_creator> m_bases; // Stores all modules + std::vector<basecdr_creator> active_bases; // Stores only active modules + public: + typedef std::vector<basecdr_creator>::iterator iterator; + static BaseRegistry& get(); + void add(basecdr_creator); + void reset_active(); // Clears the active vector for reloading of configuration. + void add_active(iterator); + iterator begin(); + iterator end(); + iterator active_begin(); + iterator active_end(); +}; + +class BaseRegistration +{ + public: + BaseRegistration(basecdr_creator); +}; + +#define AUTO_REGISTER_BASECDR(basecdr) BaseRegistration _basecdr_registration_ ## basecdr(&basecdr_factory<basecdr>); + +#endif // ifdef __cplusplus +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,168 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the CDRContainer singleton object used by mod_cdr to control + * the creation, processing, and destruction of various CDR logger objects. + * + * cdrcontainer.cpp + * + */ + +#include "cdrcontainer.h" +#include "baseregistry.h" + +CDRContainer::CDRContainer() +{ + +} + +CDRContainer::CDRContainer(switch_memory_pool_t *module_pool) +{ + // Create the APR threadsafe queue, though I don't know if this is the current memory pool. + switch_queue_create(&cdrqueue,5224288, module_pool); + + char *configfile = "mod_cdr.conf"; + switch_xml_t cfg, xml, settings, param; + + switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; + newchannel = 0; + + if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) + switch_console_printf(SWITCH_CHANNEL_LOG,"open of %s failed\n", configfile); + else + { + BaseRegistry& registry(BaseRegistry::get()); + for(BaseRegistry::iterator it = registry.begin(); it != registry.end(); ++it) + { + basecdr_creator func = *it; + BaseCDR* _ptr = func(newchannel); + std::auto_ptr<BaseCDR> ptr(_ptr); + ptr->connect(cfg,xml,settings,param); + + if(ptr->is_activated()) + registry.add_active(it); + } + } + + switch_xml_free(xml); +} + +CDRContainer::~CDRContainer() +{ + if(switch_queue_size(cdrqueue) > 0) + process_records(); + + switch_mod_cdr_newchannel_t *newchannel; //= new switch_mod_cdr_newchannel_t; + newchannel = 0; + + BaseRegistry& registry(BaseRegistry::get()); + for(BaseRegistry::iterator it = registry.active_begin(); it != registry.active_end(); ++it) + { + basecdr_creator func = *it; + BaseCDR* _ptr = func(newchannel); + std::auto_ptr<BaseCDR> ptr(_ptr); + ptr->disconnect(); + } + + switch_console_printf(SWITCH_CHANNEL_LOG,"mod_cdr shutdown gracefully."); +} + +void CDRContainer::add_cdr(switch_core_session_t *session) +{ + switch_mod_cdr_newchannel_t *newchannel = new switch_mod_cdr_newchannel_t; + memset(newchannel,0,sizeof(*newchannel)); + + newchannel->channel = switch_core_session_get_channel(session); + assert(newchannel->channel != 0); + + newchannel->session = session; + newchannel->timetable = switch_channel_get_timetable(newchannel->channel); + newchannel->callerextension = switch_channel_get_caller_extension(newchannel->channel); + newchannel->callerprofile = switch_channel_get_caller_profile(newchannel->channel); + newchannel->originateprofile = switch_channel_get_originator_caller_profile(newchannel->channel); + + BaseRegistry& registry(BaseRegistry::get()); + for(BaseRegistry::iterator it = registry.active_begin(); it != registry.active_end(); ++it) + { + /* + First time it might be originator profile, or originatee. Second and + after is always going to be originatee profile. + */ + + basecdr_creator func = *it; + + if(newchannel->originateprofile != 0 ) + { + BaseCDR* newloggerobject = func(newchannel); + switch_console_printf(SWITCH_CHANNEL_LOG,"Adding a new logger object to the queue.\n"); + switch_queue_push(cdrqueue,newloggerobject); + + if(newchannel->timetable->next != 0) + { + newchannel->originateprofile = switch_channel_get_originatee_caller_profile(newchannel->channel); + newchannel->originate = 1; + } + } + else + { + newchannel->originateprofile = switch_channel_get_originatee_caller_profile(newchannel->channel); + if(newchannel->originateprofile != 0) + { + newchannel->originate = 1; + + BaseCDR* newloggerobject = func(newchannel); + switch_console_printf(SWITCH_CHANNEL_LOG,"Adding a new logger object to the queue.\n"); + switch_queue_push(cdrqueue,newloggerobject); + } + } + + while (newchannel->timetable->next != 0 && newchannel->callerextension->next != 0 && newchannel->callerprofile->next != 0 && newchannel->originateprofile->next != 0 ) + { + newchannel->timetable = newchannel->timetable->next; + newchannel->callerprofile = newchannel->callerprofile->next; + newchannel->callerextension = newchannel->callerextension->next; + newchannel->originateprofile = newchannel->originateprofile->next; + + BaseCDR* newloggerobject = func(newchannel); + switch_console_printf(SWITCH_CHANNEL_LOG,"Adding a new logger object to the queue.\n"); + switch_queue_push(cdrqueue,newloggerobject); + } + } + + delete newchannel; +} + +void CDRContainer::process_records() +{ + BaseCDR *tempnewloggerobject = 0, *newloggerobject = 0; + while(switch_queue_pop(cdrqueue,reinterpret_cast< void** > (&tempnewloggerobject))== SWITCH_STATUS_SUCCESS) + { + newloggerobject = tempnewloggerobject; + newloggerobject->process_record(); + delete newloggerobject; + } +} Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,71 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the CDRContainer singleton object used by mod_cdr to control + * the creation, processing, and destruction of various CDR logger objects. + * + * cdrcontainer.h + * + */ + +#ifndef CDRCONTAINER +#define CDRCONTAINER + +#ifdef __cplusplus +#include <cstring> +#include <iostream> +#endif +#include "basecdr.h" +#include <switch.h> + +/* +The CDRContainer Class will serve as a central receptacle for all CDR methods. CDRContainer::CDRContainer() will initialize the system, and CDRContainer::add_cdr() will add a new object of each CDR type to a queue for "later processing" by the other thread. +CDRContainer::process_records() will iterate thru the queue and commit the records to the respective backends. +*/ + +#ifdef __cplusplus +extern "C" { +#endif + +class CDRContainer { + public: + CDRContainer(); + CDRContainer(switch_memory_pool_t *module_pool); + ~CDRContainer(); + void add_cdr(switch_core_session_t *session); + void process_records(); + protected: + private: + switch_queue_t *cdrqueue; + std::string tempfilepath; +}; + +#ifdef __cplusplus +} +#endif + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,286 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the CsvCDR class that handles processing CDRs to a CSV format. + * This is the standard CSV module, and has a list of predefined variables to log out which can be + * added to, but never have the default ones removed. If you want to use one that allows you to explicity + * set all data variables to be logged and in what order, then this is not the class you want to use, and + * one will be coming in the future to do just that. + * + * csvcdr.cpp + * + */ + +#include <switch.h> +#include "csvcdr.h" +#include <string> + + +CsvCDR::CsvCDR() : BaseCDR() +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); +} + +CsvCDR::CsvCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); + + if(newchannel != 0) + { + switch_time_exp_t tempcallstart, tempcallanswer, tempcallend; + memset(&tempcallstart,0,sizeof(tempcallstart)); + memset(&tempcallanswer,0,sizeof(tempcallanswer)); + memset(&tempcallend,0,sizeof(tempcallend)); + switch_time_exp_lt(&tempcallstart, callstartdate); + switch_time_exp_lt(&tempcallanswer, callanswerdate); + switch_time_exp_lt(&tempcallend, callenddate); + + // Format the times + apr_size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile + char format[] = "%Y-%m-%d-%H-%M-%S"; + switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); + switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); + switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend); + + process_channel_variables(chanvars_fixed_list,newchannel->channel); + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp); + } +} + +CsvCDR::~CsvCDR() +{ + +} + +bool CsvCDR::activated=0; +bool CsvCDR::logchanvars=0; +bool CsvCDR::connectionstate=0; +bool CsvCDR::repeat_fixed_in_supp=0; +std::string CsvCDR::outputfile_path; +std::ofstream CsvCDR::outputfile; +std::ofstream::pos_type CsvCDR::filesize_limit = (10 * 1024 * 1024); // Default file size is 10MB +std::list<std::string> CsvCDR::chanvars_fixed_list; +std::list<std::string> CsvCDR::chanvars_supp_list; + +void CsvCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + switch_console_printf(SWITCH_CHANNEL_LOG, "CsvCDR::connect() - Loading configuration file.\n"); + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + if ((settings = switch_xml_child(cfg, "csvcdr"))) + { + int count_config_params = 0; // Need to make sure all params are set before we load + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "path")) + { + if(val != 0) + outputfile_path = val; + count_config_params++; + } + else if (!strcmp(var, "chanvars_supp")) + { + if(val != 0) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + bool fixed = 0; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + logchanvars=1; + } + } + } + else if (!strcmp(var, "chanvars_fixed")) + { + if(val != 0) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + bool fixed = 1; + parse_channel_variables_xconfig(unparsed,chanvars_fixed_list,fixed); + logchanvars=1; + } + } + } + else if (!strcmp(var, "repeat_fixed_in_supp")) + { + if(!strcmp(val,"1")) + repeat_fixed_in_supp = 1; + else if (!strcmp(val,"y") || !strcmp(val,"y")) + repeat_fixed_in_supp = 0; + } + else if (!strcmp(var, "size_limit")) + { + if(val != 0) + { + filesize_limit = atoi(val) * 1024 * 1024; // Value is in MB + std::cout << "File size limit from config file is " << filesize_limit << " byte(s)." << std::endl; + } + } + } + + if(count_config_params > 0) + { + open_file(); + if(outputfile.good()) + { + activated = 1; + switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR activated, log rotation will occur at or after %d MB",(filesize_limit/1024/1024)); + } + } + else + switch_console_printf(SWITCH_CHANNEL_LOG,"CsvCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a path to have the records logged to.\n"); + } +} + +void CsvCDR::check_file_size_and_open() +{ + // Test if the file has been opened or not + if(outputfile) + { + if(outputfile.tellp() > filesize_limit) + outputfile.close(); + } + + if (!outputfile) + { + open_file(); + } +} + +void CsvCDR::open_file() +{ + switch_time_t now = switch_time_now(); + switch_time_exp_t now_converted; + memset(&now_converted,0,sizeof(now_converted)); + + switch_time_exp_lt(&now_converted,now); + + apr_size_t retsize; + char format[] = "%Y-%m-%d-%H-%M-%S"; + char formatteddate[100]; + memset(formatteddate,0,100); + switch_strftime(formatteddate,&retsize,100,format,&now_converted); + + std::string filename = outputfile_path; + filename.append(SWITCH_PATH_SEPARATOR); + filename.append(formatteddate); + filename.append(".csv"); + outputfile.clear(); + + outputfile.open(filename.c_str(),std::ios_base::app|std::ios_base::binary); + if(outputfile.fail()) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Could not open the CSV file %s . CsvCDR logger will not be functional until this is resolved and a reload is issued. Failbit is set to %d.\n",filename.c_str(),outputfile.fail()); + activated = 0; + } + +} + +bool CsvCDR::process_record() +{ + check_file_size_and_open(); + bool retval = 0; + + // Format the call record and proceed from here... + outputfile << "\"" << callstartdate << "\",\""; + outputfile << callanswerdate << "\",\""; + outputfile << callenddate << "\",\""; + outputfile << hangupcause_text << "\",\""; + outputfile << hangupcause << "\",\""; + outputfile << clid << "\",\""; + outputfile << originated << "\",\""; + outputfile << dialplan << "\",\""; + outputfile << myuuid << "\",\""; + outputfile << destuuid << "\",\""; + outputfile << src << "\",\""; + outputfile << dst << "\",\""; + outputfile << srcchannel << "\",\""; + outputfile << dstchannel << "\",\""; + outputfile << ani << "\",\""; + outputfile << aniii << "\",\""; + outputfile << network_addr << "\",\""; + outputfile << lastapp << "\",\""; + outputfile << lastdata << "\",\""; + outputfile << billusec << "\",\""; + outputfile << disposition << "\",\""; + outputfile << amaflags << "\""; + + // Now to process chanvars, fixed ones first + if(chanvars_fixed.size() > 0 ) + { + std::list<std::pair<std::string,std::string> >::iterator iItr, iEnd; + for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++) + outputfile << ",\"" << iItr->second << "\""; + } + + if(chanvars_supp.size() > 0 ) + { + std::map<std::string,std::string>::iterator iItr,iEnd; + for(iItr = chanvars_supp.begin(), iEnd = chanvars_supp.end() ; iItr != iEnd; iItr++) + outputfile << ",\"" << iItr->first << "=" << iItr->second << "\""; + } + outputfile << std::endl; + retval = 1; + + return retval; +} + +bool CsvCDR::is_activated() +{ + return activated; +} + +void CsvCDR::tempdump_record() +{ + +} + +void CsvCDR::reread_tempdumped_records() +{ + +} + +void CsvCDR::disconnect() +{ + outputfile.close(); + switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down CsvCDR... Done!"); +} + +AUTO_REGISTER_BASECDR(CsvCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/csvcdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,77 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the CsvCDR class that handles processing CDRs to a CSV format. + * This is the standard CSV module, and has a list of predefined variables to log out which can be + * added to, but never have the default ones removed. If you want to use one that allows you to explicity + * set all data variables to be logged and in what order, then this is not the class you want to use, and + * one will be coming in the future to do just that. + * + * csvcdr.h + * + */ + +#include "baseregistry.h" +#include <switch.h> +#include <iostream> +#include <fstream> +#include <list> + +#ifndef CSVCDR +#define CSVCDR + +class CsvCDR : public BaseCDR { + public: + CsvCDR(); + CsvCDR(switch_mod_cdr_newchannel_t *newchannel); + //CsvCDR(const CsvCDR& copyFrom); + virtual ~CsvCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); // connect and disconnect need to be static because we're persisting connections until shutdown + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; // Is this module activated? + static bool connectionstate; // What is the status of the connection? + static bool logchanvars; + static bool repeat_fixed_in_supp; // Repeat the fixed chanvars in the supplemental? + static std::string outputfile_path; // The directory we'll dump these into + static std::list<std::string> chanvars_fixed_list; // Normally this would be used, but not in this class + static std::list<std::string> chanvars_supp_list; // This will hold the list for all chanvars here + char formattedcallstartdate[100]; + char formattedcallanswerdate[100]; + char formattedcallenddate[100]; + static std::ofstream outputfile; + static std::ofstream::pos_type filesize_limit; + void check_file_size_and_open(); // Checks the size of the file, and if it's greater than size allowed, rotates it. + void open_file(); +}; + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,107 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This source file describes the most basic portions of the CDR module. These are the functions + * and structures that the Freeswitch core looks for when opening up the DSO file to create the load, shutdown + * and runtime threads as necessary. + * + * mod_cdr.cpp + * + */ + +#include "cdrcontainer.h" +#include <switch.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + +static const char modname[] = "mod_cdr - CDR Engine"; +static int RUNNING = 0; +static CDRContainer *newcdrcontainer; +static switch_memory_pool_t *module_pool; +static switch_status_t my_on_hangup(switch_core_session_t *session); + +/* Now begins the glue that will tie this into the system. +*/ + +static const switch_state_handler_table_t state_handlers = { + /*.on_init */ NULL, + /*.on_ring */ NULL, + /*.on_execute */ NULL, + /*.on_hangup */ my_on_hangup, + /*.on_loopback */ NULL, + /*.on_transmit */ NULL +}; + +static const switch_loadable_module_interface_t cdr_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL +}; + +static switch_status_t my_on_hangup(switch_core_session_t *session) +{ + newcdrcontainer->add_cdr(session); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface **interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *interface = &cdr_module_interface; + + switch_core_add_state_handler(&state_handlers); + + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) + { + switch_console_printf(SWITCH_CHANNEL_LOG, "OH OH - Can't swim, no pool\n"); + return SWITCH_STATUS_TERM; + } + + newcdrcontainer = new CDRContainer(module_pool); // Instantiates the new object, automatically loads config + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +{ + RUNNING = 1; + switch_console_printf(SWITCH_CHANNEL_LOG, "mod_cdr made it to runtime. Wee!\n"); + newcdrcontainer->process_records(); + + return RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_TERM; +} + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) +{ + delete newcdrcontainer; + return SWITCH_STATUS_SUCCESS; +} Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Thu Oct 19 11:38:42 2006 @@ -0,0 +1,439 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mod_cdr" + ProjectGUID="{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}" + RootNamespace="mod_cdr" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + ImportLibrary="$(OutDir)/mod_cdr.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/mod_cdr.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug with MySql|Win32" + OutputDirectory="Debug" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="mysqlclient.lib ws2_32.lib" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="2" + AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\Debug;"C:\Program Files\MySQL\MySQL Server 5.0\lib\debug"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + ImportLibrary="$(OutDir)/mod_cdr.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release with MySql|Win32" + OutputDirectory="Release" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + RuntimeLibrary="0" + UsePrecompiledHeader="0" + WarningLevel="4" + WarnAsError="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="mysqlclient.lib ws2_32.lib" + OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll" + LinkIncremental="1" + AdditionalLibraryDirectories=""..\..\..\..\w32\vsnet\Release";"C:\Program Files\MySQL\MySQL Server 5.0\lib\opt"" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)/mod_cdr.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\basecdr.cpp" + > + </File> + <File + RelativePath=".\baseregistry.cpp" + > + </File> + <File + RelativePath=".\cdrcontainer.cpp" + > + </File> + <File + RelativePath=".\csvcdr.cpp" + > + </File> + <File + RelativePath=".\mod_cdr.cpp" + > + </File> + <File + RelativePath=".\mysqlcdr.cpp" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\pddcdr.cpp" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\basecdr.h" + > + </File> + <File + RelativePath=".\baseregistry.h" + > + </File> + <File + RelativePath=".\cdrcontainer.h" + > + </File> + <File + RelativePath=".\csvcdr.h" + > + </File> + <File + RelativePath=".\mysqlcdr.h" + > + </File> + <File + RelativePath=".\pddcdr.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,627 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the MysqlCDR class which handles formatting a CDR out to + * a MySQL 4.1.x or greater server using prepared statements. + * + * mysqlcdr.cpp + * + */ + +#ifdef WIN32 +#include <Winsock2.h> +#endif +#include <mysql.h> +#include <switch.h> +#include <cstring> +#include <iostream> +#include "mysqlcdr.h" + +MysqlCDR::MysqlCDR() : BaseCDR() +{ + +} + +MysqlCDR::MysqlCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + if(newchannel != 0) + { + clid_length = (long unsigned int)strlen(clid); + src_length = (long unsigned int)strlen(src); + dst_length = (long unsigned int)strlen(dst); + ani_length = (long unsigned int)strlen(ani); + ani2_length = (long unsigned int)strlen(ani2); + dialplan_length = (long unsigned int)strlen(dialplan); + myuuid_length = (long unsigned int)strlen(myuuid); + destuuid_length = (long unsigned int)strlen(destuuid); + srcchannel_length = (long unsigned int)strlen(srcchannel); + dstchannel_length = (long unsigned int)strlen(dstchannel); + lastapp_length = (long unsigned int)strlen(lastapp); + lastdata_length = (long unsigned int)strlen(lastdata); + + if(chanvars_fixed_list.size() > 0) + process_channel_variables(chanvars_fixed_list,newchannel->channel); + + if(chanvars_supp_list.size() > 0) + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp); + } +} + +MysqlCDR::~MysqlCDR() +{ + +} + +bool MysqlCDR::connectionstate = 0; +bool MysqlCDR::logchanvars = 0; +bool MysqlCDR::repeat_fixed_in_supp = 0; +std::list<std::string> MysqlCDR::chanvars_fixed_list; +std::list<std::string> MysqlCDR::chanvars_supp_list; +std::vector<switch_mod_cdr_sql_types_t> MysqlCDR::chanvars_fixed_types; +bool MysqlCDR::activated = 0; +char MysqlCDR::sql_query[1024] = ""; +std::string MysqlCDR::tmp_sql_query; +char MysqlCDR::sql_query_chanvars[100] = ""; +MYSQL* MysqlCDR::conn = 0; +MYSQL_STMT* MysqlCDR::stmt=0; +MYSQL_STMT* MysqlCDR::stmt_chanvars=0; +char MysqlCDR::hostname[255] = ""; +char MysqlCDR::username[255] =""; +char MysqlCDR::dbname[255] = ""; +char MysqlCDR::password[255] = ""; +//fstream MysqlCDR::tmpfile; + +void MysqlCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + if(activated) + disconnect(); + + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + int count_config_params = 0; // Need to make sure all params are set before we load + if ((settings = switch_xml_child(cfg, "mysqlcdr"))) + { + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "hostname")) + { + if(val != 0) + { + strncpy(hostname,val,strlen(val)); + count_config_params++; + } + } + else if (!strcmp(var, "username")) + { + if(val != 0) + { + strncpy(username,val,strlen(val)); + count_config_params++; + } + } + else if (!strcmp(var,"password")) + { + if(val != 0) + { + strncpy(password,val,strlen(val)); + count_config_params++; + } + } + else if(!strcmp(var,"dbname")) + { + if(val != 0) + { + strncpy(dbname,val,strlen(val)); + count_config_params++; + } + } + else if(!strcmp(var,"chanvars_fixed")) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + parse_channel_variables_xconfig(unparsed,chanvars_fixed_list,chanvars_fixed_types); + //logchanvars=1; + } + } + else if(!strcmp(var,"chanvars_supp")) + { + if(val != 0) + { + std::string unparsed = val; + bool fixed = 0; + logchanvars = 1; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + } + } + else if(!strcmp(var,"chanvars_supp_repeat_fixed")) + { + if(val != 0) + { + std::string repeat = val; + if(repeat == "Y" || repeat == "y" || repeat == "1") + repeat_fixed_in_supp = 1; + } + } + } + + if (count_config_params==4) + activated = 1; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify a hostname, username, password, and database to use MysqlCDR. You only supplied %d parameters.\n",count_config_params); + + if(activated) + { + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,ani2,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + + int items_appended = 0; + + if(chanvars_fixed_list.size() > 0 ) + { + std::list<std::string>::iterator iItr, iEnd; + for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++) + { + if(iItr->size() > 0) + { + tmp_sql_query.append(","); + tmp_sql_query.append(*iItr); + items_appended++; + } + } + } + + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + + if(chanvars_fixed_list.size() > 0 ) + { + for(int i = 0; i < items_appended; i++) + tmp_sql_query.append(",?"); + } + + tmp_sql_query.append(")"); + + char tempsql_query_chanvars[] = "INSERT INTO chanvars (callid,varname,varvalue) VALUES(?,?,?)"; + memset(sql_query_chanvars,0,100); + strncpy(sql_query_chanvars,tempsql_query_chanvars,strlen(tempsql_query_chanvars)); + + strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); + connect_to_database(); + } + } +} + +void MysqlCDR::connect_to_database() +{ + conn = mysql_init(NULL); + mysql_options(conn, MYSQL_READ_DEFAULT_FILE, ""); + if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) + { + const char *error1 = mysql_error(conn); + switch_console_printf(SWITCH_CHANNEL_LOG,"Cannot connect to MySQL Server. The error was: %s\n",error1); + } + else + connectionstate = 1; + + mysql_autocommit(conn,0); + stmt = mysql_stmt_init(conn); + + mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); + + if(logchanvars) + { + stmt_chanvars = mysql_stmt_init(conn); + mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); + } +} + +bool MysqlCDR::is_activated() +{ + return activated; +} + +template <typename T> +void MysqlCDR::add_parameter(T& param, enum_field_types type, bool *is_null) +{ + MYSQL_BIND temp_bind; + memset(&temp_bind,0,sizeof(temp_bind)); + + temp_bind.buffer_type = type; + if(is_null != 0) + { + if(*is_null) + temp_bind.is_null = (my_bool*) is_null; + else + temp_bind.buffer = &param; + } + else + temp_bind.buffer = &param; + + bindme.push_back(temp_bind); +} + +template <> +void MysqlCDR::add_parameter<MYSQL_TIME>(MYSQL_TIME& param, enum_field_types type, bool* is_null) +{ + MYSQL_BIND temp_bind; + memset(&temp_bind,0,sizeof(temp_bind)); + + temp_bind.buffer_type = type; + if(is_null != 0) + { + if(*is_null) + temp_bind.is_null = (my_bool*) is_null; + else + temp_bind.buffer = &param; + + } + else + temp_bind.buffer = &param; + + bindme.push_back(temp_bind); +} + +void MysqlCDR::tempdump_record() +{ + +} + +void MysqlCDR::reread_tempdumped_records() +{ + +} + + +bool MysqlCDR::process_record() +{ + switch_time_exp_t tm1,tm2,tm3; // One for call start + memset(&tm1,0,sizeof(tm1)); + memset(&tm2,0,sizeof(tm2)); + memset(&tm3,0,sizeof(tm3)); + + switch_time_exp_lt(&tm1,callstartdate); + switch_time_exp_lt(&tm2,callanswerdate); + switch_time_exp_lt(&tm3,callenddate); + + set_mysql_time(tm1,my_callstartdate); + set_mysql_time(tm2,my_callanswerdate); + set_mysql_time(tm3,my_callenddate); + + add_parameter(my_callstartdate,MYSQL_TYPE_DATETIME); + add_parameter(my_callanswerdate,MYSQL_TYPE_DATETIME); + add_parameter(my_callenddate,MYSQL_TYPE_DATETIME); + + add_parameter(originated,MYSQL_TYPE_TINY); + add_string_parameter(clid,clid_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(src,src_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(dst,dst_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(ani,ani_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(ani2,ani2_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(dialplan,dialplan_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(myuuid,myuuid_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(destuuid,destuuid_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(srcchannel,srcchannel_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(dstchannel,dstchannel_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(lastapp,lastapp_length,MYSQL_TYPE_VAR_STRING,0); + add_string_parameter(lastdata,lastdata_length,MYSQL_TYPE_VAR_STRING,0); + add_parameter(billusec,MYSQL_TYPE_LONGLONG,0); + add_parameter(disposition,MYSQL_TYPE_TINY,0); + add_parameter(hangupcause,MYSQL_TYPE_LONG,0); + add_parameter(amaflags,MYSQL_TYPE_TINY,0); + + std::list<void*> temp_chanvars_holder; // This is used for any fixed chanvars, as we don't want things out of scope + + if(chanvars_fixed_list.size() > 0) + { + switch_size_t i = 0; // temporary variable, i is current spot on the string of types + std::list<std::pair<std::string,std::string> >::iterator iItr, iEnd; + for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_INTEGER: + { + int* x = new int; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_LONG,is_null); + break; + } + case CDR_DOUBLE: + { + double* x = new double; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_DOUBLE,is_null); + break; + } + case CDR_TINY: + { + short* x = new short; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_TINY,is_null); + break; + } + case CDR_STRING: + case CDR_DECIMAL: + { + long unsigned int* stringlength = new long unsigned int; + *stringlength = (long unsigned int)(iItr->second.size()); + + char* x = new char[(*stringlength+1)]; + strncpy(x,iItr->second.c_str(),*stringlength); + + bool* is_null = new bool; + *is_null = 0; + add_string_parameter(x,*stringlength,MYSQL_TYPE_VAR_STRING,is_null); + + temp_chanvars_holder.push_back(stringlength); + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + i++; + } + } + + MYSQL_BIND *bindmetemp; + bindmetemp = new MYSQL_BIND[bindme.size()]; + copy(bindme.begin(), bindme.end(), bindmetemp); + + for(int mysql_ping_result = -1, count = 0, mysql_stmt_error_code = -1; mysql_ping_result != 0 && count < 5 && mysql_stmt_error_code != 0 ; count++) + { + mysql_ping_result = mysql_ping(conn); + if(mysql_ping_result) + { + switch(mysql_ping_result) + { + case CR_SERVER_GONE_ERROR: + case CR_SERVER_LOST: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); + connect_to_database(); + break; + } + default: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); + connect_to_database(); + } + } + } + else + { + mysql_stmt_bind_param(stmt,bindmetemp); + mysql_stmt_error_code = mysql_stmt_execute(stmt); + + if(mysql_stmt_error_code != 0) + { + errorstate = 1; + switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); + + const char* mysql_stmt_error_string = mysql_stmt_error(stmt); + switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); + } + else + errorstate = 0; + + if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) + { + long long insertid = mysql_stmt_insert_id(stmt); + + std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; + iEnd = chanvars_supp.end(); + for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + { + MYSQL_BIND bindme_chanvars[3]; + memset(bindme_chanvars,0,sizeof(bindme_chanvars)); + + bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; + bindme_chanvars[0].buffer = &insertid; + + std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); + tempfirstvector.push_back('\0'); + char* varname_temp = &tempfirstvector[0]; + + bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; + long unsigned int varname_length = (long unsigned int)(iItr->first.size()); + bindme_chanvars[1].length = &varname_length; + bindme_chanvars[1].buffer_length = varname_length; + bindme_chanvars[1].buffer = varname_temp; + + std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); + tempsecondvector.push_back('\0'); + char* varvalue_temp = &tempsecondvector[0]; + + bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; + if(iItr->second.size() == 0) + bindme_chanvars[2].is_null = (my_bool*)1; + else + { + long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); + bindme_chanvars[2].length = &varvalue_length; + bindme_chanvars[2].buffer_length = varvalue_length; + bindme_chanvars[2].buffer = varvalue_temp; + } + + mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); + mysql_stmt_execute(stmt_chanvars); + } + } + + if(errorstate == 0) + mysql_commit(conn); + else + mysql_rollback(conn); + } + } + + delete [] bindmetemp; + if(temp_chanvars_holder.size() > 0) + { + std::string::size_type i = 0, j = chanvars_fixed_types.size(); + for(; i < j ; i++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_STRING: + case CDR_DECIMAL: + { + long unsigned int* stringlength = (long unsigned int*)temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete stringlength; + char* tempstring = (char*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete [] tempstring; + break; + } + case CDR_INTEGER: + { + int* tempint = (int*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempint; + break; + } + case CDR_DOUBLE: + { + double* tempdouble = (double*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempdouble; + break; + } + case CDR_TINY: + { + short* tempshort = (short*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempshort; + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + + bool* tempbool = (bool*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempbool; + } + } + return 1; +} + +void MysqlCDR::disconnect() +{ + mysql_stmt_close(stmt); + if(logchanvars) + mysql_stmt_close(stmt_chanvars); + mysql_close(conn); + activated = 0; + logchanvars = 0; + chanvars_fixed_list.clear(); + chanvars_supp_list.clear(); + chanvars_fixed_types.clear(); + connectionstate = 0; + tmp_sql_query.clear(); +} + + + +void MysqlCDR::add_string_parameter(char* param, long unsigned int& param_length, enum_field_types type, bool *is_null) +{ + MYSQL_BIND temp_bind; + memset(&temp_bind,0,sizeof(temp_bind)); + temp_bind.buffer_type = type; + if(is_null != 0) + { + if(*is_null || param == 0) + temp_bind.is_null = (my_bool*) is_null; + else + { + temp_bind.length = &param_length; + temp_bind.buffer_length = param_length; + temp_bind.buffer = param; + } + } + else + { + temp_bind.length = &param_length; + temp_bind.buffer_length = param_length; + temp_bind.buffer = param; + } + + bindme.push_back(temp_bind); +} + +void MysqlCDR::set_mysql_time(switch_time_exp_t& param, MYSQL_TIME& destination) +{ + destination.year = param.tm_year + 1900; + destination.month = param.tm_mon + 1; + destination.day = param.tm_mday; + destination.hour = param.tm_hour; + destination.minute = param.tm_min; + destination.second = param.tm_sec; +} + +AUTO_REGISTER_BASECDR(MysqlCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mysqlcdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,101 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the MysqlCDR class which handles formatting a CDR out to + * a MySQL 4.1.x or greater server using prepared statements. + * + * mysqlcdr.h + * + */ + +#include "baseregistry.h" +#include <list> +#include <sstream> +#include <mysql.h> +#include <errmsg.h> + +#ifndef MYSQLCDR +#define MYSQLCDR + +class MysqlCDR : public BaseCDR { + public: + MysqlCDR(); + MysqlCDR(switch_mod_cdr_newchannel_t *newchannel); + //MysqlCDR(const MysqlCDR& copyFrom); + virtual ~MysqlCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; + static char sql_query[1024]; + static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql + static char sql_query_chanvars[100]; + static MYSQL *conn; + static MYSQL_STMT *stmt; + static MYSQL_STMT *stmt_chanvars; + static bool connectionstate; + static bool logchanvars; + static std::list<std::string> chanvars_fixed_list; + static std::vector<switch_mod_cdr_sql_types_t> chanvars_fixed_types; + static std::list<std::string> chanvars_supp_list; // The supplemental list + static bool repeat_fixed_in_supp; + static char hostname[255]; + static char username[255]; + static char dbname[255]; + static char password[255]; + //static fstream tmpfile; + std::vector<MYSQL_BIND> bindme; + //MYSQL_BIND *bindme; + MYSQL_TIME my_callstartdate; + MYSQL_TIME my_callanswerdate; + MYSQL_TIME my_callenddate; + // Why all these long unsigned int's? MySQL's prep statement API expects these to actually exist and not just be params passed to the function calls. The are to measure the length of actual data in the char* arrays. + long unsigned int clid_length; + long unsigned int dialplan_length; + long unsigned int myuuid_length; + long unsigned int destuuid_length; + long unsigned int src_length; + long unsigned int dst_length; + long unsigned int srcchannel_length; + long unsigned int dstchannel_length; + long unsigned int ani_length; + long unsigned int aniii_length; + long unsigned int lastapp_length; + long unsigned int lastdata_length; + // Now a couple internal methods + template <typename T> void add_parameter(T& param, enum_field_types type, bool *is_null=0); + void add_string_parameter(char* param, long unsigned int& param_length, enum_field_types type, bool* is_null=0); + void set_mysql_time(switch_time_exp_t& param, MYSQL_TIME& destination); + void connect_to_database(); +}; + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,602 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the OdbcCDR class which handles formatting a CDR out to + * an ODBC backend using prepared statements. + * + * odbccdr.cpp + * + */ + +#include "odbccdr.h" + +OdbcCDR::OdbcCDR() : BaseCDR() +{ + +} + +OdbcCDR::OdbcCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + if(newchannel != 0) + { + switch_time_exp_t tempcallstart, tempcallanswer, tempcallend; + memset(&tempcallstart,0,sizeof(tempcallstart)); + memset(&tempcallanswer,0,sizeof(tempcallanswer)); + memset(&tempcallend,0,sizeof(tempcallend)); + switch_time_exp_lt(&tempcallstart, callstartdate); + switch_time_exp_lt(&tempcallanswer, callanswerdate); + switch_time_exp_lt(&tempcallend, callenddate); + + // Format the times + switch_size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile + char format[] = "%Y-%m-%d %T"; + switch_strftime(odbc_callstartdate,&retsizecsd,sizeof(odbc_callstartdate),format,&tempcallstart); + switch_strftime(odbc_callanswerdate,&retsizecad,sizeof(odbc_callanswerdate),format,&tempcallanswer); + switch_strftime(odbc_callenddate,&retsizeced,sizeof(odbc_callenddate),format,&tempcallend); + + if(chanvars_fixed_list.size() > 0) + process_channel_variables(chanvars_fixed_list,newchannel->channel); + + if(chanvars_supp_list.size() > 0) + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp); + } +} + +OdbcCDR::~OdbcCDR() +{ + +} + +bool OdbcCDR::connectionstate = 0; +bool OdbcCDR::logchanvars = 0; +bool OdbcCDR::repeat_fixed_in_supp = 0; +std::list<std::string> OdbcCDR::chanvars_fixed_list; +std::list<std::string> OdbcCDR::chanvars_supp_list; +std::vector<switch_mod_cdr_sql_types_t> OdbcCDR::chanvars_fixed_types; +bool OdbcCDR::activated = 0; +char OdbcCDR::sql_query[1024] = ""; +std::string OdbcCDR::tmp_sql_query; +char OdbcCDR::sql_query_chanvars[355] = ""; +char OdbcCDR::sql_query_ping[10] = ""; +SQLHENV OdbcCDR::ODBC_env=0; +SQLHDBC OdbcCDR::ODBC_con=0; +SQLHSTMT OdbcCDR::ODBC_stmt=0; +SQLHSTMT OdbcCDR::ODBC_stmt_chanvars = 0; +SQLHSTMT OdbcCDR::ODBC_stmt_ping = 0; +char OdbcCDR::dsn[255] = ""; +char OdbcCDR::hostname[255] = ""; +char OdbcCDR::username[255] =""; +char OdbcCDR::dbname[255] = ""; +char OdbcCDR::password[255] = ""; +char OdbcCDR::tablename[255] = ""; +char OdbcCDR::tablename_chanvars[255] = ""; +//fstream OdbcCDR::tmpfile; + +void OdbcCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + if(activated) + disconnect(); + + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + int count_config_params = 0; // Need to make sure all params are set before we load + if ((settings = switch_xml_child(cfg, "odbccdr"))) + { + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "dsn")) + { + strncpy(dsn,val,strlen(val)); + count_config_params+=4; + } + else if (!strcmp(var, "hostname")) + { + if(val != 0) + { + strncpy(hostname,val,strlen(val)); + count_config_params++; + } + } + else if (!strcmp(var, "username")) + { + if(val != 0) + { + strncpy(username,val,strlen(val)); + count_config_params++; + } + } + else if (!strcmp(var,"password")) + { + if(val != 0) + { + strncpy(password,val,strlen(val)); + count_config_params++; + } + } + else if(!strcmp(var,"dbname")) + { + if(val != 0) + { + strncpy(dbname,val,strlen(val)); + count_config_params++; + } + } + else if(!strcmp(var,"chanvars_fixed")) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + parse_channel_variables_xconfig(unparsed,chanvars_fixed_list,chanvars_fixed_types); + //logchanvars=1; + } + } + else if(!strcmp(var,"chanvars_supp")) + { + if(val != 0) + { + std::string unparsed = val; + bool fixed = 0; + logchanvars = 1; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + } + } + else if(!strcmp(var,"chanvars_supp_repeat_fixed")) + { + if(val != 0) + { + std::string repeat = val; + if(repeat == "Y" || repeat == "y" || repeat == "1") + repeat_fixed_in_supp = 1; + } + } + else if(!strcmp(var,"main_db_table")) + { + if(val != 0) + strncpy(tablename,val,strlen(val)); + } + else if(!strcmp(var,"supp_chanvars_db_table")) + { + if(val != 0) + strncpy(tablename_chanvars,val,strlen(val)); + } + + if(strlen(tablename) == 0) + strncpy(tablename,"freeswitchcdr",13); + + if(strlen(tablename_chanvars) && logchanvars) + strncpy(tablename_chanvars,"chanvars",8); + } + + if (count_config_params==4) + activated = 1; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify a DSN,hostname, username, password, and database to use OdbcCDR. You only supplied %d parameters.\n",count_config_params); + + if(activated) + { + tmp_sql_query = "INSERT INTO "; + tmp_sql_query.append(tablename); + tmp_sql_query.append(" (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"); + + int items_appended = 0; + + if(chanvars_fixed_list.size() > 0 ) + { + std::list<std::string>::iterator iItr, iEnd; + for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++) + { + if(iItr->size() > 0) + { + tmp_sql_query.append(","); + tmp_sql_query.append(*iItr); + items_appended++; + } + } + } + + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + + if(chanvars_fixed_list.size() > 0 ) + { + for(int i = 0; i < items_appended; i++) + tmp_sql_query.append(",?"); + } + + tmp_sql_query.append(")"); + + std::string tempsql_query_chanvars = "INSERT INTO "; + tempsql_query_chanvars.append(tablename_chanvars); + tempsql_query_chanvars.append("(callid,varname,varvalue) VALUES(?,?,?)"); + memset(sql_query_chanvars,0,355); + strncpy(sql_query_chanvars,tempsql_query_chanvars.c_str(),tempsql_query_chanvars.size()); + + strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); + strncpy(sql_query_ping,"SELECT 1;",9); + connect_to_database(); + } + } +} + +void OdbcCDR::connect_to_database() +{ + if(connectionstate) + disconnect_stage_1(); + + int ODBC_res; + + if (ODBC_env == SQL_NULL_HANDLE || connectionstate == 0) + { + ODBC_res = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &ODBC_env); + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error allocating a new ODBC handle.\n"); + connectionstate = 0; + } + } + + ODBC_res = SQLSetEnvAttr(ODBC_env, SQL_ATTR_ODBC_VERSION, (void*)SQL_OV_ODBC3, 0); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error with ODBCSetEnv\n"); + SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); + connectionstate = 0; + } + + ODBC_res = SQLAllocHandle(SQL_HANDLE_DBC, ODBC_env, &ODBC_con); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error AllocHDB %d\n",ODBC_res); + SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); + connectionstate = 0; + } + + SQLSetConnectAttr(ODBC_con, SQL_LOGIN_TIMEOUT, (SQLPOINTER *)10, 0); + + /* Note that the username and password could be NULL here, but that is allowed in ODBC. + In this case, the default username and password will be used from odbc.conf */ + + ODBC_res = SQLConnect(ODBC_con, (SQLCHAR*)dsn, SQL_NTS, (SQLCHAR*)username, SQL_NTS, (SQLCHAR*)password, SQL_NTS); + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error connecting to the ODBC database on %d\n",ODBC_res); + SQLFreeHandle(SQL_HANDLE_DBC, ODBC_con); + SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); + connectionstate = 0; + } + else + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Connected to %s\n", dsn); + connectionstate = 1; + } + + // Turn off autocommit and have it preserve the cursors even after commit + SQLSetConnectAttr(ODBC_con, SQL_AUTOCOMMIT_OFF, NULL, 0); + SQLSetConnectAttr(ODBC_con, SQL_CB_PRESERVE, NULL, 0); + + ODBC_res = SQLAllocHandle(SQL_HANDLE_STMT, ODBC_con, &ODBC_stmt); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); + } + + ODBC_res = SQLPrepare(ODBC_stmt, (unsigned char *)sql_query, SQL_NTS); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); + } + + if(logchanvars) + { + ODBC_res = SQLAllocHandle(SQL_HANDLE_STMT, ODBC_con, &ODBC_stmt_chanvars); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_chanvars); + } + + ODBC_res = SQLPrepare(ODBC_stmt_chanvars, (unsigned char *)sql_query_chanvars, SQL_NTS); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt); + } + } + + ODBC_res = SQLAllocHandle(SQL_HANDLE_STMT, ODBC_con, &ODBC_stmt_ping); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Failure in allocating a prepared statement %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_ping); + } + + ODBC_res = SQLPrepare(ODBC_stmt_ping, (unsigned char *)sql_query_ping, SQL_NTS); + + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"Error in preparing a statement: %d\n", ODBC_res); + SQLFreeHandle(SQL_HANDLE_STMT, ODBC_stmt_ping); + } + + if (ODBC_res == SQL_SUCCESS || ODBC_res == SQL_SUCCESS_WITH_INFO) + connectionstate = 1; +} + +bool OdbcCDR::is_activated() +{ + return activated; +} + +void OdbcCDR::tempdump_record() +{ + +} + +void OdbcCDR::reread_tempdumped_records() +{ + +} + +bool OdbcCDR::process_record() +{ + for(int count=0, ODBC_res=-1; (ODBC_res != SQL_SUCCESS || ODBC_res != SQL_SUCCESS_WITH_INFO) && count < 5; count++) + { + int ODBC_res = SQLExecute(ODBC_stmt_ping); + SQLFreeStmt(ODBC_stmt_ping,SQL_CLOSE); + if(ODBC_res != SQL_SUCCESS && ODBC_res != SQL_SUCCESS_WITH_INFO) + { + // Try to reconnect and reprepare + switch_console_printf(SWITCH_CHANNEL_LOG,"Error pinging the ODBC backend. Attempt #%d to reconnect.\n",count+1); + connect_to_database(); + } + } + + int index = 1; + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(odbc_callstartdate), 0, odbc_callstartdate, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(odbc_callstartdate), 0, odbc_callstartdate, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(odbc_callstartdate), 0, odbc_callenddate, 0, 0); + + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SSHORT, SQL_TINYINT,0, 0,&originated, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(clid), 0, clid, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(src), 0, src, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(dst), 0, dst, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(ani), 0, ani, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(aniii), 0, aniii, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(dialplan), 0, dialplan, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(myuuid), 0, myuuid, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(destuuid), 0, destuuid, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(srcchannel), 0, srcchannel, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(dstchannel), 0, dstchannel, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(lastapp), 0, lastapp, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, sizeof(lastdata), 0, lastdata, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_UBIGINT, SQL_BIGINT, 0, 0, &billusec, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SSHORT, SQL_TINYINT, 0, 0, &disposition, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &hangupcause, 0, 0); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SSHORT, SQL_TINYINT, 0, 0, &amaflags, 0, 0); + + std::list<void*> temp_chanvars_holder; // This is used for any fixed chanvars, as we don't want things out of scope + + if(chanvars_fixed_list.size() > 0) + { + switch_size_t i = 0; // temporary variable, i is current spot on the string of types + std::list<std::pair<std::string,std::string> >::iterator iItr, iEnd; + for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_INTEGER: + { + int* x = new int; + *x = 0; + + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + + temp_chanvars_holder.push_back(x); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_CHAR, 0, 0, x, 0, 0); + break; + } + case CDR_DOUBLE: + { + double* x = new double; + *x = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + + temp_chanvars_holder.push_back(x); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_DOUBLE, SQL_DOUBLE, 0, 0, x, 0, 0); + break; + } + case CDR_TINY: + { + short* x = new short; + *x = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + + temp_chanvars_holder.push_back(x); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_SSHORT, SQL_TINYINT, 0, 0, x, 0, 0); + break; + } + case CDR_STRING: + { + uint64_t stringlength = iItr->second.size(); + char* x = new char[(stringlength+1)]; + strncpy(x,iItr->second.c_str(),stringlength); + temp_chanvars_holder.push_back(x); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, 0, 0, x, 0, 0); + break; + } + case CDR_DECIMAL: + { + uint64_t stringlength = iItr->second.size(); + char* x = new char[(stringlength+1)]; + strncpy(x,iItr->second.c_str(),stringlength); + SQLBindParameter(ODBC_stmt, index++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_DECIMAL, 0, 0, x, 0, 0); + temp_chanvars_holder.push_back(x); + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + i++; + } + } + + SQLExecute(ODBC_stmt); + + if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) + { + /* Since autoincrement is a bane of the SQL rdbms industry, we have to use the myuuid + instead to link the tables. Unfortunately, this is very wasteful of space, and not + highly recommended to use on heavily loaded systems. + */ + + std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; + iEnd = chanvars_supp.end(); + for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + { + std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); + tempfirstvector.push_back('\0'); + char* varname_temp = &tempfirstvector[0]; + + std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); + tempsecondvector.push_back('\0'); + char* varvalue_temp = &tempsecondvector[0]; + + SQLBindParameter(ODBC_stmt_chanvars, 1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, sizeof(myuuid), 0, myuuid, 0, 0); + + SQLBindParameter(ODBC_stmt_chanvars, 2, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, iItr->first.size(), 0, varname_temp, 0, 0); + + SQLBindParameter(ODBC_stmt_chanvars, 3, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, iItr->second.size(), 0, varvalue_temp, 0, 0); + + int ODBC_res_chanvars = SQLExecute(ODBC_stmt_chanvars); + if(ODBC_res_chanvars != SQL_SUCCESS && ODBC_res_chanvars != SQL_SUCCESS_WITH_INFO) + errorstate = 0; + else + errorstate = 1; + } + } + + if(errorstate) + SQLEndTran(SQL_HANDLE_DBC,ODBC_con,SQL_ROLLBACK); + else + SQLEndTran(SQL_HANDLE_DBC,ODBC_con,SQL_COMMIT); + + if(temp_chanvars_holder.size() > 0) + { + std::string::size_type i = 0, j = chanvars_fixed_types.size(); + for(; i < j ; i++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_STRING: + case CDR_DECIMAL: + { + char* tempstring = (char*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete [] tempstring; + break; + } + case CDR_INTEGER: + { + int* tempint = (int*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempint; + break; + } + case CDR_DOUBLE: + { + double* tempdouble = (double*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempdouble; + break; + } + case CDR_TINY: + { + short* tempshort = (short*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempshort; + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + } + } + return 1; +} + +void OdbcCDR::disconnect() +{ + disconnect_stage_1(); + + activated = 0; + logchanvars = 0; + chanvars_fixed_list.clear(); + chanvars_supp_list.clear(); + chanvars_fixed_types.clear(); + connectionstate = 0; + tmp_sql_query.clear(); + //tmp_sql_query_chanvars.clear(); +} + +void OdbcCDR::disconnect_stage_1() +{ + SQLFreeStmt(ODBC_stmt,SQL_UNBIND); + if(logchanvars) + SQLFreeStmt(ODBC_stmt_chanvars,SQL_UNBIND); + + SQLDisconnect(ODBC_con); + SQLFreeHandle(SQL_HANDLE_DBC, ODBC_con); + SQLFreeHandle(SQL_HANDLE_ENV, ODBC_env); + connectionstate = 0; +} + +AUTO_REGISTER_BASECDR(OdbcCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/odbccdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,100 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the OdbcCDR class which handles formatting a CDR out to + * an ODBC backend using prepared statements. + * + * odbccdr.h + * + */ + +#include "baseregistry.h" +#include <switch.h> +#include <iostream> +#include <list> +#include <sstream> + +#ifndef __CYGWIN__ +#include <sql.h> +#include <sqlext.h> +#include <sqltypes.h> +#else +#include <windows.h> +#include <w32api/sql.h> +#include <w32api/sqlext.h> +#include <w32api/sqltypes.h> +#endif + +#ifndef ODBCCDR +#define ODBCCDR + +class OdbcCDR : public BaseCDR { + public: + OdbcCDR(); + OdbcCDR(switch_mod_cdr_newchannel_t *newchannel); + //OdbcCDR(const MysqlCDR& copyFrom); + virtual ~OdbcCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; + static char sql_query[1024]; + static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql + static char sql_query_chanvars[355]; + static char sql_query_ping[10]; + static bool connectionstate; + static bool logchanvars; + static SQLHENV ODBC_env; /* global ODBC Environment */ + static SQLHDBC ODBC_con; /* global ODBC Connection Handle */ + static SQLHSTMT ODBC_stmt; + static SQLHSTMT ODBC_stmt_chanvars; + static SQLHSTMT ODBC_stmt_ping; + static std::list<std::string> chanvars_fixed_list; + static std::vector<switch_mod_cdr_sql_types_t> chanvars_fixed_types; + static std::list<std::string> chanvars_supp_list; // The supplemental list + static bool repeat_fixed_in_supp; + static char dsn[255]; + static char hostname[255]; + static char username[255]; + static char dbname[255]; + static char password[255]; + static char tablename[255]; + static char tablename_chanvars[255]; + //static fstream tmpfile; + char odbc_callstartdate[128]; + char odbc_callanswerdate[128]; + char odbc_callenddate[128]; + void disconnect_stage_1(); + void connect_to_database(); +}; + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,216 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ source file describes the PddCDR class which handles formatting a CDR out to + * individual text files in a Perl Data Dumper format. + * + * pddcdr.cpp + * + */ + +#include <switch.h> +#include "pddcdr.h" + +PddCDR::PddCDR() : BaseCDR() +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); +} + +PddCDR::PddCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); + + if(newchannel != 0) + { + switch_time_exp_t tempcallstart, tempcallanswer, tempcallend; + memset(&tempcallstart,0,sizeof(tempcallstart)); + memset(&tempcallanswer,0,sizeof(tempcallanswer)); + memset(&tempcallend,0,sizeof(tempcallend)); + switch_time_exp_lt(&tempcallstart, callstartdate); + switch_time_exp_lt(&tempcallanswer, callanswerdate); + switch_time_exp_lt(&tempcallend, callenddate); + + // Format the times + size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile + char format[] = "%Y-%m-%d-%H-%M-%S"; + switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); + switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); + switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend); + + std::ostringstream ostring; + ostring << (callenddate/1000000); + std::string callenddate_forfile = ostring.str(); + + outputfile_name = outputfile_path; + outputfile_name.append(SWITCH_PATH_SEPARATOR); + outputfile_name.append(callenddate_forfile); // Make sorting a bit easier, kinda like Maildir does + outputfile_name.append("."); + outputfile_name.append(myuuid); // The goal is to have a resulting filename of "/path/to/myuuid" + outputfile_name.append(".pdd"); // .pdd - "perl data dumper" + + outputfile.open(outputfile_name.c_str()); + + bool repeat = 1; + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat); + } +} + +PddCDR::~PddCDR() +{ + outputfile.close(); +} + +bool PddCDR::activated=0; +bool PddCDR::logchanvars=0; +bool PddCDR::connectionstate=0; +std::string PddCDR::outputfile_path; +std::list<std::string> PddCDR::chanvars_fixed_list; +std::list<std::string> PddCDR::chanvars_supp_list; + +void PddCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + switch_console_printf(SWITCH_CHANNEL_LOG, "PddCDR::connect() - Loading configuration file.\n"); + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + if ((settings = switch_xml_child(cfg, "pddcdr"))) + { + int count_config_params = 0; // Need to make sure all params are set before we load + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "path")) + { + if(val != 0) + outputfile_path = val; + count_config_params++; + } + else if (!strcmp(var, "chanvars")) + { + if(val != 0) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + bool fixed = 0; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + logchanvars=1; + } + } + } + else if (!strcmp(var, "chanvars_fixed")) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + } + else if (!strcmp(var, "chanvars_supp")) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + } + } + + if(count_config_params > 0) + activated = 1; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"PddCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a path to have the records logged to.\n"); + } +} + +bool PddCDR::process_record() +{ + bool retval = 0; + if(!outputfile) + switch_console_printf(SWITCH_CHANNEL_LOG, "PddCDR::process_record(): Unable to open file %s to commit the call record to. Invalid path name, invalid permissions, or no space available?\n",outputfile_name.c_str()); + else + { + // Format the call record and proceed from here... + outputfile << "$VAR1 = {" << std::endl; + outputfile << "\t\'callstartdate\' = \'" << callstartdate << "\'," << std::endl; + outputfile << "\t\'callanswerdate\' = \'" << callanswerdate << "\'," << std::endl; + outputfile << "\t\'callenddate\' = \'" << callenddate << "\'," << std::endl; + outputfile << "\t\'hangupcause\' = \'" << hangupcause_text << "\'," << std::endl; + outputfile << "\t\'hangupcausecode\' = \'" << hangupcause << "\'," << std::endl; + outputfile << "\t\'clid\' = \'" << clid << "\'," << std::endl; + outputfile << "\t\'originated\' = \'" << originated << "\'," << std::endl; + outputfile << "\t\'dialplan\' = \'" << dialplan << "\'," << std::endl; + outputfile << "\t\'myuuid\' = \'" << myuuid << "\'," << std::endl; + outputfile << "\t\'destuuid\' = \'" << destuuid << "\'," << std::endl; + outputfile << "\t\'src\' = \'" << src << "\'," << std::endl; + outputfile << "\t\'dst\' = \'" << dst << "\'," << std::endl; + outputfile << "\t\'srcchannel\' = \'" << srcchannel << "\'," << std::endl; + outputfile << "\t\'dstchannel\' = \'" << dstchannel << "\'," << std::endl; + outputfile << "\t\'ani\' = \'" << ani << "\'," << std::endl; + outputfile << "\t\'aniii\' = \'" << aniii << "\'," << std::endl; + outputfile << "\t\'network_addr\' = \'" << network_addr << "\'," << std::endl; + outputfile << "\t\'lastapp\' = \'" << lastapp << "\'," << std::endl; + outputfile << "\t\'lastdata\' = \'" << lastdata << "\'," << std::endl; + outputfile << "\t\'billusec\' = \'" << billusec << "\'," << std::endl; + outputfile << "\t\'disposition\' = \'" << disposition << "\'," << std::endl; + outputfile << "\t\'amaflags\' = \'" << amaflags << "\'," << std::endl; + + // Now to process chanvars + outputfile << "\t\'chanvars\' => {" << std::endl; + if(chanvars_supp.size() > 0 ) + { + std::map<std::string,std::string>::iterator iItr,iEnd; + for(iItr = chanvars_supp.begin(), iEnd = chanvars_supp.end() ; iItr != iEnd; iItr++) + outputfile << "\t\t\'" << iItr->first << "\' = \'" << iItr->second << "\'," << std::endl; + } + outputfile << "\t}," << std::endl << "};" << std::endl << std::endl; + retval = 1; + } + + return retval; +} + +bool PddCDR::is_activated() +{ + return activated; +} + +void PddCDR::tempdump_record() +{ + +} + +void PddCDR::reread_tempdumped_records() +{ + +} + +void PddCDR::disconnect() +{ + switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down PddCDR... Done!"); +} + +AUTO_REGISTER_BASECDR(PddCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/pddcdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,71 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the PddCDR class which handles formatting a CDR out to + * individual text files in a Perl Data Dumper format. + * + * pddcdr.h + * + */ + +#include "baseregistry.h" +#include <switch.h> +#include <iostream> +#include <sstream> +#include <fstream> +#include <list> + +#ifndef PDDCDR +#define PDDMCDR + +class PddCDR : public BaseCDR { + public: + PddCDR(); + PddCDR(switch_mod_cdr_newchannel_t *newchannel); + virtual ~PddCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); // connect and disconnect need to be static because we're persisting connections until shutdown + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; // Is this module activated? + static bool connectionstate; // What is the status of the connection? + static bool logchanvars; + static std::string outputfile_path; // The directory we'll dump these into + static std::list<std::string> chanvars_fixed_list; // Normally this would be used, but not in this class + static std::list<std::string> chanvars_supp_list; // This will hold the list for all chanvars here + char formattedcallstartdate[100]; + char formattedcallanswerdate[100]; + char formattedcallenddate[100]; + std::string outputfile_name; + std::ofstream outputfile; +}; + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.mysql ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.mysql Thu Oct 19 11:38:42 2006 @@ -0,0 +1,4 @@ +ALTER TABLE freeswitchcdr modify callid bigint unsigned auto_increment; +ALTER TABLE freeswitchcdr Engine=InnoDB; + +ALTER TABLE chanvars Engine=InnoDB; \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.odbc ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema-update.odbc Thu Oct 19 11:38:42 2006 @@ -0,0 +1,3 @@ +ALTER TABLE freeswitchcdr DROP callid; +ALTER TABLE chanvars DROP callid; +ALTER TABLE chanvars ADD myuuid char(36) NOT NULL FIRST; \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/schema.sql Thu Oct 19 11:38:42 2006 @@ -0,0 +1,34 @@ +create table freeswitchcdr ( + callid bigint unsigned default 0 primary key, /* This will need to be handled specially for auto increment, as that might not be standard */ + callstartdate datetime NOT NULL, + callanswerdate datetime NOT NULL, + callenddate datetime NOT NULL, + originated tinyint default 0, + clid varchar(80) default "Freeswitch - Unknown", + src varchar(80) NOT NULL, + dst varchar(80) NOT NULL, + ani varchar(80) default "", + aniii varchar(80) default "", + dialplan varchar(80) default "", + myuuid char(36) NOT NULL, + destuuid char(36) NOT NULL, + srcchannel varchar(80) NOT NULL, + dstchannel varchar(80) NOT NULL, /* Need to decide - this might be redundant as you can link the records via uuid */ + lastapp varchar(80) default "", + lastdata varchar(255) default "", + billusec bigint default 0, + disposition tinyint default 0, /* 0 = Busy or Unanswered, 1 = Answered */ + hangupcause int default 0, + amaflags tinyint default 0 +); + +create index myuuid_index on freeswitchcdr (myuuid); +create index destuuid_index on freeswitchcdr (destuuid); + +create table chanvars ( + callid bigint unsigned default 0, + varname varchar(80) NOT NULL, + varvalue varchar(255) default "" +); + +create index callid_index on chanvars(callid,varname); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,476 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: his C++ header file describes the SqliteCDR class which handles formatting a CDR out to + * a SQLite database using prepared statements. + * + * sqlitecdr.cpp + * + */ + +#include <switch.h> +#include <cstring> +#include <iostream> +#include "sqlitecdr.h" + +SqliteCDR::SqliteCDR() : BaseCDR() +{ + +} + +SqliteCDR::SqliteCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + if(newchannel != 0) + { + if(chanvars_fixed_list.size() > 0) + process_channel_variables(chanvars_fixed_list,newchannel->channel); + + if(chanvars_supp_list.size() > 0) + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat_fixed_in_supp); + } +} + +SqliteCDR::~SqliteCDR() +{ + +} + +bool SqliteCDR::connectionstate = 0; +bool SqliteCDR::logchanvars = 0; +bool SqliteCDR::repeat_fixed_in_supp = 0; +std::list<std::string> SqliteCDR::chanvars_fixed_list; +std::list<std::string> SqliteCDR::chanvars_supp_list; +std::vector<switch_mod_cdr_sql_types_t> SqliteCDR::chanvars_fixed_types; +bool SqliteCDR::activated = 0; +char SqliteCDR::sql_query[1024] = ""; +std::string SqliteCDR::tmp_sql_query; +char SqliteCDR::sql_query_chanvars[100] = ""; +std::string SqliteCDR::db_filename; +switch_core_db_t* SqliteCDR::db = 0; +switch_core_db_stmt_t* SqliteCDR::stmt=0; +switch_core_db_stmt_t* SqliteCDR::stmt_chanvars=0; + +void SqliteCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + if(activated) + disconnect(); + + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + int count_config_params = 0; // Need to make sure all params are set before we load + if ((settings = switch_xml_child(cfg, "sqlitecdr"))) + { + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "path")) + { + if(val != 0) + { + db_filename = val; + db_filename.append(SWITCH_PATH_SEPARATOR); + db_filename.append("sqlitecdr.db"); + count_config_params++; + } + } + else if(!strcmp(var,"chanvars_fixed")) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + parse_channel_variables_xconfig(unparsed,chanvars_fixed_list,chanvars_fixed_types); + //logchanvars=1; + } + } + else if(!strcmp(var,"chanvars_supp")) + { + if(val != 0) + { + std::string unparsed = val; + bool fixed = 0; + logchanvars = 1; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + } + } + else if(!strcmp(var,"chanvars_supp_repeat_fixed")) + { + if(val != 0) + { + std::string repeat = val; + if(repeat == "Y" || repeat == "y" || repeat == "1") + repeat_fixed_in_supp = 1; + } + } + } + + if (count_config_params==1) + activated = 1; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"You did not specify the minimum parameters for using this module. You must specify an explicit (complete) path to the location of the database file in order to use SqliteCDR.\n"); + + if(activated) + { + tmp_sql_query = "INSERT INTO freeswitchcdr (callstartdate,callanswerdate,callenddate,originated,clid,src,dst,ani,aniii,dialplan,myuuid,destuuid,srcchannel,dstchannel,lastapp,lastdata,billusec,disposition,hangupcause,amaflags"; + + int items_appended = 0; + + if(chanvars_fixed_list.size() > 0 ) + { + std::list<std::string>::iterator iItr, iEnd; + for(iItr = chanvars_fixed_list.begin(), iEnd = chanvars_fixed_list.end(); iItr != iEnd; iItr++) + { + if(iItr->size() > 0) + { + tmp_sql_query.append(","); + tmp_sql_query.append(*iItr); + items_appended++; + } + } + } + + tmp_sql_query.append(") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?"); + + if(chanvars_fixed_list.size() > 0 ) + { + for(int i = 0; i < items_appended; i++) + tmp_sql_query.append(",?"); + } + + tmp_sql_query.append(")"); + + char tempsql_query_chanvars[] = "INSERT INTO chanvars (callid,varname,varvalue) VALUES(?,?,?)"; + memset(sql_query_chanvars,0,100); + strncpy(sql_query_chanvars,tempsql_query_chanvars,strlen(tempsql_query_chanvars)); + + strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); + + switch_core_db_open(db_filename.c_str(),&db); + + char sql_query_check_tables[] = "SELECT name FROM sqlite_master WHERE type = \"table\""; + char **result; + int nrow = 0, ncol = 0; + char *errormessage; + int sql_rc = switch_core_db_get_table(db,sql_query_check_tables,&result,&nrow,&ncol,&errormessage); + + std::map<std::string,bool> temp_chanvars_map; + // Now to copy out all the chanvars from the list into + + std::hash<std::string,bool> temp_sql_tables; + temp_sql_tables["freeswitchcdr"] = 0; + temp_sql_tables["chanvars"] = 0; + + if(sql_rc == SQLITE_OK) + for(int i = 0; i < nrows; i++) + { + std::string tablename = result[i]; + if(tablename == "freeswitchcdr" || tablename == "chanvars") + { + temp_sql_tables[tablename] = 1; + } + } + else + switch_console_printf(SWITCH_CHANNEL_LOG,"There was an error in executing query %s: The error was %s.\n",sql_query_check_tables,errormessage); + + if(!temp_sql_tables["freeswitchcdr"]) + { + // Must create the missing freeswitchcdr table. + + } + } + } +} + +bool SqliteCDR::is_activated() +{ + return activated; +} + +void SqliteCDR::tempdump_record() +{ + +} + +void SqliteCDR::reread_tempdumped_records() +{ + +} + + +bool SqliteCDR::process_record() +{ + std::list<void*> temp_chanvars_holder; // This is used for any fixed chanvars, as we don't want things out of scope + + if(chanvars_fixed_list.size() > 0) + { + switch_size_t i = 0; // temporary variable, i is current spot on the string of types + std::list<std::pair<std::string,std::string> >::iterator iItr, iEnd; + for(iItr = chanvars_fixed.begin(), iEnd = chanvars_fixed.end(); iItr != iEnd; iItr++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_INTEGER: + { + int* x = new int; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_LONG,is_null); + break; + } + case CDR_DOUBLE: + { + double* x = new double; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_DOUBLE,is_null); + break; + } + case CDR_TINY: + { + short* x = new short; + *x = 0; + bool* is_null = new bool; + *is_null = 0; + if(iItr->second.size() > 0) + { + std::istringstream istring(iItr->second); + istring >> *x; + } + else + *is_null = 1; + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + add_parameter(*x,MYSQL_TYPE_TINY,is_null); + break; + } + case CDR_STRING: + case CDR_DECIMAL: + { + long unsigned int* stringlength = new long unsigned int; + *stringlength = (long unsigned int)(iItr->second.size()); + + char* x = new char[(*stringlength+1)]; + strncpy(x,iItr->second.c_str(),*stringlength); + + bool* is_null = new bool; + *is_null = 0; + add_string_parameter(x,*stringlength,MYSQL_TYPE_VAR_STRING,is_null); + + temp_chanvars_holder.push_back(stringlength); + temp_chanvars_holder.push_back(x); + temp_chanvars_holder.push_back(is_null); + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + i++; + } + } + + MYSQL_BIND *bindmetemp; + bindmetemp = new MYSQL_BIND[bindme.size()]; + copy(bindme.begin(), bindme.end(), bindmetemp); + + for(int mysql_ping_result = -1, count = 0, mysql_stmt_error_code = -1; mysql_ping_result != 0 && count < 5 && mysql_stmt_error_code != 0 ; count++) + { + mysql_ping_result = mysql_ping(conn); + if(mysql_ping_result) + { + switch(mysql_ping_result) + { + case CR_SERVER_GONE_ERROR: + case CR_SERVER_LOST: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); + connect_to_database(); + break; + } + default: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); + connect_to_database(); + } + } + } + else + { + mysql_stmt_bind_param(stmt,bindmetemp); + mysql_stmt_error_code = mysql_stmt_execute(stmt); + + if(mysql_stmt_error_code != 0) + { + errorstate = 1; + switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); + + const char* mysql_stmt_error_string = mysql_stmt_error(stmt); + switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); + } + else + errorstate = 0; + + if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) + { + long long insertid = mysql_stmt_insert_id(stmt); + + std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; + iEnd = chanvars_supp.end(); + for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + { + MYSQL_BIND bindme_chanvars[3]; + memset(bindme_chanvars,0,sizeof(bindme_chanvars)); + + bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; + bindme_chanvars[0].buffer = &insertid; + + std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); + tempfirstvector.push_back('\0'); + char* varname_temp = &tempfirstvector[0]; + + bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; + long unsigned int varname_length = (long unsigned int)(iItr->first.size()); + bindme_chanvars[1].length = &varname_length; + bindme_chanvars[1].buffer_length = varname_length; + bindme_chanvars[1].buffer = varname_temp; + + std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); + tempsecondvector.push_back('\0'); + char* varvalue_temp = &tempsecondvector[0]; + + bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; + if(iItr->second.size() == 0) + bindme_chanvars[2].is_null = (my_bool*)1; + else + { + long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); + bindme_chanvars[2].length = &varvalue_length; + bindme_chanvars[2].buffer_length = varvalue_length; + bindme_chanvars[2].buffer = varvalue_temp; + } + + mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); + mysql_stmt_execute(stmt_chanvars); + } + } + + if(errorstate == 0) + mysql_commit(conn); + else + mysql_rollback(conn); + } + } + + delete [] bindmetemp; + if(temp_chanvars_holder.size() > 0) + { + std::string::size_type i = 0, j = chanvars_fixed_types.size(); + for(; i < j ; i++) + { + switch(chanvars_fixed_types[i]) + { + case CDR_STRING: + case CDR_DECIMAL: + { + long unsigned int* stringlength = (long unsigned int*)temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete stringlength; + char* tempstring = (char*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete [] tempstring; + break; + } + case CDR_INTEGER: + { + int* tempint = (int*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempint; + break; + } + case CDR_DOUBLE: + { + double* tempdouble = (double*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempdouble; + break; + } + case CDR_TINY: + { + short* tempshort = (short*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempshort; + break; + } + default: + switch_console_printf(SWITCH_CHANNEL_LOG,"We should not get to this point in this switch/case statement.\n"); + } + + bool* tempbool = (bool*) temp_chanvars_holder.front(); + temp_chanvars_holder.pop_front(); + delete tempbool; + } + } + return 1; +} + +void SqliteCDR::disconnect() +{ + switch_core_db_close(db); + activated = 0; + logchanvars = 0; + chanvars_fixed_list.clear(); + chanvars_supp_list.clear(); + chanvars_fixed_types.clear(); + connectionstate = 0; + tmp_sql_query.clear(); +} + + +AUTO_REGISTER_BASECDR(SqliteCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/sqlitecdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,72 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * + * Description: This C++ header file describes the SqliteCDR class which handles formatting a CDR out to + * a SQLite database using prepared statements. + * + * sqlitecdr.h + * + */ + +#include "baseregistry.h" +#include <list> +#include <sstream> + +#ifndef SQLITECDR +#define SQLITECDR + +class SqliteCDR : public BaseCDR { + public: + SqliteCDR(); + SqliteCDR(switch_mod_cdr_newchannel_t *newchannel); + //SqliteCDR(const SqliteCDR& copyFrom); + virtual ~SqliteCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; + static char sql_query[1024]; + static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql + static char sql_query_chanvars[100]; + static std::string db_filename; + static switch_core_db *db; + static switch_core_db_stmt_t *stmt; + static switch_core_db_stmt_t *stmt_chanvars; + static bool connectionstate; + static bool logchanvars; + static std::list<std::string> chanvars_fixed_list; + static std::vector<switch_mod_cdr_sql_types_t> chanvars_fixed_types; + static std::list<std::string> chanvars_supp_list; // The supplemental list + static bool repeat_fixed_in_supp; +}; + +#endif Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Thu Oct 19 11:38:42 2006 @@ -0,0 +1,221 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Ken Rice of Asteria Solutions Group, INC <ken AT asteriasgi.com> + * + * Description: This C++ source file describes the XmlCDR class which handles formatting a CDR out to + * individual text files in a XML format. + * + * xmlcdr.cpp + * + */ + +#include <switch.h> +#include "xmlcdr.h" + +XmlCDR::XmlCDR() : BaseCDR() +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); +} + +XmlCDR::XmlCDR(switch_mod_cdr_newchannel_t *newchannel) : BaseCDR(newchannel) +{ + memset(formattedcallstartdate,0,100); + memset(formattedcallanswerdate,0,100); + memset(formattedcallenddate,0,100); + + if(newchannel != 0) + { + switch_time_exp_t tempcallstart, tempcallanswer, tempcallend; + memset(&tempcallstart,0,sizeof(tempcallstart)); + memset(&tempcallanswer,0,sizeof(tempcallanswer)); + memset(&tempcallend,0,sizeof(tempcallend)); + switch_time_exp_lt(&tempcallstart, callstartdate); + switch_time_exp_lt(&tempcallanswer, callanswerdate); + switch_time_exp_lt(&tempcallend, callenddate); + + // Format the times + size_t retsizecsd, retsizecad, retsizeced; //csd == callstartdate, cad == callanswerdate, ced == callenddate, ceff == callenddate_forfile + char format[] = "%Y-%m-%d-%H-%M-%S"; + switch_strftime(formattedcallstartdate,&retsizecsd,sizeof(formattedcallstartdate),format,&tempcallstart); + switch_strftime(formattedcallanswerdate,&retsizecad,sizeof(formattedcallanswerdate),format,&tempcallanswer); + switch_strftime(formattedcallenddate,&retsizeced,sizeof(formattedcallenddate),format,&tempcallend); + + std::ostringstream ostring; + ostring << (callenddate/1000000); + std::string callenddate_forfile = ostring.str(); + + outputfile_name = outputfile_path; + outputfile_name.append(SWITCH_PATH_SEPARATOR); + outputfile_name.append(callenddate_forfile); // Make sorting a bit easier, kinda like Maildir does + outputfile_name.append("."); + outputfile_name.append(myuuid); // The goal is to have a resulting filename of "/path/to/myuuid" + outputfile_name.append(".xml"); // .xml - "XML Data Dumper" + + outputfile.open(outputfile_name.c_str()); + + bool repeat = 1; + process_channel_variables(chanvars_supp_list,chanvars_fixed_list,newchannel->channel,repeat); + } +} + +XmlCDR::~XmlCDR() +{ + outputfile.close(); +} + +bool XmlCDR::activated=0; +bool XmlCDR::logchanvars=0; +bool XmlCDR::connectionstate=0; +std::string XmlCDR::outputfile_path; +std::list<std::string> XmlCDR::chanvars_fixed_list; +std::list<std::string> XmlCDR::chanvars_supp_list; + +void XmlCDR::connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param) +{ + switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::connect() - Loading configuration file.\n"); + activated = 0; // Set it as inactive initially + connectionstate = 0; // Initialize it to false to show that we aren't yet connected. + + if ((settings = switch_xml_child(cfg, "xmlcdr"))) + { + int count_config_params = 0; // Need to make sure all params are set before we load + for (param = switch_xml_child(settings, "param"); param; param = param->next) + { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "path")) + { + if(val != 0) + outputfile_path = val; + count_config_params++; + } + else if (!strcmp(var, "chanvars")) + { + if(val != 0) + { + std::string unparsed; + unparsed = val; + if(unparsed.size() > 0) + { + bool fixed = 0; + parse_channel_variables_xconfig(unparsed,chanvars_supp_list,fixed); + logchanvars=1; + } + } + } + else if (!strcmp(var, "chanvars_fixed")) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"XmlCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + } + else if (!strcmp(var, "chanvars_supp")) + { + switch_console_printf(SWITCH_CHANNEL_LOG,"XmlCDR has no need for a fixed or supplemental list of channel variables due to the nature of the format. Please use the setting parameter of \"chanvars\" instead and try again.\n"); + } + } + + if(count_config_params > 0) + activated = 1; + else + switch_console_printf(SWITCH_CHANNEL_LOG,"XmlCDR::connect(): You did not specify the minimum parameters for using this module. You must specify at least a path to have the records logged to.\n"); + } +} + +bool XmlCDR::process_record() +{ + bool retval = 0; + if(!outputfile) + switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Unable to open file %s to commit the call record to. Invalid path name, invalid permissions, or no space available?\n",outputfile_name.c_str()); + else + { + switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Preping the CDR to %s.\n",outputfile_name.c_str()); + // Format the call record and proceed from here... + outputfile << "<?xml version=\"1.0\"?>" << std::endl; + outputfile << "<document type=\"freeswitch-cdr/xml\">" << std::endl; + outputfile << "\t<callstartdate data=\"" << callstartdate << "\" />" << std::endl; + outputfile << "\t<callanswerdate data=\"" << callanswerdate << "\" />" << std::endl; + outputfile << "\t<callenddate data=\"" << callenddate << "\" />" << std::endl; + outputfile << "\t<hangupcause data=\"" << hangupcause_text << "\" />" << std::endl; + outputfile << "\t<hangupcausecode data=\"" << hangupcause << "\" />" << std::endl; + outputfile << "\t<clid data=\"" << clid << "\" />" << std::endl; + outputfile << "\t<originated data=\"" << originated << "\" />" << std::endl; + outputfile << "\t<dialplan data=\"" << dialplan << "\" />" << std::endl; + outputfile << "\t<myuuid data=\"" << myuuid << "\" />" << std::endl; + outputfile << "\t<destuuid data=\"" << destuuid << "\" />" << std::endl; + outputfile << "\t<src data=\"" << src << "\" />" << std::endl; + outputfile << "\t<dst data=\"" << dst << "\" />" << std::endl; + outputfile << "\t<srcchannel data=\"" << srcchannel << "\" />" << std::endl; + outputfile << "\t<dstchannel data=\"" << dstchannel << "\" />" << std::endl; + outputfile << "\t<ani data=\"" << ani << "\" />" << std::endl; + outputfile << "\t<aniii data=\"" << aniii << "\" />" << std::endl; + outputfile << "\t<network_addr data=\"" << network_addr << "\" />" << std::endl; + outputfile << "\t<lastapp data=\"" << lastapp << "\" />" << std::endl; + outputfile << "\t<lastdata data=\"" << lastdata << "\" />" << std::endl; + outputfile << "\t<billusec data=\"" << billusec << "\" />" << std::endl; + outputfile << "\t<disposition data=\"" << disposition << "\" />" << std::endl; + outputfile << "\t<amaflags data=\"" << amaflags << "\" />" << std::endl; + + // Now to process chanvars + outputfile << "\t<chanvars>" << std::endl; + if(chanvars_supp.size() > 0 ) + { + std::map<std::string,std::string>::iterator iItr,iEnd; + for(iItr = chanvars_supp.begin(), iEnd = chanvars_supp.end() ; iItr != iEnd; iItr++) + outputfile << "\t\t<variable name=\"" << iItr->first << "\" data= \"" << iItr->second << "\" />" << std::endl; + } + outputfile << "\t</chanvars>" << std::endl << "</document>" << std::endl << std::endl; + + switch_console_printf(SWITCH_CHANNEL_LOG, "XmlCDR::process_record(): Dumping the CDR to %s.\n",outputfile_name.c_str()); + retval = 1; + } + + return retval; +} + +bool XmlCDR::is_activated() +{ + return activated; +} + +void XmlCDR::tempdump_record() +{ + +} + +void XmlCDR::reread_tempdumped_records() +{ + +} + +void XmlCDR::disconnect() +{ + switch_console_printf(SWITCH_CHANNEL_LOG,"Shutting down XmlCDR... Done!"); +} + +AUTO_REGISTER_BASECDR(XmlCDR); Added: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/xmlcdr.h Thu Oct 19 11:38:42 2006 @@ -0,0 +1,72 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * Copyright 2006, Author: Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application Call Detail Recorder module + * + * The Initial Developer of the Original Code is + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Ken Rice, Asteria Solutions Group, Inc. <ken AT asteriasgi.com> + * + * Description: This C++ header file describes the XmlCDR class which handles formatting a CDR out to + * individual text files in a XML format. + * + * xmlcdr.h + * + */ + +#include "baseregistry.h" +#include <switch.h> +#include <iostream> +#include <sstream> +#include <fstream> +#include <list> + +#ifndef XMLCDR +#define XMLCDR + +class XmlCDR : public BaseCDR { + public: + XmlCDR(); + XmlCDR(switch_mod_cdr_newchannel_t *newchannel); + virtual ~XmlCDR(); + virtual bool process_record(); + virtual void connect(switch_xml_t& cfg, switch_xml_t& xml, switch_xml_t& settings, switch_xml_t& param); // connect and disconnect need to be static because we're persisting connections until shutdown + virtual void disconnect(); + virtual bool is_activated(); + virtual void tempdump_record(); + virtual void reread_tempdumped_records(); + + private: + static bool activated; // Is this module activated? + static bool connectionstate; // What is the status of the connection? + static bool logchanvars; + static std::string outputfile_path; // The directory we'll dump these into + static std::list<std::string> chanvars_fixed_list; // Normally this would be used, but not in this class + static std::list<std::string> chanvars_supp_list; // This will hold the list for all chanvars here + char formattedcallstartdate[100]; + char formattedcallanswerdate[100]; + char formattedcallenddate[100]; + std::string outputfile_name; + std::ofstream outputfile; +}; + +#endif

1 0

[commit] r3102 - freeswitch/branches/mishehu/trunk
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mishehu Date: Thu Oct 19 11:27:22 2006 New Revision: 3102 Removed: freeswitch/branches/mishehu/trunk/ Log: Ugh.

1 0

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

19 Oct '06

Author: anthm Date: Thu Oct 19 03:13:34 2006 New Revision: 3101 Modified: freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_loadable_module.c Log: refactor earlier junk from this eve and add ken's propagate variable thing set this sometime before an origination (bridge etc). <action application="set" data="propagate_vars=my_cool_var1,my_cool_var2,foo,bar"/> and they should be cloned over to the new channel when it's substantiated Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Oct 19 03:13:34 2006 @@ -73,6 +73,8 @@ const switch_speech_interface_t *speech_interface; /*! the table of directory interfaces the module has implmented */ const switch_directory_interface_t *directory_interface; + /*! the table of chat interfaces the module has implmented */ + const switch_chat_interface_t *chat_interface; }; /*! @@ -162,6 +164,13 @@ \return the desired directory interface */ SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name); + +/*! + \brief Retrieve the chat interface by it's registered name + \param name the name of the chat interface + \return the desired chat interface + */ +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name); /*! Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Oct 19 03:13:34 2006 @@ -366,6 +366,14 @@ }; +/*! \brief Abstract interface to a chat module */ +struct switch_chat_interface { + /*! the name of the interface */ + const char *interface_name; + /*! function to open the directory interface */ + switch_status_t (*chat_send)(char *from, char *to, char *subject, char *body, char *hint); + const struct switch_chat_interface *next; +}; /*! \brief Abstract interface to a directory module */ struct switch_directory_interface { 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 19 03:13:34 2006 @@ -780,6 +780,7 @@ typedef struct switch_file_interface switch_file_interface_t; typedef struct switch_speech_interface switch_speech_interface_t; typedef struct switch_directory_interface switch_directory_interface_t; +typedef struct switch_chat_interface switch_chat_interface_t; typedef struct switch_core_port_allocator switch_core_port_allocator_t; typedef struct switch_media_bug switch_media_bug_t; typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); 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 19 03:13:34 2006 @@ -34,11 +34,11 @@ #define DL_CAND_WAIT 10000000 #define DL_CAND_INITIAL_WAIT 2000000 -#define JINGLE_KEY 1 #define DL_EVENT_LOGIN_SUCCESS "dingaling::login_success" #define DL_EVENT_LOGIN_FAILURE "dingaling::login_failure" #define DL_EVENT_CONNECTED "dingaling::connected" +#define MDL_CHAT_NAME "jingle" static const char modname[] = "mod_dingaling"; @@ -235,9 +235,6 @@ switch_core_db_t *db; char *p; - if (event->key == JINGLE_KEY) { - return; - } if (status && !strcasecmp(status, "n/a")) { status = show; @@ -295,11 +292,8 @@ switch_safe_free(sql); } -static void chat_event_handler(switch_event_t *event) +static switch_status_t chat_send(char *from, char *to, char *subject, char *body, char *hint) { - char *from = switch_event_get_header(event, "from"); - char *to = switch_event_get_header(event, "to"); - char *body = switch_event_get_body(event); char *user, *host, *f_user, *f_host = NULL; struct mdl_profile *profile = NULL; @@ -318,13 +312,14 @@ ldl_handle_send_msg(profile->handle, from, to, NULL, body); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile %s\n", f_host ? f_host : "NULL"); - return; + return SWITCH_STATUS_FALSE; } switch_safe_free(f_host); free(user); } + return SWITCH_STATUS_SUCCESS; } @@ -339,9 +334,6 @@ char *sql; switch_core_db_t *db; - if (event->key == JINGLE_KEY) { - return; - } if (status && !strcasecmp(status, "n/a")) { status = show; @@ -1252,8 +1244,11 @@ /*.next */ &logout_api_interface }; +static const switch_chat_interface_t channel_chat_interface = { + /*.name */ MDL_CHAT_NAME, + /*.chat_send */ chat_send, +}; - static const switch_loadable_module_interface_t channel_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ &channel_endpoint_interface, @@ -1261,7 +1256,12 @@ /*.dialplan_interface */ NULL, /*.codec_interface */ NULL, /*.application_interface */ NULL, - /*.api_interface */ &login_api_interface + /*.api_interface */ &login_api_interface, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ &channel_chat_interface + }; @@ -1427,11 +1427,6 @@ return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE, SWITCH_EVENT_SUBCLASS_ANY, chat_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } - /* connect my internal structure to the blank pointer passed to me */ *module_interface = &channel_module_interface; @@ -1828,50 +1823,55 @@ break; case LDL_SIGNAL_ROSTER: if (switch_event_create(&event, SWITCH_EVENT_ROSTER) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle"); - //event->key = JINGLE_KEY; + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_NAME); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_fire(&event); } break; case LDL_SIGNAL_PRESENCE_IN: if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_NAME); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", subject); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", "%s", msg); - //event->key = JINGLE_KEY; switch_event_fire(&event); } break; case LDL_SIGNAL_PRESENCE_OUT: if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_NAME); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); - //event->key = JINGLE_KEY; switch_event_fire(&event); } break; - case LDL_SIGNAL_MSG: - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "%s", subject); - event->key = JINGLE_KEY; - if (msg) { - switch_event_add_body(event, msg); - } + case LDL_SIGNAL_MSG: { + switch_chat_interface_t *ci; + char *proto = MDL_CHAT_NAME; + char *pproto = NULL; - if (profile->auto_reply) { - ldl_handle_send_msg(handle, (profile->user_flags & LDL_FLAG_COMPONENT) ? to : profile->login, from, "", profile->auto_reply); - } + if (profile->auto_reply) { + ldl_handle_send_msg(handle, (profile->user_flags & LDL_FLAG_COMPONENT) ? to : profile->login, from, "", profile->auto_reply); + } - switch_event_fire(&event); + if (strchr(to, '+')) { + pproto = strdup(to); + if ((to = strchr(pproto, '+'))) { + *to++ = '\0'; + } + proto = pproto; } + + if ((ci = switch_loadable_module_get_chat_interface(proto))) { + ci->chat_send(from, to, subject, msg, ""); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); + } + + switch_safe_free(pproto); + } break; case LDL_SIGNAL_LOGIN_SUCCESS: if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_LOGIN_SUCCESS) == SWITCH_STATUS_SUCCESS) { @@ -1971,7 +1971,7 @@ } if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "jingle"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", MDL_CHAT_NAME); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->login); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to); 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 19 03:13:34 2006 @@ -67,7 +67,7 @@ #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" #define SOFIA_USER_AGENT "FreeSWITCH(mod_sofia)" -#define SIP_KEY 2 +#define SOFIA_CHAT_NAME "sip" #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> @@ -407,6 +407,7 @@ static switch_status_t config_sofia(int reload); +static switch_status_t chat_send(char *from, char *to, char *subject, char *body, char *hint); /* BODY OF THE MODULE */ /*************************************************************************************************************************************************************/ @@ -853,7 +854,7 @@ char *at, *resource; char *user; - if (!strchr(s, '/') && !strchr(s, '@')) { + if (!strchr(s, '/')) { return NULL; } @@ -1820,7 +1821,6 @@ SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); - nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), @@ -1860,13 +1860,24 @@ /*.next */ NULL }; +static const switch_chat_interface_t sofia_chat_interface = { + /*.name */ SOFIA_CHAT_NAME, + /*.chat_send */ chat_send, + +}; + static const switch_loadable_module_interface_t sofia_module_interface = { /*.module_name */ modname, /*.endpoint_interface */ &sofia_endpoint_interface, /*.timer_interface */ NULL, /*.dialplan_interface */ NULL, /*.codec_interface */ NULL, - /*.application_interface */ NULL + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL, + /*.chat_interface */ &sofia_chat_interface }; @@ -2197,10 +2208,17 @@ char *to_addr; char *from_addr; char *p; + char *full_from; + char proto[512] = SOFIA_CHAT_NAME; + + full_from = sip_header_as_string(profile->home, (void *)sip->sip_from); if ((p=strchr(to_user, '+'))) { + switch_copy_string(proto, to_user, sizeof(proto)); + p = strchr(proto, '+'); + *p++ = '\0'; - if ((to_addr = strdup(++p))) { + if ((to_addr = strdup(p))) { p = strchr(to_addr, '+'); *p = '@'; } @@ -2209,7 +2227,7 @@ to_addr = switch_core_db_mprintf("%s@%s", to_user, to_host); } - from_addr = switch_core_db_mprintf("%s@%s", from_user, from_host); + from_addr = switch_core_db_mprintf("%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); set_hash_key(hash_key, sizeof(hash_key), sip); if ((tech_pvt = (private_object_t *) switch_core_hash_find(profile->chat_hash, hash_key))) { @@ -2220,7 +2238,6 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", tech_pvt->hash_key); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to_addr); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE"); - event->key = SIP_KEY; if (msg) { switch_event_add_body(event, msg); } @@ -2230,25 +2247,20 @@ } } } else { - - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", from_addr); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "to", "%s", to_addr); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "subject", "SIMPLE MESSAGE"); - event->key = SIP_KEY; - if (msg) { - switch_event_add_body(event, msg); - } - - switch_event_fire(&event); - + switch_chat_interface_t *ci; + + if ((ci = switch_loadable_module_get_chat_interface(proto))) { + ci->chat_send(from_addr, to_addr, "", msg, full_from); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invaid Chat Interface [%s]!\n", proto); } - + } switch_safe_free(to_addr); switch_safe_free(from_addr); + if (full_from) { + su_free(profile->home, full_from); + } } } @@ -2843,7 +2855,7 @@ if (switch_event_create(&event, SWITCH_EVENT_ROSTER) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); - event->key = SIP_KEY; + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host); switch_event_fire(&event); } @@ -2851,8 +2863,8 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host); - + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Registered"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", "Registered"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); @@ -2862,7 +2874,7 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "unavailable"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", "unavailable"); @@ -3345,7 +3357,7 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", note_txt); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "show", "%s", status_txt); @@ -3356,7 +3368,7 @@ if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", profile->url); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s+%s@%s", SOFIA_CHAT_NAME, from_user, from_host); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "%s", event_type); switch_event_fire(&event); @@ -4452,38 +4464,46 @@ return 0; } -static void chat_event_handler(switch_event_t *event) +static switch_status_t chat_send(char *from, char *to, char *subject, char *body, char *hint) { - char *from = switch_event_get_header(event, "from"); - char *to = switch_event_get_header(event, "to"); - char *body = switch_event_get_body(event); char buf[256]; char *user, *host; sofia_profile_t *profile; - char *from_p = NULL, *from_pp = NULL; - - if (event->key == SIP_KEY) { - return; - } - + char *from_p = NULL, *from_pp = NULL, *from_ppp = NULL; + if (to && (user = strdup(to))) { if ((host = strchr(user, '@'))) { *host++ = '\0'; } - + if (!host || !(profile = (sofia_profile_t *) switch_core_hash_find(globals.profile_hash, host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile %s\n", host ? host : "NULL"); - return; + return SWITCH_STATUS_FALSE; } if (find_reg_url(profile, user, host, buf, sizeof(buf))) { nua_handle_t *msg_nh; - + if ((from_p = encode_name(from))) { - from_pp = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", from, from_p, host); + char *p, *q = NULL; + + from_ppp = strdup(from_p); + if ((p = strchr(from_ppp, '+'))) { + *p++ = '\0'; + if ((q = strchr(p, '+'))) { + *q = '@'; + } + } + if (!p) { + p = from; + } + from_pp = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", p, from_p, host); from = from_pp; + } else { + from = hint; } + msg_nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(from), NUTAG_URL(buf), @@ -4491,19 +4511,22 @@ SIPTAG_CONTACT_STR(profile->url), TAG_END()); - nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid chat dest"); } + switch_safe_free(from_p); switch_safe_free(from_pp); + switch_safe_free(from_ppp); free(user); } - + return SWITCH_STATUS_SUCCESS; } static void pres_event_handler(switch_event_t *event) @@ -4521,9 +4544,6 @@ char *resource; switch_core_db_t *db; - if (event->key == SIP_KEY) { - return; - } if (event->event_id == SWITCH_EVENT_ROSTER) { sql = switch_core_db_mprintf("select 1,'%q',* from sip_subscriptions where event='presence'", status ? status : "Available"); @@ -4654,10 +4674,6 @@ config_sofia(0); - if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE, SWITCH_EVENT_SUBCLASS_ANY, chat_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); - return SWITCH_STATUS_GENERR; - } if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 19 03:13:34 2006 @@ -1375,11 +1375,31 @@ } if (channel && peer_channel) { + char *propagate_vars; + /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ + if ((propagate_vars = switch_channel_get_variable(channel, "propagate_vars"))) { + char *cptmp = switch_core_session_strdup(session, propagate_vars); + int argc; + char *argv[256]; + + if ((argc = switch_separate_string(cptmp, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + int x; + + for (x = 0; x < argc; x++) { + char *val; + if ((val = switch_channel_get_variable(channel, argv[x]))) { + switch_channel_set_variable(peer_channel, argv[x], val); + } + } + } + } + if (profile) { if ((cloned_profile = switch_caller_profile_clone(*new_session, profile)) != 0) { switch_channel_set_originator_caller_profile(peer_channel, cloned_profile); } } + if (peer_profile) { if (session && (cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) { switch_channel_set_originatee_caller_profile(channel, cloned_profile); Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Oct 19 03:13:34 2006 @@ -52,6 +52,7 @@ switch_hash_t *file_hash; switch_hash_t *speech_hash; switch_hash_t *directory_hash; + switch_hash_t *chat_hash; switch_memory_pool_t *pool; }; @@ -230,6 +231,20 @@ switch_core_hash_insert(loadable_modules.directory_hash, (char *) ptr->interface_name, (void *) ptr); } } + + if (new_module->module_interface->chat_interface) { + const switch_chat_interface_t *ptr; + + for (ptr = new_module->module_interface->chat_interface; ptr; ptr = ptr->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Adding Chat interface '%s'\n", ptr->interface_name); + if (switch_event_create(&event, SWITCH_EVENT_MODULE_LOAD) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "type", "chat"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "name", "%s", ptr->interface_name); + switch_event_fire(&event); + } + switch_core_hash_insert(loadable_modules.chat_hash, (char *) ptr->interface_name, (void *) ptr); + } + } return SWITCH_STATUS_SUCCESS; @@ -476,6 +491,7 @@ switch_core_hash_init(&loadable_modules.file_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.speech_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.directory_hash, loadable_modules.pool); + switch_core_hash_init(&loadable_modules.chat_hash, loadable_modules.pool); switch_core_hash_init(&loadable_modules.dialplan_hash, loadable_modules.pool); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { @@ -635,6 +651,11 @@ SWITCH_DECLARE(switch_directory_interface_t *) switch_loadable_module_get_directory_interface(char *name) { return switch_core_hash_find(loadable_modules.directory_hash, name); +} + +SWITCH_DECLARE(switch_chat_interface_t *) switch_loadable_module_get_chat_interface(char *name) +{ + return switch_core_hash_find(loadable_modules.chat_hash, name); } SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool_t *pool, const switch_codec_implementation_t **array,

1 0

[commit] r3100 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mikej Date: Thu Oct 19 02:30:15 2006 New Revision: 3100 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Log: add xmlcdr to windows build of mod_cdr. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Thu Oct 19 02:30:15 2006 @@ -396,6 +396,10 @@ RelativePath=".\pddcdr.cpp" > </File> + <File + RelativePath=".\xmlcdr.cpp" + > + </File> </Filter> <Filter Name="Header Files" @@ -424,6 +428,10 @@ </File> <File RelativePath=".\pddcdr.h" + > + </File> + <File + RelativePath=".\xmlcdr.h" > </File> </Filter>

1 0

[commit] r3099 - in freeswitch/trunk/libs/srtp: . crypto/cipher crypto/hash crypto/kernel crypto/math crypto/replay crypto/rng include
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: mikej Date: Thu Oct 19 02:29:49 2006 New Revision: 3099 Modified: freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c freeswitch/trunk/libs/srtp/crypto/kernel/err.c freeswitch/trunk/libs/srtp/crypto/math/datatypes.c freeswitch/trunk/libs/srtp/crypto/math/stat.c freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c freeswitch/trunk/libs/srtp/include/srtp.h freeswitch/trunk/libs/srtp/libsrtp.vcproj Log: up the msvc warning level on srtp Modified: freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c (original) +++ freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c Thu Oct 19 02:29:49 2006 @@ -49,6 +49,9 @@ #include "aes_icm.h" #include "alloc.h" +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif debug_module_t mod_aes_icm = { 0, /* debugging is off by default */ @@ -367,7 +370,7 @@ for (i=0; i < (bytes_to_encr/sizeof(v128_t)); i++) { /* fill buffer with new keystream */ - aes_icm_advance_ismacryp(c, forIsmacryp); + aes_icm_advance_ismacryp(c, (uint8_t)forIsmacryp); /* * add keystream into the data buffer (this would be a lot faster @@ -415,7 +418,7 @@ if ((bytes_to_encr & 0xf) != 0) { /* fill buffer with new keystream */ - aes_icm_advance_ismacryp(c, forIsmacryp); + aes_icm_advance_ismacryp(c, (uint8_t)forIsmacryp); for (i=0; i < (bytes_to_encr & 0xf); i++) *buf++ ^= c->keystream_buffer.v8[i]; Modified: freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c (original) +++ freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c Thu Oct 19 02:29:49 2006 @@ -155,7 +155,7 @@ test_case->ciphertext_length_octets)); /* compare the resulting ciphertext with that in the test case */ - if (len != test_case->ciphertext_length_octets) + if ((int)len != test_case->ciphertext_length_octets) return err_status_algo_fail; status = err_status_ok; for (i=0; i < test_case->ciphertext_length_octets; i++) @@ -222,7 +222,7 @@ test_case->plaintext_length_octets)); /* compare the resulting plaintext with that in the test case */ - if (len != test_case->plaintext_length_octets) + if ((int)len != test_case->plaintext_length_octets) return err_status_algo_fail; status = err_status_ok; for (i=0; i < test_case->plaintext_length_octets; i++) @@ -344,7 +344,7 @@ octet_string_hex_string(buffer, length)); /* compare the resulting plaintext with the original one */ - if (length != plaintext_len) + if ((int)length != plaintext_len) return err_status_algo_fail; status = err_status_ok; for (i=0; i < plaintext_len; i++) Modified: freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c (original) +++ freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c Thu Oct 19 02:29:49 2006 @@ -48,6 +48,10 @@ #include "null_cipher.h" #include "alloc.h" +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif + /* the null_cipher uses the cipher debug module */ extern debug_module_t mod_cipher; Modified: freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c (original) +++ freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c Thu Oct 19 02:29:49 2006 @@ -48,6 +48,10 @@ #include "null_auth.h" #include "alloc.h" +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif + /* null_auth uses the auth debug module */ extern debug_module_t mod_auth; Modified: freeswitch/trunk/libs/srtp/crypto/kernel/err.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/kernel/err.c (original) +++ freeswitch/trunk/libs/srtp/crypto/kernel/err.c Thu Oct 19 02:29:49 2006 @@ -42,6 +42,10 @@ * */ +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif + #include "err.h" #ifdef ERR_REPORTING_SYSLOG Modified: freeswitch/trunk/libs/srtp/crypto/math/datatypes.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/math/datatypes.c (original) +++ freeswitch/trunk/libs/srtp/crypto/math/datatypes.c Thu Oct 19 02:29:49 2006 @@ -149,10 +149,9 @@ case ('E'): return 0xe; case ('f'): return 0xf; case ('F'): return 0xf; - default: return -1; /* this flags an error */ } - /* NOTREACHED */ - return -1; /* this keeps compilers from complaining */ + /* this flags an error */ + return -1; } int @@ -179,7 +178,7 @@ tmp = hex_char_to_nibble(hex[0]); if (tmp == -1) return hex_len; - x = (tmp << 4); + x = (uint8_t)(tmp << 4); hex_len++; tmp = hex_char_to_nibble(hex[1]); if (tmp == -1) @@ -564,8 +563,6 @@ return 63; case '=': return 64; - default: - return -1; } return -1; } @@ -586,7 +583,7 @@ tmp = base64_char_to_sextet(base64[0]); if (tmp == -1) return base64_len; - x = (tmp << 6); + x = (uint8_t)(tmp << 6); base64_len++; tmp = base64_char_to_sextet(base64[1]); if (tmp == -1) Modified: freeswitch/trunk/libs/srtp/crypto/math/stat.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/math/stat.c (original) +++ freeswitch/trunk/libs/srtp/crypto/math/stat.c Thu Oct 19 02:29:49 2006 @@ -28,7 +28,7 @@ ones_count = 0; while (data < data_end) { - ones_count += octet_get_weight(*data); + ones_count = (uint16_t)(ones_count + octet_get_weight(*data)); data++; } Modified: freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c (original) +++ freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c Thu Oct 19 02:29:49 2006 @@ -229,7 +229,7 @@ if (delta > 0) { /* shift forward by delta */ - index_advance(&rdbx->index, delta); + index_advance(&rdbx->index, (sequence_number_t)delta); v128_left_shift(&rdbx->bitmask, delta); v128_set_bit(&rdbx->bitmask, 127); } else { Modified: freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c (original) +++ freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c Thu Oct 19 02:29:49 2006 @@ -47,6 +47,9 @@ #include "ut_sim.h" +#ifdef _MSC_VER +#pragma warning(disable:4100) +#endif int ut_compar(const void *a, const void *b) { Modified: freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c (original) +++ freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c Thu Oct 19 02:29:49 2006 @@ -97,7 +97,7 @@ /* rand() returns 0-32767 (ugh) */ /* Is this a good enough way to get random bytes? It is if it passes FIPS-140... */ - *dst++ = val & 0xff; + *dst++ = (uint8_t)(val & 0xff); len--; } #endif Modified: freeswitch/trunk/libs/srtp/include/srtp.h ============================================================================== --- freeswitch/trunk/libs/srtp/include/srtp.h (original) +++ freeswitch/trunk/libs/srtp/include/srtp.h Thu Oct 19 02:29:49 2006 @@ -52,6 +52,7 @@ #ifdef _MSC_VER #pragma pack(4) +#pragma warning(disable:4214) #endif #include "crypto_kernel.h" Modified: freeswitch/trunk/libs/srtp/libsrtp.vcproj ============================================================================== --- freeswitch/trunk/libs/srtp/libsrtp.vcproj (original) +++ freeswitch/trunk/libs/srtp/libsrtp.vcproj Thu Oct 19 02:29:49 2006 @@ -52,7 +52,8 @@ RuntimeLibrary="3" StructMemberAlignment="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> @@ -119,7 +120,8 @@ RuntimeLibrary="2" StructMemberAlignment="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> @@ -189,7 +191,8 @@ RuntimeLibrary="3" StructMemberAlignment="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" /> @@ -271,7 +274,8 @@ RuntimeLibrary="2" StructMemberAlignment="0" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" />

1 0

[commit] r3098 - freeswitch/branches/mishehu/trunk
by Freeswitch SVN 19 Oct '06

19 Oct '06

Author: brian Date: Thu Oct 19 00:28:12 2006 New Revision: 3098 Added: freeswitch/branches/mishehu/trunk/ - copied from r3097, /freeswitch/trunk/ Log: copy branch

1 0