diff options
| author | Stuart Reilly <rs576h@vyatta.att-mail.com> | 2019-07-01 17:38:59 +0100 |
|---|---|---|
| committer | Stuart Reilly <rs576h@vyatta.att-mail.com> | 2019-07-01 17:49:14 +0100 |
| commit | 5ce5bae99dbb999921e50945495a5160c9de2953 (patch) | |
| tree | 5cd9d1776738bfb00f667af9456665ebc8293959 /example/ndpiReader.c | |
| parent | f3161309ff0b0900eb0c2745518df98311934c4a (diff) | |
| parent | 8fdef484f6c1e11cca0468032092f058cf803a14 (diff) | |
Merge remote-tracking branch 'upstream' into dev
Diffstat (limited to 'example/ndpiReader.c')
| -rw-r--r-- | example/ndpiReader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index 8551992bf..6351ce034 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -843,7 +843,7 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa if(flow->ssh_ssl.ja3_server[0] != '\0') fprintf(out, "[JA3S: %s%s]", flow->ssh_ssl.ja3_server, print_cipher(flow->ssh_ssl.server_unsafe_cipher)); if(flow->ssh_ssl.server_organization[0] != '\0') fprintf(out, "[organization: %s]", flow->ssh_ssl.server_organization); - if(flow->ssh_ssl.server_cipher != '\0') fprintf(out, "[%s]", ndpi_cipher2str(flow->ssh_ssl.server_cipher));; + if(flow->ssh_ssl.server_cipher != '\0') fprintf(out, "[Cipher: %s]", ndpi_cipher2str(flow->ssh_ssl.server_cipher)); if(flow->bittorent_hash[0] != '\0') fprintf(out, "[BT Hash: %s]", flow->bittorent_hash); if(flow->dhcp_fingerprint[0] != '\0') fprintf(out, "[DHCP Fingerprint: %s]", flow->dhcp_fingerprint); @@ -2474,6 +2474,8 @@ static void ndpi_process_packet(u_char *args, /* allocate an exact size buffer to check overflows */ uint8_t *packet_checked = malloc(header->caplen); + /* ndpi_has_human_readeable_string(ndpi_info_mod, (char*)packet, header->caplen, 3); */ + memcpy(packet_checked, packet, header->caplen); p = ndpi_workflow_process_packet(ndpi_thread_info[thread_id].workflow, header, packet_checked); |