summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mauderer <Christian.Mauderer@embedded-brains.de>2016-08-04 08:02:24 +0200
committerChristian Mauderer <Christian.Mauderer@embedded-brains.de>2016-08-08 08:54:34 +0200
commit32a3dd1e43715ea199b06d855b0781b3c278e300 (patch)
tree22e1bd473b60c731a63bb41d252103b5544ee4b9
parentif_ffec_mcf548x: Init when interface is set to UP. (diff)
downloadrtems-libbsd-32a3dd1e43715ea199b06d855b0781b3c278e300.tar.bz2
pf: Add RTEMS_BSD_CONFIG_FIREWALL_xxx options.
-rw-r--r--rtemsbsd/include/machine/rtems-bsd-config.h28
-rw-r--r--testsuite/pf01/test_main.c4
-rw-r--r--testsuite/pf02/test_main.c4
3 files changed, 32 insertions, 4 deletions
diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h b/rtemsbsd/include/machine/rtems-bsd-config.h
index 7a4750f0..84562bf3 100644
--- a/rtemsbsd/include/machine/rtems-bsd-config.h
+++ b/rtemsbsd/include/machine/rtems-bsd-config.h
@@ -119,6 +119,27 @@ extern "C" {
#endif /* RTEMS_BSD_CONFIG_NET_IF_VLAN */
/*
+ * Firewall PF
+ */
+#if defined(RTEMS_BSD_CONFIG_FIREWALL_PF)
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PF SYSINIT_NEED_FIREWALL_PF
+#else
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PF
+#endif /* RTEMS_BSD_CONFIG_FIREWALL_PF */
+
+#if defined(RTEMS_BSD_CONFIG_FIREWALL_PFLOG)
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PFLOG SYSINIT_NEED_FIREWALL_PFLOG
+#else
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PFLOG
+#endif /* RTEMS_BSD_CONFIG_FIREWALL_PFLOG */
+
+#if defined(RTEMS_BSD_CONFIG_FIREWALL_PFSYNC)
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PFSYNC SYSINIT_NEED_FIREWALL_PFSYNC
+#else
+ #define RTEMS_BSD_CFGDECL_FIREWALL_PFSYNC
+#endif /* RTEMS_BSD_CONFIG_FIREWALL_PFSYNC */
+
+/*
* FTPD
*/
#if defined(RTEMS_BSD_CONFIG_SERVICE_FTPD)
@@ -168,6 +189,13 @@ extern "C" {
RTEMS_BSD_CFGDECL_NET_IF_VLAN;
/*
+ * Create the firewall
+ */
+ RTEMS_BSD_CFGDECL_FIREWALL_PF;
+ RTEMS_BSD_CFGDECL_FIREWALL_PFLOG;
+ RTEMS_BSD_CFGDECL_FIREWALL_PFSYNC;
+
+ /*
* Create the services.
*/
RTEMS_BSD_CFGDECL_TELNETD;
diff --git a/testsuite/pf01/test_main.c b/testsuite/pf01/test_main.c
index 488884b2..6d9f5633 100644
--- a/testsuite/pf01/test_main.c
+++ b/testsuite/pf01/test_main.c
@@ -491,7 +491,7 @@ test_main(void)
#include <machine/rtems-bsd-sysinit.h>
-SYSINIT_NEED_FIREWALL_PF;
-SYSINIT_NEED_FIREWALL_PFLOG;
+#define RTEMS_BSD_CONFIG_FIREWALL_PF
+#define RTEMS_BSD_CONFIG_FIREWALL_PFLOG
#include <rtems/bsd/test/default-network-init.h>
diff --git a/testsuite/pf02/test_main.c b/testsuite/pf02/test_main.c
index 3526c885..e81d2046 100644
--- a/testsuite/pf02/test_main.c
+++ b/testsuite/pf02/test_main.c
@@ -176,8 +176,8 @@ test_main(void)
#include <machine/rtems-bsd-sysinit.h>
-SYSINIT_NEED_FIREWALL_PF;
-SYSINIT_NEED_FIREWALL_PFLOG;
+#define RTEMS_BSD_CONFIG_FIREWALL_PF
+#define RTEMS_BSD_CONFIG_FIREWALL_PFLOG
#define CONFIGURE_MAXIMUM_DRIVERS 32
#include <rtems/bsd/test/default-network-init.h>