p0f-3.06b

fecc9ed8b79dbf8e4d5ffbd22eda9d850b42c3c3 /p0f-3.06b.tgz
p0f · Oct 1, 2012 · 7d85575 · 7d85575
1 parent 8f6712e
commit 7d85575
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/api.c b/api.c
@@ -99,6 +99,7 @@ void handle_query(struct p0f_api_query* q, struct p0f_api_response* r) {
   r->last_chg    = h->last_chg;
   r->up_mod_days = h->up_mod_days;
   r->distance    = h->distance;
+  r->os_match_q  = h->last_quality;
 
   if (h->last_up_min != -1) r->uptime_min = h->last_up_min;
 

diff --git a/api.h b/api.h
@@ -36,7 +36,7 @@ struct p0f_api_query {
   u8  addr_type;                        /* P0F_ADDR_*                         */
   u8  addr[16];                         /* IP address (big endian left align) */
 
-};
+} __attribute__((packed));
 
 struct p0f_api_response {
 
@@ -68,7 +68,7 @@ struct p0f_api_response {
 
   u8  language[P0F_STR_MAX + 1];        /* Language                           */
 
-};
+} __attribute__((packed));
 
 #ifdef _FROM_P0F
 

diff --git a/build.sh b/build.sh
@@ -9,7 +9,7 @@
 #
 
 PROGNAME="p0f"
-VERSION="3.05b"
+VERSION="3.06b"
 
 test "$CC" = "" && CC="gcc"
 

diff --git a/docs/ChangeLog b/docs/ChangeLog
@@ -1,3 +1,14 @@
+Version 3.06b:
+--------------
+
+Bug fixes:
+
+  - Made os_match_q actually functional in api.c (thanks to Anthony Howe).
+
+  - Fixed api.c struct packing issue (thanks to Tomoyuki Murakami).
+
+  - Improved logic around the vlan behavior (thanks to Anthony Howe).
+
 Version 3.05b:
 --------------
 

diff --git a/docs/README b/docs/README
@@ -901,6 +901,8 @@ including:
   Sebastian Roschke
   Peter Valchev
   Jeff Weisberg
+  Anthony Howe
+  Tomoyuki Murakami
 
 If you wish to help, the most immediate way to do so is to simply gather new
 signatures, especially from less popular or older platforms (servers, networking

diff --git a/p0f.c b/p0f.c
@@ -545,6 +545,8 @@ static void prepare_bpf(void) {
 
   vlan_support = (pcap_datalink(pt) == DLT_EN10MB);
 
+retry_no_vlan:
+
   if (!orig_rule) {
 
     if (vlan_support) {
@@ -575,6 +577,15 @@ static void prepare_bpf(void) {
   DEBUG("[#] Computed rule: %s\n", final_rule);
 
   if (pcap_compile(pt, &flt, (char*)final_rule, 1, 0)) {
+
+    if (vlan_support) {
+
+      if (orig_rule) ck_free(final_rule);
+      vlan_support = 0;
+      goto retry_no_vlan;
+
+    }
+
     pcap_perror(pt, "[-] pcap_compile");
 
     if (!orig_rule)