[netfilter-cvslog] r6985 - in trunk/iptables: extensions
include/linux/netfilter
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Sat Aug 4 10:05:46 CEST 2007
Author: yasuyuki at netfilter.org
Date: 2007-08-04 10:05:46 +0200 (Sat, 04 Aug 2007)
New Revision: 6985
Added:
trunk/iptables/extensions/libxt_CONNSECMARK.c
trunk/iptables/include/linux/netfilter/xt_CONNSECMARK.h
Removed:
trunk/iptables/extensions/libip6t_CONNSECMARK.c
trunk/iptables/extensions/libipt_CONNSECMARK.c
Modified:
trunk/iptables/extensions/Makefile
Log:
Unifies libip[6]t_CONNSECMARK into libxt_CONNSECMARK
Modified: trunk/iptables/extensions/Makefile
===================================================================
--- trunk/iptables/extensions/Makefile 2007-08-04 08:04:43 UTC (rev 6984)
+++ trunk/iptables/extensions/Makefile 2007-08-04 08:05:46 UTC (rev 6985)
@@ -10,9 +10,9 @@
PFX_EXT_SLIB:=comment connlimit dscp esp length limit mac mark multiport physdev pkttype sctp standard tcp tcpmss udp CONNMARK NFQUEUE NOTRACK TCPMSS
ifeq ($(DO_SELINUX), 1)
-PF_EXT_SE_SLIB:=CONNSECMARK
-PF6_EXT_SE_SLIB:=CONNSECMARK
-PFX_EXT_SE_SLIB:=SECMARK
+PF_EXT_SE_SLIB:=
+PF6_EXT_SE_SLIB:=
+PFX_EXT_SE_SLIB:=CONNSECMARK SECMARK
endif
# Optionals
Deleted: trunk/iptables/extensions/libip6t_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-08-04 08:04:43 UTC (rev 6984)
+++ trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-08-04 08:05:46 UTC (rev 6985)
@@ -1,124 +0,0 @@
-/*
- * Shared library add-on to ip6tables to add CONNSECMARK target support.
- *
- * Based on the MARK and CONNMARK targets.
- *
- * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris at redhat.com>
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <ip6tables.h>
-#include <linux/netfilter/xt_CONNSECMARK.h>
-
-#define PFX "CONNSECMARK target: "
-
-static void help(void)
-{
- printf(
-"CONNSECMARK target v%s options:\n"
-" --save Copy security mark from packet to conntrack\n"
-" --restore Copy security mark from connection to packet\n"
-"\n",
-IPTABLES_VERSION);
-}
-
-static const struct option opts[] = {
- { "save", 0, 0, '1' },
- { "restore", 0, 0, '2' },
- { 0 }
-};
-
-static int parse(int c, char **argv, int invert, unsigned int *flags,
- const void *entry, struct xt_entry_target **target)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)(*target)->data;
-
- switch (c) {
- case '1':
- if (*flags & CONNSECMARK_SAVE)
- exit_error(PARAMETER_PROBLEM, PFX
- "Can't specify --save twice");
- info->mode = CONNSECMARK_SAVE;
- *flags |= CONNSECMARK_SAVE;
- break;
-
- case '2':
- if (*flags & CONNSECMARK_RESTORE)
- exit_error(PARAMETER_PROBLEM, PFX
- "Can't specify --restore twice");
- info->mode = CONNSECMARK_RESTORE;
- *flags |= CONNSECMARK_RESTORE;
- break;
-
- default:
- return 0;
- }
-
- return 1;
-}
-
-static void final_check(unsigned int flags)
-{
- if (!flags)
- exit_error(PARAMETER_PROBLEM, PFX "parameter required");
-
- if (flags == (CONNSECMARK_SAVE|CONNSECMARK_RESTORE))
- exit_error(PARAMETER_PROBLEM, PFX "only one flag of --save "
- "or --restore is allowed");
-}
-
-static void print_connsecmark(struct xt_connsecmark_target_info *info)
-{
- switch (info->mode) {
- case CONNSECMARK_SAVE:
- printf("save ");
- break;
-
- case CONNSECMARK_RESTORE:
- printf("restore ");
- break;
-
- default:
- exit_error(OTHER_PROBLEM, PFX "invalid mode %hhu\n", info->mode);
- }
-}
-
-static void print(const void *ip,
- const struct xt_entry_target *target, int numeric)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)(target)->data;
-
- printf("CONNSECMARK ");
- print_connsecmark(info);
-}
-
-static void save(const void *ip, const struct xt_entry_target *target)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)target->data;
-
- printf("--");
- print_connsecmark(info);
-}
-
-static struct ip6tables_target connsecmark = {
- .name = "CONNSECMARK",
- .version = IPTABLES_VERSION,
- .size = IP6T_ALIGN(sizeof(struct xt_connsecmark_target_info)),
- .userspacesize = IP6T_ALIGN(sizeof(struct xt_connsecmark_target_info)),
- .parse = &parse,
- .help = &help,
- .final_check = &final_check,
- .print = &print,
- .save = &save,
- .extra_opts = opts
-};
-
-void _init(void)
-{
- register_target6(&connsecmark);
-}
Deleted: trunk/iptables/extensions/libipt_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-08-04 08:04:43 UTC (rev 6984)
+++ trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-08-04 08:05:46 UTC (rev 6985)
@@ -1,125 +0,0 @@
-/*
- * Shared library add-on to iptables to add CONNSECMARK target support.
- *
- * Based on the MARK and CONNMARK targets.
- *
- * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris at redhat.com>
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <iptables.h>
-#include <linux/netfilter/xt_CONNSECMARK.h>
-
-#define PFX "CONNSECMARK target: "
-
-static void help(void)
-{
- printf(
-"CONNSECMARK target v%s options:\n"
-" --save Copy security mark from packet to conntrack\n"
-" --restore Copy security mark from connection to packet\n"
-"\n",
-IPTABLES_VERSION);
-}
-
-static const struct option opts[] = {
- { "save", 0, 0, '1' },
- { "restore", 0, 0, '2' },
- { 0 }
-};
-
-static int parse(int c, char **argv, int invert, unsigned int *flags,
- const void *entry, struct xt_entry_target **target)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)(*target)->data;
-
- switch (c) {
- case '1':
- if (*flags & CONNSECMARK_SAVE)
- exit_error(PARAMETER_PROBLEM, PFX
- "Can't specify --save twice");
- info->mode = CONNSECMARK_SAVE;
- *flags |= CONNSECMARK_SAVE;
- break;
-
- case '2':
- if (*flags & CONNSECMARK_RESTORE)
- exit_error(PARAMETER_PROBLEM, PFX
- "Can't specify --restore twice");
- info->mode = CONNSECMARK_RESTORE;
- *flags |= CONNSECMARK_RESTORE;
- break;
-
- default:
- return 0;
- }
-
- return 1;
-}
-
-static void final_check(unsigned int flags)
-{
- if (!flags)
- exit_error(PARAMETER_PROBLEM, PFX "parameter required");
-
- if (flags == (CONNSECMARK_SAVE|CONNSECMARK_RESTORE))
- exit_error(PARAMETER_PROBLEM, PFX "only one flag of --save "
- "or --restore is allowed");
-}
-
-static void print_connsecmark(struct xt_connsecmark_target_info *info)
-{
- switch (info->mode) {
- case CONNSECMARK_SAVE:
- printf("save ");
- break;
-
- case CONNSECMARK_RESTORE:
- printf("restore ");
- break;
-
- default:
- exit_error(OTHER_PROBLEM, PFX "invalid mode %hhu\n", info->mode);
- }
-}
-
-static void print(const void *ip,
- const struct xt_entry_target *target, int numeric)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)(target)->data;
-
- printf("CONNSECMARK ");
- print_connsecmark(info);
-}
-
-static void save(const void *ip, const struct xt_entry_target *target)
-{
- struct xt_connsecmark_target_info *info =
- (struct xt_connsecmark_target_info*)target->data;
-
- printf("--");
- print_connsecmark(info);
-}
-
-static struct iptables_target connsecmark = {
- .name = "CONNSECMARK",
- .version = IPTABLES_VERSION,
- .revision = 0,
- .size = IPT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
- .userspacesize = IPT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
- .parse = &parse,
- .help = &help,
- .final_check = &final_check,
- .print = &print,
- .save = &save,
- .extra_opts = opts
-};
-
-void _init(void)
-{
- register_target(&connsecmark);
-}
Added: trunk/iptables/extensions/libxt_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libxt_CONNSECMARK.c (rev 0)
+++ trunk/iptables/extensions/libxt_CONNSECMARK.c 2007-08-04 08:05:46 UTC (rev 6985)
@@ -0,0 +1,142 @@
+/*
+ * Shared library add-on to iptables to add CONNSECMARK target support.
+ *
+ * Based on the MARK and CONNMARK targets.
+ *
+ * Copyright (C) 2006 Red Hat, Inc., James Morris <jmorris at redhat.com>
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <xtables.h>
+#include <linux/netfilter/xt_CONNSECMARK.h>
+
+#define PFX "CONNSECMARK target: "
+
+static void help(void)
+{
+ printf(
+"CONNSECMARK target v%s options:\n"
+" --save Copy security mark from packet to conntrack\n"
+" --restore Copy security mark from connection to packet\n"
+"\n",
+IPTABLES_VERSION);
+}
+
+static const struct option opts[] = {
+ { "save", 0, 0, '1' },
+ { "restore", 0, 0, '2' },
+ { 0 }
+};
+
+static int parse(int c, char **argv, int invert, unsigned int *flags,
+ const void *entry, struct xt_entry_target **target)
+{
+ struct xt_connsecmark_target_info *info =
+ (struct xt_connsecmark_target_info*)(*target)->data;
+
+ switch (c) {
+ case '1':
+ if (*flags & CONNSECMARK_SAVE)
+ exit_error(PARAMETER_PROBLEM, PFX
+ "Can't specify --save twice");
+ info->mode = CONNSECMARK_SAVE;
+ *flags |= CONNSECMARK_SAVE;
+ break;
+
+ case '2':
+ if (*flags & CONNSECMARK_RESTORE)
+ exit_error(PARAMETER_PROBLEM, PFX
+ "Can't specify --restore twice");
+ info->mode = CONNSECMARK_RESTORE;
+ *flags |= CONNSECMARK_RESTORE;
+ break;
+
+ default:
+ return 0;
+ }
+
+ return 1;
+}
+
+static void final_check(unsigned int flags)
+{
+ if (!flags)
+ exit_error(PARAMETER_PROBLEM, PFX "parameter required");
+
+ if (flags == (CONNSECMARK_SAVE|CONNSECMARK_RESTORE))
+ exit_error(PARAMETER_PROBLEM, PFX "only one flag of --save "
+ "or --restore is allowed");
+}
+
+static void print_connsecmark(struct xt_connsecmark_target_info *info)
+{
+ switch (info->mode) {
+ case CONNSECMARK_SAVE:
+ printf("save ");
+ break;
+
+ case CONNSECMARK_RESTORE:
+ printf("restore ");
+ break;
+
+ default:
+ exit_error(OTHER_PROBLEM, PFX "invalid mode %hhu\n", info->mode);
+ }
+}
+
+static void print(const void *ip,
+ const struct xt_entry_target *target, int numeric)
+{
+ struct xt_connsecmark_target_info *info =
+ (struct xt_connsecmark_target_info*)(target)->data;
+
+ printf("CONNSECMARK ");
+ print_connsecmark(info);
+}
+
+static void save(const void *ip, const struct xt_entry_target *target)
+{
+ struct xt_connsecmark_target_info *info =
+ (struct xt_connsecmark_target_info*)target->data;
+
+ printf("--");
+ print_connsecmark(info);
+}
+
+static struct xtables_target connsecmark = {
+ .family = AF_INET,
+ .name = "CONNSECMARK",
+ .version = IPTABLES_VERSION,
+ .revision = 0,
+ .size = XT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+ .userspacesize = XT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+ .parse = &parse,
+ .help = &help,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts,
+};
+
+static struct xtables_target connsecmark6 = {
+ .family = AF_INET6,
+ .name = "CONNSECMARK",
+ .version = IPTABLES_VERSION,
+ .revision = 0,
+ .size = XT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+ .userspacesize = XT_ALIGN(sizeof(struct xt_connsecmark_target_info)),
+ .parse = &parse,
+ .help = &help,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts,
+};
+
+void _init(void)
+{
+ xtables_register_target(&connsecmark);
+ xtables_register_target(&connsecmark6);
+}
Added: trunk/iptables/include/linux/netfilter/xt_CONNSECMARK.h
===================================================================
--- trunk/iptables/include/linux/netfilter/xt_CONNSECMARK.h (rev 0)
+++ trunk/iptables/include/linux/netfilter/xt_CONNSECMARK.h 2007-08-04 08:05:46 UTC (rev 6985)
@@ -0,0 +1,13 @@
+#ifndef _XT_CONNSECMARK_H_target
+#define _XT_CONNSECMARK_H_target
+
+enum {
+ CONNSECMARK_SAVE = 1,
+ CONNSECMARK_RESTORE,
+};
+
+struct xt_connsecmark_target_info {
+ u_int8_t mode;
+};
+
+#endif /*_XT_CONNSECMARK_H_target */
More information about the netfilter-cvslog
mailing list