Fixed API documentation: packet tiestamp is expressed in milliseconds

3 files changed, 19 insertions, 19 deletions

diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h.in
index d97d40bdc..0b8ff24b5 100644
--- a/src/include/ndpi_api.h.in
+++ b/src/include/ndpi_api.h.in
@@ -280,13 +280,13 @@ extern "C" {
    * (like SSL getting both client and server certificate even if we already know after
    * seeing the client certificate what the protocol is)
    *
-   * @par    ndpi_struct   = the detection module
-   * @par    flow          = pointer to the connection state machine
-   * @par    packet        = unsigned char pointer to the Layer 3 (IP header)
-   * @par    packetlen     = the length of the packet
-   * @par    current_tick  = the current timestamp for the packet
-   * @par    src           = pointer to the source subscriber state machine
-   * @par    dst           = pointer to the destination subscriber state machine
+   * @par    ndpi_struct    = the detection module
+   * @par    flow           = pointer to the connection state machine
+   * @par    packet         = unsigned char pointer to the Layer 3 (IP header)
+   * @par    packetlen      = the length of the packet
+   * @par    packet_time_ms = the current timestamp for the packet (expressed in msec)
+   * @par    src            = pointer to the source subscriber state machine
+   * @par    dst            = pointer to the destination subscriber state machine
    * @return void
    *
    */
@@ -294,7 +294,7 @@ extern "C" {
 				 struct ndpi_flow_struct *flow,
 				 const unsigned char *packet,
 				 const unsigned short packetlen,
-				 const u_int64_t current_tick,
+				 const u_int64_t packet_time_ms,
 				 struct ndpi_id_struct *src,
 				 struct ndpi_id_struct *dst);
 
@@ -302,13 +302,13 @@ extern "C" {
    * Processes one packet and returns the ID of the detected protocol.
    * This is the MAIN PACKET PROCESSING FUNCTION.
    *
-   * @par    ndpi_struct   = the detection module
-   * @par    flow          = pointer to the connection state machine
-   * @par    packet        = unsigned char pointer to the Layer 3 (IP header)
-   * @par    packetlen     = the length of the packet
-   * @par    current_tick  = the current timestamp for the packet
-   * @par    src           = pointer to the source subscriber state machine
-   * @par    dst           = pointer to the destination subscriber state machine
+   * @par    ndpi_struct    = the detection module
+   * @par    flow           = pointer to the connection state machine
+   * @par    packet         = unsigned char pointer to the Layer 3 (IP header)
+   * @par    packetlen      = the length of the packet
+   * @par    packet_time_ms = the current timestamp for the packet (expressed in msec)
+   * @par    src            = pointer to the source subscriber state machine
+   * @par    dst            = pointer to the destination subscriber state machine
    * @return the detected ID of the protocol
    *
    */
@@ -316,7 +316,7 @@ extern "C" {
 					      struct ndpi_flow_struct *flow,
 					      const unsigned char *packet,
 					      const unsigned short packetlen,
-					      const u_int64_t current_tick,
+					      const u_int64_t packet_time_ms,
 					      struct ndpi_id_struct *src,
 					      struct ndpi_id_struct *dst);
   /**
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index a44107679..a945573a1 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -131,7 +131,7 @@ void *ndpi_realloc(void *ptr, size_t old_size, size_t new_size) {
 /* ****************************************** */
 
 char *ndpi_strdup(const char *s) {
-  if( s == NULL ){
+  if(s == NULL ){
     return NULL;
   }
 
diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index 816b23a50..61f4424c7 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -1200,14 +1200,14 @@ int processClientServerHello(struct ndpi_detection_module_struct *ndpi_struct,
 		    printf("Client SSL [ALPN: %u]\n", alpn_len);
 #endif
 
-		    if((alpn_str_len+alpn_len+1) < sizeof(alpn_str)) {
+		    if((alpn_str_len+alpn_len+1) < (sizeof(alpn_str)-1)) {
 		      if(alpn_str_len > 0) {
 			alpn_str[alpn_str_len] = ',';
 			alpn_str_len++;
 		      }
 
 		      for(alpn_i=0; alpn_i<alpn_len; alpn_i++)
-			alpn_str[alpn_str_len+alpn_i] =  packet->payload[s_offset+alpn_i];
+			alpn_str[alpn_str_len+alpn_i] = packet->payload[s_offset+alpn_i];
 
 		      s_offset += alpn_len, alpn_str_len += alpn_len;;
 		    } else