sipwise
/
mediator
mirror of https://github.com/sipwise/mediator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#24226 parse MOS JSON values and store in CDR sub-tables

Browse Source 
Change-Id: I02b91b03530ff29ccde70517b55475df874a8ba3
changes/52/17352/9
Richard Fuchs 8 years ago
parent 7050bfab46
commit 092b67b76c
5 changed files with 114 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -9,9 +9,11 @@ CPPFLAGS := -DMEDIATOR_VERSION="\"$(VERSION)\""
GLIB_CFLAGS := $(shell pkg-config glib-2.0 --cflags)
CFLAGS := -I/usr/include/mysql $(GLIB_CFLAGS) -g -Wall -O2 -D_GNU_SOURCE
#CFLAGS += -DWITH_TIME_CALC
CFLAGS += $(shell pkg-config json-c --cflags)
GLIB_LDFLAGS := $(shell pkg-config glib-2.0 --libs)
LDFLAGS := $(GLIB_LDFLAGS) -lmysqlclient
LDFLAGS += $(shell pkg-config json-c --libs)
CFILES := $(wildcard *.c)
OFILES := $(CFILES:.c=.o)

86
cdr.c
Unescape View File

@ -1,4 +1,5 @@
#include <ctype.h>
#include <json.h>
#include "cdr.h"
#include "medmysql.h"
@ -580,6 +581,72 @@ static int cdr_parse_dstleg(char *dstleg, cdr_entry_t *cdr)
}
static int cdr_parse_json_get_int(json_object *obj, const char *key, int *outp) {
json_object *int_obj;
if (!json_object_object_get_ex(obj, key, &int_obj))
return 0;
if (!json_object_is_type(int_obj, json_type_int))
return 0;
*outp = json_object_get_int64(int_obj);
return 1;
}
static int cdr_parse_json_get_double(json_object *obj, const char *key, double *outp) {
json_object *int_obj;
if (!json_object_object_get_ex(obj, key, &int_obj))
return 0;
if (!json_object_is_type(int_obj, json_type_double))
return 0;
*outp = json_object_get_double(int_obj);
return 1;
}
static int cdr_parse_bye_dstleg(char *dstleg, mos_data_t *mos_data) {
syslog(LOG_DEBUG, "Parsing JSON: '%s'", dstleg);
json_object *json = json_tokener_parse(dstleg);
if (!json) {
syslog(LOG_ERR, "Could not parse JSON dst_leg string: '%s'", dstleg);
return -1;
}
if (!json_object_is_type(json, json_type_object)) {
syslog(LOG_ERR, "JSON type is not object: '%s'", dstleg);
goto err;
}
json_object *mos;
if (!json_object_object_get_ex(json, "mos", &mos)
|| !json_object_is_type(mos, json_type_object))
{
syslog(LOG_ERR, "JSON object does not contain 'mos' key: '%s'", dstleg);
goto err;
}
if (!cdr_parse_json_get_double(mos, "avg_score", &mos_data->avg_score)) {
syslog(LOG_ERR, "JSON object does not contain 'mos.avg_score' key: '%s'", dstleg);
goto err;
}
if (!cdr_parse_json_get_int(mos, "avg_packetloss", &mos_data->avg_packetloss)) {
syslog(LOG_ERR, "JSON object does not contain 'mos.avg_packetloss' key: '%s'", dstleg);
goto err;
}
if (!cdr_parse_json_get_int(mos, "avg_jitter", &mos_data->avg_jitter)) {
syslog(LOG_ERR, "JSON object does not contain 'mos.avg_jitter' key: '%s'", dstleg);
goto err;
}
if (!cdr_parse_json_get_int(mos, "avg_rtt", &mos_data->avg_rtt)) {
syslog(LOG_ERR, "JSON object does not contain 'mos.avg_rtt' key: '%s'", dstleg);
goto err;
}
mos_data->filled = 1;
json_object_put(json);
return 0;
err:
json_object_put(json);
return -1;
}
static int cdr_create_cdrs(med_entry_t *records, uint64_t count,
cdr_entry_t **cdrs, uint64_t *cdr_count, uint8_t *trash)
{
@ -590,8 +657,10 @@ static int cdr_create_cdrs(med_entry_t *records, uint64_t count,
char *endtime = NULL;
double unix_endtime = 0, tmp_unix_endtime = 0;
const char *call_status;
mos_data_t mos_data;
*cdr_count = 0;
memset(&mos_data, 0, sizeof(mos_data));
/* get end time from BYE's timestamp */
@ -602,10 +671,14 @@ static int cdr_create_cdrs(med_entry_t *records, uint64_t count,
{
++invites;
}
else if(e->method == MED_BYE && endtime == NULL)
else if(e->method == MED_BYE)
{
endtime = e->timestamp;
unix_endtime = e->unix_timestamp;
if (endtime == NULL) {
endtime = e->timestamp;
unix_endtime = e->unix_timestamp;
}
if (!mos_data.filled)
cdr_parse_bye_dstleg(e->dst_leg, &mos_data);
}
if (check_shutdown())
@ -638,8 +711,11 @@ static int cdr_create_cdrs(med_entry_t *records, uint64_t count,
cdr = &(*cdrs)[cdr_index];
e = &(records[i]);
if (!e->valid)
continue;
call_status = cdr_map_status(e->sip_code);
if(e->valid && e->method == MED_INVITE && call_status != NULL)
if(e->method == MED_INVITE && call_status != NULL)
{
++cdr_index;
@ -684,6 +760,8 @@ static int cdr_create_cdrs(med_entry_t *records, uint64_t count,
{
// TODO: error handling
}
cdr->mos = mos_data;
}
if (check_shutdown())

9
cdr.h
Unescape View File

@ -16,6 +16,14 @@
struct medmysql_batches;
typedef struct {
int filled;
double avg_score;
int avg_packetloss;
int avg_jitter;
int avg_rtt;
} mos_data_t;
typedef struct {
char call_id[128];
@ -70,6 +78,7 @@ typedef struct {
uint8_t split;
mos_data_t mos;
} cdr_entry_t;
int cdr_process_records(med_entry_t *records, uint64_t count, uint64_t *cdr_count, struct medmysql_batches *);

1
debian/control vendored
Unescape View File

@ -6,6 +6,7 @@ Build-Depends:
debhelper (>= 10),
default-libmysqlclient-dev | libmysqlclient15-dev,
libglib2.0-dev,
libjson-c-dev,
Standards-Version: 3.9.8
Homepage: https://www.sipwise.com/

38
medmysql.c
Unescape View File

@ -639,20 +639,20 @@ int medmysql_delete_entries(const char *callid, struct medmysql_batches *batches
#define CDRESCAPE(x) batches->cdrs.len += mysql_real_escape_string(med_handler->m, batches->cdrs.str + batches->cdrs.len, x, strlen(x))
/**********************************************************************/
static int medmysql_tag_record(GQueue *q, unsigned long cdr_id, unsigned long provider_id,
unsigned long direction_id, const char *value, double start_time, unsigned long tag_id)
{
cdr_tag_record *record = malloc(sizeof(*record));
record->cdr_id = cdr_id;
if (asprintf(&record->sql_record, "%lu, %lu, %lu, '%s', %f",
provider_id, direction_id, tag_id, value, start_time) <= 0)
{
free(record);
return -1;
}
g_queue_push_tail(q, record);
return 0;
}
// static int medmysql_tag_record(GQueue *q, unsigned long cdr_id, unsigned long provider_id,
// unsigned long direction_id, const char *value, double start_time, unsigned long tag_id)
// {
// cdr_tag_record *record = malloc(sizeof(*record));
// record->cdr_id = cdr_id;
// if (asprintf(&record->sql_record, "%lu, %lu, %lu, '%s', %f",
// provider_id, direction_id, tag_id, value, start_time) <= 0)
// {
// free(record);
// return -1;
// }
// g_queue_push_tail(q, record);
// return 0;
// }
static int medmysql_mos_record(GQueue *q, unsigned long cdr_id, double avg_score, int avg_packetloss,
int avg_jitter, int avg_rtt, double start_time)
{
@ -853,10 +853,12 @@ int medmysql_insert_cdrs(cdr_entry_t *entries, uint64_t count, struct medmysql_b
// if (medmysql_tag_record(&batches->cdr_tags, batches->num_cdrs, medmysql_tag_provider_reseller,
// medmysql_tag_direction_destination, "fdfhgs", e->start_time, 1))
// return -1;
// if (medmysql_mos_record(&batches->cdr_mos, batches->num_cdrs, e->mos.avg_score,
// e->mos.avg_packetloss, e->mos.avg_jitter, e->mos.avg_rtt,
// e->start_time))
// return -1;
if (e->mos.filled) {
if (medmysql_mos_record(&batches->cdr_mos, batches->num_cdrs, e->mos.avg_score,
e->mos.avg_packetloss, e->mos.avg_jitter, e->mos.avg_rtt,
e->start_time))
return -1;
}
batches->num_cdrs++;

Write Preview
Loading…
Cancel
Save