Merge branch 'master' into dstuart_refactor_autoconf

CREDITS

@@ -209,3 +209,7 @@ Grant Pannell
       and individual IP addresses can be specified as well. Also, multiple IP's
       and/or networks can be defined as a comma separated list (e.g.
       "192.168.10.0/24,10.1.1.123").
+
+Alexander Kozhevnikov
+    - Reported a bug when fwknop is compiled with --enable-udp-server where
+      the server was including pcap.h

ChangeLog

@@ -1,3 +1,8 @@
+fwknop-2.6.6 (02//2015):
+    - [server] Bug fix when compiled with --enable-udp-server to not include
+      pcap.h, which is likely not installed whenever libpcap is also not
+      installed. This bug was reported by Alexander Kozhevnikov.
+
 fwknop-2.6.5 (12/16/2014):
     - [server] (Grant Pannell) Added a new access.conf variable "DESTINATION"
       to define the destination address for which an SPA packet will be

configure.ac

@@ -632,21 +632,25 @@ dnl
   ],[
     AS_IF([test "x$FORCE_IPTABLES_EXE" != x], [
       IPTABLES_EXE="$FORCE_IPTABLES_EXE"    
+      FIREWALLD_EXE=""    
     ],[
       AS_IF([test "x$FORCE_IPFW_EXE" != x], [
         IPFW_EXE="$FORCE_IPFW_EXE"    
         IPTABLES_EXE=""    
+        FIREWALLD_EXE=""    
       ],[
         AS_IF([test "x$FORCE_PF_EXE" != x], [
           PF_EXE="$FORCE_PF_EXE"    
           IPFW_EXE=""    
           IPTABLES_EXE=""    
+          FIREWALLD_EXE=""    
         ],[
           AS_IF([test "x$FORCE_IPF_EXE" != x], [
             IPF_EXE="$FORCE_IPF_EXE"    
             PF_EXE=""    
             IPFW_EXE=""    
             IPTABLES_EXE=""    
+            FIREWALLD_EXE=""    
           ]
         ]
       ]

server/pcap_capture.c

@@ -29,8 +29,9 @@
  *****************************************************************************
 */
 
-
+#if USE_LIBPCAP
-#include <pcap.h>
+  #include <pcap.h>
+#endif
 
 #include "fwknopd_common.h"
 #include "pcap_capture.h"

server/process_packet.c

@@ -31,7 +31,10 @@
  *
  *****************************************************************************
 */
-#include <pcap.h>
+
+#if USE_LIBPCAP
+  #include <pcap.h>
+#endif
 
 #include "fwknopd_common.h"
 #include "netinet_common.h"
@@ -40,6 +43,8 @@
 #include "utils.h"
 #include "log_msg.h"
 
+#if USE_LIBPCAP
+
 void
 process_packet(unsigned char *args, const struct pcap_pkthdr *packet_header,
     const unsigned char *packet)
@@ -228,4 +233,6 @@ process_packet(unsigned char *args, const struct pcap_pkthdr *packet_header,
     return;
 }
 
+#endif /* USE_LIBPCAP */
+
 /***EOF***/