Merge branch 'dev' into dev

This commit is contained in:
Vitaly Lavrov
2017-11-02 10:59:21 +03:00
committed by GitHub
8 changed files with 37 additions and 16 deletions
+1
View File
@@ -1034,6 +1034,7 @@ struct ndpi_flow_struct {
struct {
char fingerprint[48];
char class_ident[48];
} dhcp;
} protos;