diff options
| author | Luca Deri <deri@ntop.org> | 2021-06-02 21:47:01 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2021-06-02 21:47:01 +0200 |
| commit | 8761ac1887c9190a8f5bf4f1439f1316a5df22a2 (patch) | |
| tree | 2de29e805aabcdf5e54f3b72ac665b56da20c3e7 /src/lib/protocols | |
| parent | 654e84ff02a0521f193a521c2ade58f0077e7c27 (diff) | |
Renamed Skyp in Skype_Teams as the protocol is now shared across these apps
Diffstat (limited to 'src/lib/protocols')
| -rw-r--r-- | src/lib/protocols/rtp.c | 2 | ||||
| -rw-r--r-- | src/lib/protocols/skype.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/protocols/rtp.c b/src/lib/protocols/rtp.c index 067ab4d92..b2998bb2a 100644 --- a/src/lib/protocols/rtp.c +++ b/src/lib/protocols/rtp.c @@ -104,7 +104,7 @@ static void ndpi_rtp_search(struct ndpi_detection_module_struct *ndpi_struct, && (payloadType = isValidMSRTPType(payload[1] & 0xFF))) { if(payloadType == 1 /* RTP */) { NDPI_LOG_INFO(ndpi_struct, "Found Skype for Business (former MS Lync)\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_TEAMS, NDPI_PROTOCOL_UNKNOWN); return; } } diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index f209a8792..0c2c0f675 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -19,7 +19,7 @@ */ #include "ndpi_protocol_ids.h" -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SKYPE +#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SKYPE_TEAMS #include "ndpi_api.h" @@ -45,7 +45,7 @@ static int ndpi_check_skype_udp_again(struct ndpi_detection_module_struct *ndpi_ } if (detected) { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE, NDPI_PROTOCOL_UNKNOWN); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_TEAMS, NDPI_PROTOCOL_UNKNOWN); flow->extra_packets_func = NULL; /* Stop checking extra packets */ @@ -100,7 +100,7 @@ static void ndpi_check_skype(struct ndpi_detection_module_struct *ndpi_struct, s if(is_port(sport, dport, 8801)) { ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_ZOOM, NDPI_PROTOCOL_UNKNOWN); } else if (payload_len >= 16 && packet->payload[0] != 0x01) /* Avoid invalid Cisco HSRP detection / RADIUS */ { - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE_TEAMS); } } @@ -150,7 +150,7 @@ static void ndpi_check_skype(struct ndpi_detection_module_struct *ndpi_struct, s /* printf("[SKYPE] %u/%u\n", ntohs(packet->tcp->source), ntohs(packet->tcp->dest)); */ NDPI_LOG_INFO(ndpi_struct, "found skype\n"); - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE); + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_TEAMS_CALL, NDPI_PROTOCOL_SKYPE_TEAMS); } else { // printf("NO [SKYPE] payload_len=%u\n", payload_len); } @@ -172,7 +172,7 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct NDPI_LOG_DBG(ndpi_struct, "search skype\n"); /* skip marked packets */ - if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_SKYPE) + if(packet->detected_protocol_stack[0] != NDPI_PROTOCOL_SKYPE_TEAMS) ndpi_check_skype(ndpi_struct, flow); } @@ -180,7 +180,7 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { ndpi_set_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, *id, - NDPI_PROTOCOL_SKYPE, + NDPI_PROTOCOL_SKYPE_TEAMS, ndpi_search_skype, NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD, SAVE_DETECTION_BITMASK_AS_UNKNOWN, |