fix and merge mssql and tds in unique dissector mssql_tds due to latest release + minor fixes
This commit is contained in:
+21
-20
@@ -39,27 +39,28 @@ void ndpi_search_mysql_tcp(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
if (packet->payload_packet_len > 38 //min length
|
||||
&& get_u_int16_t(packet->payload, 0) == packet->payload_packet_len - 4 //first 3 bytes are length
|
||||
&& get_u_int8_t(packet->payload, 2) == 0x00 //3rd byte of packet length
|
||||
&& get_u_int8_t(packet->payload, 3) == 0x00 //packet sequence number is 0 for startup packet
|
||||
&& get_u_int8_t(packet->payload, 5) > 0x30 //server version > 0
|
||||
&& get_u_int8_t(packet->payload, 5) < 0x37 //server version < 7
|
||||
&& get_u_int8_t(packet->payload, 6) == 0x2e //dot
|
||||
) {
|
||||
u_int32_t a;
|
||||
for (a = 7; a + 31 < packet->payload_packet_len; a++) {
|
||||
if (packet->payload[a] == 0x00) {
|
||||
if (get_u_int8_t(packet->payload, a + 13) == 0x00 //filler byte
|
||||
&& get_u_int64_t(packet->payload, a + 19) == 0x0ULL //13 more
|
||||
&& get_u_int32_t(packet->payload, a + 27) == 0x0 //filler bytes
|
||||
&& get_u_int8_t(packet->payload, a + 31) == 0x0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MYSQL, ndpi_struct, NDPI_LOG_DEBUG, "MySQL detected.\n");
|
||||
ndpi_int_mysql_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
if(packet->tcp) {
|
||||
if (packet->payload_packet_len > 38 //min length
|
||||
&& get_u_int16_t(packet->payload, 0) == packet->payload_packet_len - 4 //first 3 bytes are length
|
||||
&& get_u_int8_t(packet->payload, 2) == 0x00 //3rd byte of packet length
|
||||
&& get_u_int8_t(packet->payload, 3) == 0x00 //packet sequence number is 0 for startup packet
|
||||
&& get_u_int8_t(packet->payload, 5) > 0x30 //server version > 0
|
||||
&& get_u_int8_t(packet->payload, 5) < 0x37 //server version < 7
|
||||
&& get_u_int8_t(packet->payload, 6) == 0x2e //dot
|
||||
) {
|
||||
u_int32_t a;
|
||||
for (a = 7; a + 31 < packet->payload_packet_len; a++) {
|
||||
if (packet->payload[a] == 0x00) {
|
||||
if (get_u_int8_t(packet->payload, a + 13) == 0x00 //filler byte
|
||||
&& get_u_int64_t(packet->payload, a + 19) == 0x0ULL //13 more
|
||||
&& get_u_int32_t(packet->payload, a + 27) == 0x0 //filler bytes
|
||||
&& get_u_int8_t(packet->payload, a + 31) == 0x0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MYSQL, ndpi_struct, NDPI_LOG_DEBUG, "MySQL detected.\n");
|
||||
ndpi_int_mysql_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user