diff options
| author | Luca <deri@ntop.org> | 2015-07-01 18:36:33 +0200 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2015-07-01 18:36:33 +0200 |
| commit | 151f74d596712f4dd829ae863a08ad5f15a652cb (patch) | |
| tree | 440af66b24ee6f48d66eb66500e7e43e1faa3297 /src/lib | |
| parent | 7f807b81feaae91fca09210d10ed12ee9cf89257 (diff) | |
Reworked skype code
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ndpi_main.c | 17 | ||||
| -rw-r--r-- | src/lib/protocols/skype.c | 21 |
2 files changed, 24 insertions, 14 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index 11145512d..8650b37c3 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -1361,11 +1361,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "DropBox", ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 17500, 0, 0, 0, 0) /* UDP */); - ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_SKYPE, - no_master, - no_master, "Skype", - ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, - ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DCERPC, no_master, no_master, "DCE_RPC", @@ -1426,6 +1421,7 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp no_master, "Radius", ndpi_build_default_ports(ports_a, 1812, 1813, 0, 0, 0) /* TCP */, ndpi_build_default_ports(ports_b, 1812, 1813, 0, 0, 0) /* UDP */); + ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_WINDOWS_UPDATE, no_master, no_master, "WindowsUpdate", @@ -2358,6 +2354,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n NO_SAVE_DETECTION_BITMASK_AS_UNKNOWN, ADD_TO_DETECTION_BITMASK); #endif + + init_skype_dissector(ndpi_struct, &a, detection_bitmask); + /*Update excluded protocol bitmask*/ NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, ndpi_struct->callback_buffer[a].detection_bitmask); @@ -3288,14 +3287,6 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n ADD_TO_DETECTION_BITMASK); #endif -#ifdef NDPI_PROTOCOL_SKYPE - ndpi_set_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, a++, - NDPI_PROTOCOL_SKYPE, - ndpi_search_skype, - NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); -#endif #ifdef NDPI_PROTOCOL_RADIUS ndpi_set_bitmask_protocol_detection("RADIUS", ndpi_struct, detection_bitmask, a++, diff --git a/src/lib/protocols/skype.c b/src/lib/protocols/skype.c index e72852dd5..ba9396925 100644 --- a/src/lib/protocols/skype.c +++ b/src/lib/protocols/skype.c @@ -23,7 +23,6 @@ #ifdef NDPI_PROTOCOL_SKYPE - static u_int8_t is_skype_host(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t host) { struct in_addr pin; @@ -119,4 +118,24 @@ void ndpi_search_skype(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_check_skype(ndpi_struct, flow); } +void init_skype_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask) { + ndpi_port_range ports_a[MAX_DEFAULT_PORTS], ports_b[MAX_DEFAULT_PORTS]; + u_int16_t no_master[2] = { NDPI_PROTOCOL_NO_MASTER_PROTO, NDPI_PROTOCOL_NO_MASTER_PROTO }; + + ndpi_set_proto_defaults(ndpi_struct, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_SKYPE, + no_master, + no_master, "Skype", + ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */, + ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */); + + ndpi_set_bitmask_protocol_detection("Skype", ndpi_struct, detection_bitmask, *id, + NDPI_PROTOCOL_SKYPE, + ndpi_search_skype, + NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP_WITH_PAYLOAD, + SAVE_DETECTION_BITMASK_AS_UNKNOWN, + ADD_TO_DETECTION_BITMASK); + + *id = *id+1; +} + #endif |