Merge branch 'dev' of https://github.com/ntop/nDPI into dev

1 files changed, 23 insertions, 29 deletions

diff --git a/src/lib/protocols/dhcp.c b/src/lib/protocols/dhcp.c
index 8631989e9..f40a8138c 100644
--- a/src/lib/protocols/dhcp.c
+++ b/src/lib/protocols/dhcp.c
@@ -100,42 +100,36 @@ void ndpi_search_dhcp_udp(struct ndpi_detection_module_struct *ndpi_struct, stru
 
 	    if(msg_type <= 8) foundValidMsgType = 1;
 	  } else if(id == 55 /* Parameter Request List / Fingerprint */) {
-	    if(!ndpi_struct->disable_metadata_export) {
-	      u_int idx, offset = 0;
+	    u_int idx, offset = 0;
+	    
+	    for(idx = 0; idx < len && offset < sizeof(flow->protos.dhcp.fingerprint) - 2; idx++) {
+	      int rc = snprintf((char*)&flow->protos.dhcp.fingerprint[offset],
+				sizeof(flow->protos.dhcp.fingerprint) - offset,
+				"%s%u", (idx > 0) ? "," : "",
+				(unsigned int)dhcp->options[i+2+idx] & 0xFF);
 	      
-	      for(idx = 0; idx < len && offset < sizeof(flow->protos.dhcp.fingerprint) - 2; idx++) {
-		int rc = snprintf((char*)&flow->protos.dhcp.fingerprint[offset],
-				   sizeof(flow->protos.dhcp.fingerprint) - offset,
-				   "%s%u", (idx > 0) ? "," : "",
-				   (unsigned int)dhcp->options[i+2+idx] & 0xFF);
-
-		if(rc < 0) break; else offset += rc;
-	      }
-	      
-	      flow->protos.dhcp.fingerprint[sizeof(flow->protos.dhcp.fingerprint) - 1] = '\0';
+	      if(rc < 0) break; else offset += rc;
 	    }
+	    
+	    flow->protos.dhcp.fingerprint[sizeof(flow->protos.dhcp.fingerprint) - 1] = '\0';	    
 	  } else if(id == 60 /* Class Identifier */) {
-	    if(!ndpi_struct->disable_metadata_export) {
-	      char *name = (char*)&dhcp->options[i+2];
-	      int j = 0;
-	      
-	      j = ndpi_min(len, sizeof(flow->protos.dhcp.class_ident)-1);
-	      strncpy((char*)flow->protos.dhcp.class_ident, name, j);
-	      flow->protos.dhcp.class_ident[j] = '\0';
-	    }
+	    char *name = (char*)&dhcp->options[i+2];
+	    int j = 0;
+	    
+	    j = ndpi_min(len, sizeof(flow->protos.dhcp.class_ident)-1);
+	    strncpy((char*)flow->protos.dhcp.class_ident, name, j);
+	    flow->protos.dhcp.class_ident[j] = '\0';
 	  } else if(id == 12 /* Host Name */) {
-	    if(!ndpi_struct->disable_metadata_export) {
-	      char *name = (char*)&dhcp->options[i+2];
-	      int j = 0;
-	      
+	    char *name = (char*)&dhcp->options[i+2];
+	    int j = 0;
+	    
 #ifdef DHCP_DEBUG
-	      NDPI_LOG_DBG2(ndpi_struct, "[DHCP] '%.*s'\n",name,len);
+	    NDPI_LOG_DBG2(ndpi_struct, "[DHCP] '%.*s'\n",name,len);
 	      //	    while(j < len) { printf( "%c", name[j]); j++; }; printf("\n");
 #endif
-	      j = ndpi_min(len, sizeof(flow->host_server_name)-1);
-	      strncpy((char*)flow->host_server_name, name, j);
-	      flow->host_server_name[j] = '\0';
-	    }
+	    j = ndpi_min(len, sizeof(flow->host_server_name)-1);
+	    strncpy((char*)flow->host_server_name, name, j);
+	    flow->host_server_name[j] = '\0';	    
 	  }
 
 	  i += len + 2;