Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NTP metadata export #2768

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

NTP metadata export #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/include/ndpi_typedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,8 +1447,12 @@ struct ndpi_flow_struct {
} dns;

struct {
u_int8_t version;
u_int8_t mode;
u_int8_t leap_indicator: 2, version: 3, mode: 3;
u_int8_t stratum;
int8_t ppol, precision;
float root_delay, root_dispersion;
char ref_id[16];
uint64_t ref_time, org_time, rec_time, trans_time;
} ntp;

struct {
Expand Down
11 changes: 11 additions & 0 deletions src/lib/ndpi_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,19 @@ int ndpi_dpi2json(struct ndpi_detection_module_struct *ndpi_struct,

case NDPI_PROTOCOL_NTP:
ndpi_serialize_start_of_block(serializer, "ntp");
ndpi_serialize_string_uint32(serializer, "leap_indicator", flow->protos.ntp.leap_indicator);
ndpi_serialize_string_uint32(serializer, "version", flow->protos.ntp.version);
ndpi_serialize_string_uint32(serializer, "mode", flow->protos.ntp.mode);
ndpi_serialize_string_uint32(serializer, "stratum", flow->protos.ntp.stratum);
ndpi_serialize_string_int32(serializer, "ppol", flow->protos.ntp.ppol);
ndpi_serialize_string_int32(serializer, "precision", flow->protos.ntp.precision);
ndpi_serialize_string_float(serializer, "root_delay", flow->protos.ntp.root_delay, "%f");
ndpi_serialize_string_float(serializer, "root_dispersion", flow->protos.ntp.root_dispersion, "%f");
ndpi_serialize_string_string(serializer, "ref_id", flow->protos.ntp.ref_id);
ndpi_serialize_string_uint64(serializer, "ref_time", flow->protos.ntp.ref_time);
ndpi_serialize_string_uint64(serializer, "org_time", flow->protos.ntp.org_time);
ndpi_serialize_string_uint64(serializer, "rec_time", flow->protos.ntp.rec_time);
ndpi_serialize_string_uint64(serializer, "trans_time", flow->protos.ntp.trans_time);
ndpi_serialize_end_of_block(serializer);
break;

Expand Down
40 changes: 38 additions & 2 deletions src/lib/protocols/ntp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "ndpi_api.h"
#include "ndpi_private.h"


static void ndpi_int_ntp_add_connection(struct ndpi_detection_module_struct
*ndpi_struct, struct ndpi_flow_struct *flow)
{
Expand All @@ -49,11 +50,46 @@ static void ndpi_search_ntp_udp(struct ndpi_detection_module_struct *ndpi_struct
if (version <= 4) {
flow->protos.ntp.version = version;
flow->protos.ntp.mode = packet->payload[0] & 7;

flow->protos.ntp.leap_indicator = (packet->payload[0] & 192) >> 6;

if (packet->payload_packet_len >= 48) {
u_int32_t tmp = 0;
flow->protos.ntp.stratum = packet->payload[1];
flow->protos.ntp.ppol = (int8_t)packet->payload[2];
flow->protos.ntp.precision = (int8_t)packet->payload[3];

// https://github.com/wireshark/wireshark/blob/c383ce5173cb15463259ca862cd5b469c2a3aab8/epan/dissectors/packet-ntp.c#L1574
tmp = ntohl(get_u_int32_t(packet->payload, 4));
flow->protos.ntp.root_delay = (tmp >> 16) + (tmp & 0xffff) / 65536.0;
tmp = ntohl(get_u_int32_t(packet->payload, 8));
flow->protos.ntp.root_dispersion = (tmp >> 16) + (tmp & 0xffff) / 65536.0;

if (flow->protos.ntp.stratum == 0 || flow->protos.ntp.stratum == 1) {
ndpi_snprintf(flow->protos.ntp.ref_id, sizeof(flow->protos.ntp.ref_id), "%c%c%c%c", packet->payload[12],
packet->payload[13],
packet->payload[14],
packet->payload[15]);
} else {
if(packet->iph) {
tmp = get_u_int32_t(packet->payload, 12);
inet_ntop(AF_INET, &tmp, flow->protos.ntp.ref_id, sizeof(flow->protos.ntp.ref_id));
} else {
ndpi_snprintf(flow->protos.ntp.ref_id, sizeof(flow->protos.ntp.ref_id), "%c%c%c%c", packet->payload[12],
packet->payload[13],
packet->payload[14],
packet->payload[15]);
}
}
flow->protos.ntp.ref_time = get_u_int64_t(packet->payload, 16);
flow->protos.ntp.org_time = get_u_int64_t(packet->payload, 24);
flow->protos.ntp.rec_time = get_u_int64_t(packet->payload, 32);
flow->protos.ntp.trans_time = get_u_int64_t(packet->payload, 40);
}
}

NDPI_LOG_INFO(ndpi_struct, "found NTP\n");
ndpi_int_ntp_add_connection(ndpi_struct, flow);
return;
}
}

NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
Expand Down
Loading