diff options
| author | Luca Deri <deri@ntop.org> | 2015-07-21 14:10:50 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2015-07-21 14:10:50 +0200 |
| commit | 8d8a2045195fca29d433754e8325d8212e350f37 (patch) | |
| tree | 9118d87170ac667dd43cd2f8c93fe55db0d2c462 /src/lib/protocols/skype.c | |
| parent | 2ab10ec9b7df824aa66beb3e83d17d1e0e420716 (diff) | |
Cleaned up starcraft protocol code
Fixed false-positive in Skype dissector
Diffstat (limited to 'src/lib/protocols/skype.c')
| -rw-r--r-- | src/lib/protocols/skype.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index 270a85fba..7f201569c 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -68,13 +68,17 @@ static void ndpi_check_skype(struct ndpi_detection_module_struct *ndpi_struct, s flow->l4.udp.skype_packet_id++; if(flow->l4.udp.skype_packet_id < 5) { + u_int16_t dport = ntohs(packet->udp->dest); + /* skype-to-skype */ - if(((payload_len == 3) && ((packet->payload[2] & 0x0F)== 0x0d)) - || ((payload_len >= 16) - && (packet->payload[0] != 0x30) /* Avoid invalid SNMP detection */ - && (packet->payload[2] == 0x02))) { - NDPI_LOG(NDPI_PROTOCOL_SKYPE, ndpi_struct, NDPI_LOG_DEBUG, "Found skype.\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN); + if(dport != 1119) /* It can be confused with battle.net */ { + if(((payload_len == 3) && ((packet->payload[2] & 0x0F)== 0x0d)) + || ((payload_len >= 16) + && (packet->payload[0] != 0x30) /* Avoid invalid SNMP detection */ + && (packet->payload[2] == 0x02))) { + NDPI_LOG(NDPI_PROTOCOL_SKYPE, ndpi_struct, NDPI_LOG_DEBUG, "Found skype.\n"); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN); + } } return; |