[rtems-libbsd commit] pf: Some fixes after the update
Sebastian Huber
sebh at rtems.org
Tue Jan 10 13:43:22 UTC 2017
Module: rtems-libbsd
Branch: master
Commit: 9e8ce9ae2e3a9879418cf4dab886d2c22998a9e5
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=9e8ce9ae2e3a9879418cf4dab886d2c22998a9e5
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Tue Jan 10 14:41:23 2017 +0100
pf: Some fixes after the update
---
freebsd/sbin/pfctl/pfctl.c | 1 +
freebsd/sbin/pfctl/pfctl_parser.c | 2 ++
freebsd/sbin/pfctl/rtems-bsd-pfctl-namespace.h | 2 ++
testsuite/pf01/test_main.c | 3 ++-
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/freebsd/sbin/pfctl/pfctl.c b/freebsd/sbin/pfctl/pfctl.c
index f9efa09..fb22a5d 100644
--- a/freebsd/sbin/pfctl/pfctl.c
+++ b/freebsd/sbin/pfctl/pfctl.c
@@ -2,6 +2,7 @@
#ifdef __rtems__
#include "rtems-bsd-pfctl-namespace.h"
+#define ENABLE_ALTQ
#endif /* __rtems__ */
/* $OpenBSD: pfctl.c,v 1.278 2008/08/31 20:18:17 jmc Exp $ */
diff --git a/freebsd/sbin/pfctl/pfctl_parser.c b/freebsd/sbin/pfctl/pfctl_parser.c
index cb49dc2..917980a 100644
--- a/freebsd/sbin/pfctl/pfctl_parser.c
+++ b/freebsd/sbin/pfctl/pfctl_parser.c
@@ -2,6 +2,8 @@
#ifdef __rtems__
#include "rtems-bsd-pfctl-namespace.h"
+#define WITH_INET6
+#define WITH_INET
#endif /* __rtems__ */
/* $OpenBSD: pfctl_parser.c,v 1.240 2008/06/10 20:55:02 mcbride Exp $ */
diff --git a/freebsd/sbin/pfctl/rtems-bsd-pfctl-namespace.h b/freebsd/sbin/pfctl/rtems-bsd-pfctl-namespace.h
index 4e815fe..e1672e9 100644
--- a/freebsd/sbin/pfctl/rtems-bsd-pfctl-namespace.h
+++ b/freebsd/sbin/pfctl/rtems-bsd-pfctl-namespace.h
@@ -8,6 +8,8 @@
#define pfctlylval _bsd_pfctl_pfctlylval
#define pfctlyparse _bsd_pfctl_pfctlyparse
#define rt_tableid_max _bsd_pfctl_rt_tableid_max
+#define map_tos _bsd_pfctl_map_tos
+#define kw_casecmp _bsd_pfctl_kw_casecmp
#define pfctl_load_anchors _bsd_pfctl_pfctl_load_anchors
#define parseport _bsd_pfctl_parseport
#define parseicmpspec _bsd_pfctl_parseicmpspec
diff --git a/testsuite/pf01/test_main.c b/testsuite/pf01/test_main.c
index 4f70316..51c8839 100644
--- a/testsuite/pf01/test_main.c
+++ b/testsuite/pf01/test_main.c
@@ -377,7 +377,8 @@ run_pfctl(int argc, char *argv[], int expected_result)
snapshot2.workspace_info.Free.largest = 0;
snapshot.heap_info.Free.largest = 0;
snapshot2.heap_info.Free.largest = 0;
- assert(rtems_resource_snapshot_equal(&snapshot, &snapshot2));
+ assert(exit_code == EXIT_SUCCESS ||
+ rtems_resource_snapshot_equal(&snapshot, &snapshot2));
}
static void
More information about the vc
mailing list