diff options
| author | Luca Deri <deri@ntop.org> | 2020-02-04 22:31:02 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2020-02-04 22:31:02 +0100 |
| commit | 88fc9232ff1a7652777e4a41d118326c27ee185a (patch) | |
| tree | aacee4f25e58896e20b4e66f39c4d97ea67ab0ea /src | |
| parent | 0703ab5ac558857319c2ed4a1673444006f915f8 (diff) | |
Code improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 8 | ||||
| -rw-r--r-- | src/lib/protocols/tls.c | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index c6b0fc4a4..d2190afc1 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -22,12 +22,8 @@ */ -#ifndef __NDPI_PROTOCOL_IDS_H__ - -#endif - -#ifndef __NDPI_PROTOCOLS_DEFAULT_H__ -#define __NDPI_PROTOCOLS_DEFAULT_H__ +#ifndef __NDPI_PROTOCOLS_IDS_H__ +#define __NDPI_PROTOCOLS_IDS_H__ #define NDPI_DETECTION_SUPPORT_IPV6 #define NDPI_PROTOCOL_SIZE 2 diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c index d4f60d973..e5f46c05c 100644 --- a/src/lib/protocols/tls.c +++ b/src/lib/protocols/tls.c @@ -186,17 +186,17 @@ static void cleanupServerName(char *buffer, int buffer_len) { /* See https://blog.catchpoint.com/2017/05/12/dissecting-tls-using-wireshark/ */ static void processCertificateElements(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, - u_int16_t offset, u_int16_t certificate_len) { + u_int16_t p_offset, u_int16_t certificate_len) { struct ndpi_packet_struct *packet = &flow->packet; u_int num_found = 0, i, j; char buffer[64] = { '\0' }; #ifdef DEBUG_TLS - printf("[TLS] %s() [offset: %u][certificate_len: %u]\n", __FUNCTION__, offset, certificate_len); + printf("[TLS] %s() [offset: %u][certificate_len: %u]\n", __FUNCTION__, p_offset, certificate_len); #endif /* Check after handshake protocol header (5 bytes) and message header (4 bytes) */ - for(i = offset; i < certificate_len; i++) { + for(i = p_offset; i < certificate_len; i++) { /* Organization OID: 2.5.4.10 */ if((packet->payload[i] == 0x55) && (packet->payload[i+1] == 0x04) && (packet->payload[i+2] == 0x0a)) { u_int8_t server_len = packet->payload[i+4]; |