diff options
| author | Luca <deri@ntop.org> | 2015-07-01 17:40:14 +0200 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2015-07-01 17:40:14 +0200 |
| commit | 60884f9047882863d27f7e8f5fb760897c599800 (patch) | |
| tree | 2b09f2ec1a551b59a98baee790c858fb3e038ffe /src/lib/protocols/vnc.c | |
| parent | 49ea23530f876930896dc5aa6a84ef6219589171 (diff) | |
Split former protocol into upper and lower protocol
Diffstat (limited to 'src/lib/protocols/vnc.c')
| -rw-r--r-- | src/lib/protocols/vnc.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/protocols/vnc.c b/src/lib/protocols/vnc.c index f67ad26ba..b44b7a167 100644 --- a/src/lib/protocols/vnc.c +++ b/src/lib/protocols/vnc.c @@ -28,9 +28,9 @@ #ifdef NDPI_PROTOCOL_VNC static void ndpi_int_vnc_add_connection(struct ndpi_detection_module_struct - *ndpi_struct, struct ndpi_flow_struct *flow) + *ndpi_struct, struct ndpi_flow_struct *flow) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VNC); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_VNC, NDPI_PROTOCOL_UNKNOWN); } /* @@ -40,28 +40,28 @@ static void ndpi_int_vnc_add_connection(struct ndpi_detection_module_struct void ndpi_search_vnc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow) { - struct ndpi_packet_struct *packet = &flow->packet; + struct ndpi_packet_struct *packet = &flow->packet; -// struct ndpi_id_struct *src=ndpi_struct->src; -// struct ndpi_id_struct *dst=ndpi_struct->dst; + // struct ndpi_id_struct *src=ndpi_struct->src; + // struct ndpi_id_struct *dst=ndpi_struct->dst; - if (flow->l4.tcp.vnc_stage == 0) { - if (packet->payload_packet_len == 12 - && memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) { - NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "reached vnc stage one\n"); - flow->l4.tcp.vnc_stage = 1 + packet->packet_direction; - return; - } - } else if (flow->l4.tcp.vnc_stage == 2 - packet->packet_direction) { - if (packet->payload_packet_len == 12 - && memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) { - NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "found vnc\n"); - ndpi_int_vnc_add_connection(ndpi_struct, flow); - return; - } - } - NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_VNC); + if (flow->l4.tcp.vnc_stage == 0) { + if (packet->payload_packet_len == 12 + && memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) { + NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "reached vnc stage one\n"); + flow->l4.tcp.vnc_stage = 1 + packet->packet_direction; + return; + } + } else if (flow->l4.tcp.vnc_stage == 2 - packet->packet_direction) { + if (packet->payload_packet_len == 12 + && memcmp(packet->payload, "RFB 003.00", 10) == 0 && packet->payload[11] == 0x0a) { + NDPI_LOG(NDPI_PROTOCOL_VNC, ndpi_struct, NDPI_LOG_DEBUG, "found vnc\n"); + ndpi_int_vnc_add_connection(ndpi_struct, flow); + return; + } + } + NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_VNC); } #endif |