diff options
| author | Maatuq <mahmoudmatook.mm@gmail.com> | 2023-03-25 22:25:22 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-25 19:25:22 +0100 |
| commit | 9ea8a5783950d6697da9a771c62ccc7bec5e682b (patch) | |
| tree | fbd691ad129a54e7e5a92f3d80b0a5bff288308c | |
| parent | 04a426feef3399a2354b4aa10ee2a28cf107fb45 (diff) | |
remove redefinition to vxlanhdr struct in vxlan dissector (#1911)
| -rw-r--r-- | src/include/ndpi_typedefs.h | 3 | ||||
| -rw-r--r-- | src/lib/protocols/vxlan.c | 29 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 4b6969d66..6d560ef36 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -532,7 +532,8 @@ PACK_ON struct ndpi_vxlanhdr { u_int16_t flags; u_int16_t groupPolicy; - u_int32_t vni; + u_int8_t vni[3]; + u_int8_t reserved; } PACK_OFF; /* ************************************************************ */ diff --git a/src/lib/protocols/vxlan.c b/src/lib/protocols/vxlan.c index 94e5c8873..fef0f539a 100644 --- a/src/lib/protocols/vxlan.c +++ b/src/lib/protocols/vxlan.c @@ -26,27 +26,26 @@ /* This code handles VXLAN as per RFC 7348 */ -struct vxlan_header { - u_int8_t flags[4]; /* the first byte is flags, other three are reserved */ - u_int8_t vni[4]; /* the first three bytes are VNI, the last byte is reserved */ -}; - static void ndpi_check_vxlan(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { struct ndpi_packet_struct *packet = &ndpi_struct->packet; - u_int32_t payload_len = packet->payload_packet_len; - - if((packet->udp != NULL) && (payload_len >= sizeof(struct vxlan_header))) { - u_int32_t vxlan_dst_port = ntohs(4789); - u_int32_t expected_flags = 0x08; /* only one bit should be set in the first byte */ - struct vxlan_header *vxlan = (struct vxlan_header *)packet->payload; + if((packet->udp != NULL) && (packet->payload_packet_len >= sizeof(struct ndpi_vxlanhdr))) { + /* + *rfc-7348 vxlan header + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |R|R|R|R|I|R|R|R| Reserved | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | VXLAN Network Identifier (VNI) | Reserved | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + u_int32_t vxlan_dst_port = ntohs(4789); + struct ndpi_vxlanhdr *vxlanhdr = (struct ndpi_vxlanhdr *)packet->payload; if((packet->udp->dest == vxlan_dst_port) && - (vxlan->flags[0] == expected_flags) && (vxlan->flags[1] == 0x0) && - (vxlan->flags[2] == 0x0) && (vxlan->flags[3] == 0x0) && - (vxlan->vni[3] == 0x0)) { - + (vxlanhdr->flags == ntohs(0x0800)) && + (vxlanhdr->groupPolicy == 0x0) && + (vxlanhdr->reserved == 0x0)) { NDPI_LOG_INFO(ndpi_struct, "found vxlan\n"); ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VXLAN, NDPI_PROTOCOL_VXLAN, NDPI_CONFIDENCE_DPI); return; |