diff options
| author | Luca <deri@ntop.org> | 2015-07-01 16:45:29 +0200 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2015-07-01 16:45:29 +0200 |
| commit | 07ebed7faea31dd5c52e1c0f912dbfaa23a23698 (patch) | |
| tree | 3e36b1e056a0c429f13d8ba2e5ee8fac76dcdef2 /src/lib/protocols/jabber.c | |
| parent | 857020c475947c0aed94e8156be1ba809fa8fe30 (diff) | |
Removed commented code
Renamed ndpi_int_add_connection() with ndpi_set_detected_protocol()
Diffstat (limited to 'src/lib/protocols/jabber.c')
| -rw-r--r-- | src/lib/protocols/jabber.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c index 1524cfefd..294371d44 100644 --- a/src/lib/protocols/jabber.c +++ b/src/lib/protocols/jabber.c @@ -43,7 +43,7 @@ static void ndpi_int_jabber_add_connection(struct ndpi_detection_module_struct * struct ndpi_flow_struct *flow, u_int32_t protocol/* , ndpi_protocol_type_t protocol_type */) { - ndpi_int_add_connection(ndpi_struct, flow, protocol/* , protocol_type */); + ndpi_set_detected_protocol(ndpi_struct, flow, protocol); } static void check_content_type_and_change_protocol(struct ndpi_detection_module_struct *ndpi_struct, @@ -56,7 +56,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_ for(i=0; jabber_strings[i].string != NULL; i++) { if(ndpi_strnstr((const char*)&packet->payload[x], jabber_strings[i].string, left) != NULL) { - ndpi_int_jabber_add_connection(ndpi_struct, flow, jabber_strings[i].ndpi_protocol/* , NDPI_CORRELATED_PROTOCOL */); + ndpi_int_jabber_add_connection(ndpi_struct, flow, jabber_strings[i].ndpi_protocol); return; } } @@ -95,7 +95,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st "found jabber file transfer.\n"); ndpi_int_jabber_add_connection(ndpi_struct, flow, - NDPI_PROTOCOL_UNENCRYPED_JABBER/* , NDPI_CORRELATED_PROTOCOL */); + NDPI_PROTOCOL_UNENCRYPED_JABBER); } } if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) { @@ -117,7 +117,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st "found jabber file transfer.\n"); ndpi_int_jabber_add_connection(ndpi_struct, flow, - NDPI_PROTOCOL_UNENCRYPED_JABBER/* , NDPI_CORRELATED_PROTOCOL */); + NDPI_PROTOCOL_UNENCRYPED_JABBER); } } return; @@ -282,7 +282,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st || ndpi_strnstr((const char *)&packet->payload[13], "xmlns:stream=\"http://etherx.jabber.org/streams\"", start)) { /* Protocol family */ - ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER/* , NDPI_REAL_PROTOCOL */); + ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER); /* search for subprotocols */ check_content_type_and_change_protocol(ndpi_struct, flow, 13); |