diff options
| author | Luca Deri <deri@ntop.org> | 2018-05-14 19:23:15 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2018-05-14 19:23:15 +0200 |
| commit | 2d486aeed8e6450cc8034d6244848297bdefc31e (patch) | |
| tree | dd28478065842178713e20142942b7e6bbb41e45 /src/lib | |
| parent | 00c35e48a20c66b717209fd2accc3a4c07b74aaa (diff) | |
Skype CallIn/CallOut are not set as
Skype.SkypeCallOut
Skype.SkypeCallIn
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ndpi_main.c | 14 | ||||
| -rw-r--r-- | src/lib/protocols/stun.c | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c index f29dbc962..e52fc5632 100644 --- a/src/lib/ndpi_main.c +++ b/src/lib/ndpi_main.c @@ -3774,14 +3774,12 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st && (flow->guessed_protocol_id == NDPI_PROTOCOL_STUN)) { check_stun_export: if(flow->protos.stun.num_processed_pkts > 0) { - u_int proto; - - if(flow->protos.stun.num_processed_pkts >= 8) - proto = (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT; - else - proto = NDPI_PROTOCOL_STUN; - - ndpi_set_detected_protocol(ndpi_struct, flow, proto, flow->guessed_host_protocol_id); + if(flow->protos.stun.num_processed_pkts >= 8) { + u_int16_t proto = (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT; + + ndpi_set_detected_protocol(ndpi_struct, flow, proto, NDPI_PROTOCOL_SKYPE); + } else + ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_STUN, flow->guessed_host_protocol_id); } } diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index 1f5ed34f4..80ae4a144 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -191,7 +191,7 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n NDPI_LOG_INFO(ndpi_struct, "found Skype\n"); if((flow->protos.stun.num_processed_pkts >= 8) || (flow->protos.stun.num_binding_requests >= 4)) - ndpi_int_stun_add_connection(ndpi_struct, (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT, flow); + ndpi_set_detected_protocol(ndpi_struct, flow, (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT, NDPI_PROTOCOL_SKYPE); } else { NDPI_LOG_INFO(ndpi_struct, "found UDP stun\n"); /* Ummmmm we're in the TCP branch. This code looks bad */ ndpi_int_stun_add_connection(ndpi_struct, @@ -211,9 +211,7 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n NDPI_LOG_INFO(ndpi_struct, "Found Skype\n"); if((flow->protos.stun.num_processed_pkts >= 8) || (flow->protos.stun.num_binding_requests >= 4)) - ndpi_int_stun_add_connection(ndpi_struct, - (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT, - flow); + ndpi_set_detected_protocol(ndpi_struct, flow, (flow->protos.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT, NDPI_PROTOCOL_SKYPE); } else { NDPI_LOG_INFO(ndpi_struct, "found UDP stun\n"); ndpi_int_stun_add_connection(ndpi_struct, |