vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-02 17:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added -j option to generate JSON records

Browse source
This commit is contained in:
Alfredo Cardigliano 2019-07-19 20:21:33 +02:00
parent 5f95d0727b
commit 68e6bb86d2
1 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tools/json2tlv/json2tlv.cpp
View file

@ -116,8 +116,14 @@ void json_to_tlv(json_object * jobj, ndpi_serializer *serializer) {
/* *************************************** */
void print_help(char *bin) {
cerr << "Usage: " << bin << " -i <JSON file> [-z <ZMQ endpoint>] [-E <num encoding loops] [-D <num decoding loop>] [-v]\n";
cerr << "Note: the JSON file should contain an array of records\n";
cerr << "Usage: " << bin << " -i <JSON file> [-z <ZMQ endpoint>] [-E <num encoding loops] [-D <num decoding loop>] [-j] [-v]\n";
cerr << "\n";
cerr << "-i <file> Input JSON file containing an array of records\n";
cerr << "-z <endpoint> ZMQ endpoint for delivering records\n";
cerr << "-E <loops> Encode <loops> times to check the performance\n";
cerr << "-D <loops> Decode <loops> times to check the performance\n";
cerr << "-j Generate JSON records instead of TLV records\n";
cerr << "-v Verbose mode\n";
}
/* *************************************** */
@ -135,9 +141,10 @@ int main(int argc, char *argv[]) {
ndpi_serializer *serializer;
ndpi_serializer deserializer;
int rc, i, j, z, num_records, max_tlv_msgs = 0, tlv_msgs = 0, exported_msgs = 0;
u_int8_t use_json_encoding = 0;
char c;
while ((c = getopt(argc, argv,"hi:vz:E:D:")) != '?') {
while ((c = getopt(argc, argv,"hi:jvz:E:D:")) != '?') {
if (c == (char) 255 || c == -1) break;
switch(c) {
@ -150,6 +157,11 @@ int main(int argc, char *argv[]) {
json_path = strdup(optarg);
break;
case 'j':
use_json_encoding = 1;
batch_size = 1;
break;
case 'v':
verbose = 1;
break;
@ -224,7 +236,7 @@ int main(int argc, char *argv[]) {
serializer = (ndpi_serializer *) calloc(max_tlv_msgs, sizeof(ndpi_serializer));
for (i = 0; i < max_tlv_msgs; i++)
ndpi_init_serializer(&serializer[i], ndpi_serialization_format_tlv);
ndpi_init_serializer(&serializer[i], use_json_encoding ? ndpi_serialization_format_json : ndpi_serialization_format_tlv);
printf("Serializing..\n");
@ -260,10 +272,18 @@ int main(int argc, char *argv[]) {
for(i = 0; i < tlv_msgs; i++) {
struct zmq_msg_hdr msg_hdr;
strncpy(msg_hdr.url, "flow", sizeof(msg_hdr.url));
msg_hdr.version = 3;
msg_hdr.version = (use_json_encoding ? 2 : 3);
msg_hdr.size = serializer[i].size_used;
zmq_send(zmq_sock, &msg_hdr, sizeof(msg_hdr), ZMQ_SNDMORE);
if (use_json_encoding && verbose) {
enum json_tokener_error jerr = json_tokener_success;
json_object *f = json_tokener_parse_verbose(serializer[i].json_buffer, &jerr);
printf("Sending JSON #%u '%s' [%s]\n", i, serializer[i].json_buffer, f == NULL ? "INVALID" : "VALID");
}
rc = zmq_send(zmq_sock, serializer[i].buffer, msg_hdr.size, 0);
if (rc > 0)
exported_msgs++;
}
@ -278,6 +298,9 @@ int main(int argc, char *argv[]) {
json_object_put(f);
if (ndpi_serialization_format_json)
goto exit;
/* nDPI TLV Deserialization */
printf("Deserializing..\n");
@ -363,6 +386,8 @@ int main(int argc, char *argv[]) {
printf("Deserialization perf: %.3f msec total time for %u iterations\n", (double) total_time_usec/1000, dec_repeat);
exit:
if (zmq_sock)
printf("%u messages (max %u records each) sent over ZMQ\n", exported_msgs, batch_size);