Changeset 4831944 in rtems-libbsd

Timestamp:

Jul 5, 2016, 2:31:43 PM (5 years ago)

Author:

Christian Mauderer <Christian.Mauderer@…>

Branches:

4.11

Children:

709fbfa

Parents:

85dd332

git-author:

Christian Mauderer <Christian.Mauderer@…> (07/05/16 14:31:43)

git-committer:

Sebastian Huber <sebastian.huber@…> (08/03/16 12:13:18)

Message:

pfctl: Adapt for RTEMS.

Location:

freebsd/contrib/pf/pfctl

Files:

• parse-data.h (added)
• parse.y (modified) (2 diffs)
• pf_print_state.c (modified) (1 diff)
• pfctl-data.h (added)
• pfctl.c (modified) (7 diffs)
• pfctl_altq-data.h (added)
• pfctl_altq.c (modified) (2 diffs)
• pfctl_optimize-data.h (added)
• pfctl_optimize.c (modified) (2 diffs)
• pfctl_osfp-data.h (added)
• pfctl_osfp.c (modified) (2 diffs)
• pfctl_parser-data.h (added)
• pfctl_parser.c (modified) (3 diffs)
• pfctl_qstats-data.h (added)
• pfctl_qstats.c (modified) (2 diffs)
• pfctl_radix-data.h (added)
• pfctl_radix.c (modified) (3 diffs)
• pfctl_table.c (modified) (2 diffs)

freebsd/contrib/pf/pfctl/parse.y

@@ -30 +30 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-user-space.h>
+#include <machine/rtems-bsd-program.h>
 #define pf_find_or_create_ruleset _bsd_pf_find_or_create_ruleset
 #define pf_anchor_setup _bsd_pf_anchor_setup
@@ -6134 +6135 @@
 #endif
 }
+#ifdef __rtems__
+#include "parse-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pf_print_state.c

@@ -33 +33 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

freebsd/contrib/pf/pfctl/pfctl.c

@@ -34 +34 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+
+#define __need_getopt_newlib
+#include <getopt.h>
+
+/* We need some functions from kernel space. */
+#define pf_get_ruleset_number _bsd_pf_get_ruleset_number
+#define pf_init_ruleset _bsd_pf_init_ruleset
+
+#include <rtems/linkersets.h>
+#include <machine/rtems-bsd-commands.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -293 +306 @@
 usage(void)
 {
+#ifndef __rtems__
         extern char *__progname;
+#else /* __rtems__ */
+#define __progname "pfctl"
+#endif /* __rtems__ */
 
         fprintf(stderr, "usage: %s [-AdeghmNnOPqRrvz] ", __progname);
@@ -1646 +1663 @@
         pf->limit[PF_LIMIT_TABLE_ENTRIES] = PFR_KENTRY_HIWAT;
 
+#ifndef __rtems__
         mib[0] = CTL_HW;
 #ifdef __FreeBSD__
@@ -1656 +1674 @@
                 err(1, "sysctl");
         if (mem <= 100*1024*1024)
+#endif /* __rtems__ */
                 pf->limit[PF_LIMIT_TABLE_ENTRIES] = PFR_KENTRY_HIWAT_SMALL; 
 
@@ -2070 +2089 @@
 }
 
+#ifdef __rtems__
+static int main(int argc, char *argv[]);
+
+RTEMS_LINKER_RWSET(bsd_prog_pfctl, char);
+
+int
+rtems_bsd_command_pfctl(int argc, char *argv[])
+{
+        int exit_code = EXIT_FAILURE;
+        const void *data_buf = RTEMS_LINKER_SET_BEGIN(bsd_prog_pfctl);
+        const size_t data_size = RTEMS_LINKER_SET_SIZE(bsd_prog_pfctl);
+
+        rtems_bsd_program_lock();
+        exit_code = rtems_bsd_program_call_main_with_data_restore("pfctl",
+            main, argc, argv, data_buf, data_size);
+        rtems_bsd_program_unlock();
+
+        return exit_code;
+}
+
+#endif /* __rtems__ */
 int
 main(int argc, char *argv[])
@@ -2080 +2120 @@
         char     anchorname[MAXPATHLEN];
         char    *path;
+
+#ifdef __rtems__
+        struct getopt_data getopt_data;
+        memset(&getopt_data, 0, sizeof(getopt_data));
+#define optind getopt_data.optind
+#define optarg getopt_data.optarg
+#define opterr getopt_data.opterr
+#define optopt getopt_data.optopt
+#define getopt(argc, argv, opt) getopt_r(argc, argv, "+" opt, &getopt_data)
+#endif /* __rtems__ */
 
         if (argc < 2)
@@ -2472 +2522 @@
         exit(error);
 }
+#ifdef __rtems__
+#include "pfctl-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_altq.c

@@ -21 +21 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -1277 +1280 @@
                 printf(")");
 }
+#ifdef __rtems__
+#include "pfctl_altq-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_optimize.c

@@ -19 +19 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+
+/* We need some functions from kernel space. */
+#define pf_find_or_create_ruleset _bsd_pf_find_or_create_ruleset
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -1693 +1699 @@
         free(block);
 }
-
+#ifdef __rtems__
+#include "pfctl_optimize-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_osfp.c

@@ -19 +19 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <rtems/bsd/sys/types.h>
 #include <sys/ioctl.h>
@@ -1126 +1129 @@
         return (buf);
 }
+#ifdef __rtems__
+#include "pfctl_osfp-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_parser.c

@@ -34 +34 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -41 +44 @@
 #include <sys/socket.h>
 #include <rtems/bsd/sys/param.h>
+#ifdef __rtems__
+#include <rtems/bsd/sys/errno.h>
+#endif /* __rtems__ */
 #include <sys/proc.h>
 #include <net/if.h>
@@ -1768 +1774 @@
         return ioctl(dev, cmd, &trans);
 }
+#ifdef __rtems__
+#include "pfctl_parser-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_qstats.c

@@ -19 +19 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -456 +459 @@
                 qs->avgn++;
 }
+#ifdef __rtems__
+#include "pfctl_qstats-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_radix.c

@@ -33 +33 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -49 +52 @@
 #include <stdlib.h>
 #include <limits.h>
+#ifdef __rtems__
+#define SIZE_T_MAX SIZE_MAX
+#endif /* __rtems__ */
 #include <err.h>
 
@@ -595 +601 @@
         }
 }
+#ifdef __rtems__
+#include "pfctl_radix-data.h"
+#endif /* __rtems__ */

freebsd/contrib/pf/pfctl/pfctl_table.c

@@ -33 +33 @@
  */
 
+#ifdef __rtems__
+#include <machine/rtems-bsd-program.h>
+#endif /* __rtems__ */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -496 +499 @@
 radix_perror(void)
 {
+#ifndef __rtems__
         extern char *__progname;
+#else /* __rtems__ */
+#define __progname "pfctl"
+#endif /* __rtems__ */
         fprintf(stderr, "%s: %s.\n", __progname, pfr_strerror(errno));
 }