diff options
| author | Luca Deri <deri@ntop.org> | 2019-03-23 10:32:18 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2019-03-23 10:32:18 +0100 |
| commit | f47be6ef6045a97a20f7a929d15a0354260c0414 (patch) | |
| tree | 6ddabdbd3ea4c05aa0ba4a04ec507b468f714614 | |
| parent | f592b9fc31f2ef306d29ae1c9e5831dca597c9ad (diff) | |
Added SSL organization support
| -rw-r--r-- | example/ndpiReader.c | 1 | ||||
| -rw-r--r-- | example/ndpi_util.c | 2 | ||||
| -rw-r--r-- | example/ndpi_util.h | 2 | ||||
| -rw-r--r-- | src/lib/ndpi_main.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/example/ndpiReader.c b/example/ndpiReader.c index fe0ea879b..4244e3745 100644 --- a/example/ndpiReader.c +++ b/example/ndpiReader.c @@ -804,6 +804,7 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa if(flow->ssh_ssl.client_info[0] != '\0') fprintf(out, "[client: %s]", flow->ssh_ssl.client_info); if(flow->ssh_ssl.server_info[0] != '\0') fprintf(out, "[server: %s]", flow->ssh_ssl.server_info); + if(flow->ssh_ssl.server_organization[0] != '\0') fprintf(out, "[organization: %s]", flow->ssh_ssl.server_organization); if(flow->bittorent_hash[0] != '\0') fprintf(out, "[BT Hash: %s]", flow->bittorent_hash); fprintf(out, "\n"); diff --git a/example/ndpi_util.c b/example/ndpi_util.c index 3a2a66c97..9e1e72132 100644 --- a/example/ndpi_util.c +++ b/example/ndpi_util.c @@ -566,6 +566,8 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl flow->ndpi_flow->protos.stun_ssl.ssl.client_certificate); snprintf(flow->ssh_ssl.server_info, sizeof(flow->ssh_ssl.server_info), "%s", flow->ndpi_flow->protos.stun_ssl.ssl.server_certificate); + snprintf(flow->ssh_ssl.server_organization, sizeof(flow->ssh_ssl.server_organization), "%s", + flow->ndpi_flow->protos.stun_ssl.ssl.server_organization); } } diff --git a/example/ndpi_util.h b/example/ndpi_util.h index eb9ab8e65..0a5a3b8c2 100644 --- a/example/ndpi_util.h +++ b/example/ndpi_util.h @@ -97,7 +97,7 @@ typedef struct ndpi_flow_info { char bittorent_hash[41]; struct { - char client_info[64], server_info[64]; + char client_info[64], server_info[64], server_organization[64]; } ssh_ssl; void *src_id, *dst_id; diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 047167ac3..59de7a763 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1,7 +1,7 @@ /* * ndpi_main.c * - * Copyright (C) 2011-18 - ntop.org + * Copyright (C) 2011-19 - ntop.org * * This file is part of nDPI, an open source deep packet inspection * library based on the OpenDPI and PACE technology by ipoque GmbH |