diff options
-rwxr-xr-x | extensions/.CONNMARK-test | 2 | ||||
-rwxr-xr-x | extensions/.connmark-test | 2 | ||||
-rw-r--r-- | extensions/libipt_CONNMARK.c | 167 | ||||
-rw-r--r-- | extensions/libipt_connmark.c | 129 |
4 files changed, 300 insertions, 0 deletions
diff --git a/extensions/.CONNMARK-test b/extensions/.CONNMARK-test new file mode 100755 index 00000000..a5137594 --- /dev/null +++ b/extensions/.CONNMARK-test @@ -0,0 +1,2 @@ +#! /bin/sh +[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_CONNMARK.c ] && echo CONNMARK diff --git a/extensions/.connmark-test b/extensions/.connmark-test new file mode 100755 index 00000000..80d437b9 --- /dev/null +++ b/extensions/.connmark-test @@ -0,0 +1,2 @@ +#! /bin/sh +[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_connmark.c ] && echo connmark diff --git a/extensions/libipt_CONNMARK.c b/extensions/libipt_CONNMARK.c new file mode 100644 index 00000000..824c1de0 --- /dev/null +++ b/extensions/libipt_CONNMARK.c @@ -0,0 +1,167 @@ +/* Shared library add-on to iptables to add CONNMARK target support. */ +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <getopt.h> + +#include <iptables.h> +#include <linux/netfilter_ipv4/ip_tables.h> +#include <linux/netfilter_ipv4/ipt_CONNMARK.h> + +#if 0 +struct markinfo { + struct ipt_entry_target t; + struct ipt_connmark_target_info mark; +}; +#endif + +/* Function which prints out usage message. */ +static void +help(void) +{ + printf( +"CONNMARK target v%s options:\n" +" --set-mark value Set conntrack mark value\n" +" --save-mark Save the packet nfmark on the connection\n" +" --restore-mark Restore saved nfmark value\n" +"\n", +NETFILTER_VERSION); +} + +static struct option opts[] = { + { "set-mark", 1, 0, '1' }, + { "save-mark", 0, 0, '2' }, + { "restore-mark", 0, 0, '3' }, + { 0 } +}; + +/* Initialize the target. */ +static void +init(struct ipt_entry_target *t, unsigned int *nfcache) +{ +} + +/* Function which parses command options; returns true if it + ate an option */ +static int +parse(int c, char **argv, int invert, unsigned int *flags, + const struct ipt_entry *entry, + struct ipt_entry_target **target) +{ + struct ipt_connmark_target_info *markinfo + = (struct ipt_connmark_target_info *)(*target)->data; + + switch (c) { + char *end; + case '1': + markinfo->mode = IPT_CONNMARK_SET; + markinfo->mark = strtoul(optarg, &end, 0); + if (*end != '\0' || end == optarg) + exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg); + if (*flags) + exit_error(PARAMETER_PROBLEM, + "CONNMARK target: Can't specify --set-mark twice"); + *flags = 1; + break; + case '2': + markinfo->mode = IPT_CONNMARK_SAVE; + if (*flags) + exit_error(PARAMETER_PROBLEM, + "CONNMARK target: Can't specify --save-mark twice"); + *flags = 1; + break; + case '3': + markinfo->mode = IPT_CONNMARK_RESTORE; + if (*flags) + exit_error(PARAMETER_PROBLEM, + "CONNMARK target: Can't specify --restore-mark twice"); + *flags = 1; + break; + default: + return 0; + } + + return 1; +} + +static void +final_check(unsigned int flags) +{ + if (!flags) + exit_error(PARAMETER_PROBLEM, + "CONNMARK target: Parameter --set-mark is required"); +} + +static void +print_mark(unsigned long mark, int numeric) +{ + printf("0x%lx ", mark); +} + +/* Prints out the targinfo. */ +static void +print(const struct ipt_ip *ip, + const struct ipt_entry_target *target, + int numeric) +{ + const struct ipt_connmark_target_info *markinfo = + (const struct ipt_connmark_target_info *)target->data; + switch (markinfo->mode) { + case IPT_CONNMARK_SET: + printf("CONNMARK set "); + print_mark(markinfo->mark, numeric); + break; + case IPT_CONNMARK_SAVE: + printf("CONNMARK save "); + break; + case IPT_CONNMARK_RESTORE: + printf("CONNMARK restore "); + break; + default: + printf("ERROR: UNKNOWN CONNMARK MODE "); + break; + } +} + +/* Saves the union ipt_targinfo in parsable form to stdout. */ +static void +save(const struct ipt_ip *ip, const struct ipt_entry_target *target) +{ + const struct ipt_connmark_target_info *markinfo = + (const struct ipt_connmark_target_info *)target->data; + + switch (markinfo->mode) { + case IPT_CONNMARK_SET: + printf("--set-mark 0x%lx ", markinfo->mark); + break; + case IPT_CONNMARK_SAVE: + printf("--save-mark "); + break; + case IPT_CONNMARK_RESTORE: + printf("--restore-mark "); + break; + default: + printf("ERROR: UNKNOWN CONNMARK MODE "); + break; + } +} + +struct iptables_target mark += { NULL, + "CONNMARK", + NETFILTER_VERSION, + IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), + IPT_ALIGN(sizeof(struct ipt_connmark_target_info)), + &help, + &init, + &parse, + &final_check, + &print, + &save, + opts +}; + +void _init(void) +{ + register_target(&mark); +} diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c new file mode 100644 index 00000000..e71d9629 --- /dev/null +++ b/extensions/libipt_connmark.c @@ -0,0 +1,129 @@ +/* Shared library add-on to iptables to add CONNMARK matching support. */ +#include <stdio.h> +#include <netdb.h> +#include <string.h> +#include <stdlib.h> +#include <getopt.h> + +#include <iptables.h> +#include <linux/netfilter_ipv4/ipt_connmark.h> + +/* Function which prints out usage message. */ +static void +help(void) +{ + printf( +"CONNMARK match v%s options:\n" +"[!] --mark value[/mask] Match nfmark value with optional mask\n" +"\n", +NETFILTER_VERSION); +} + +static struct option opts[] = { + { "mark", 1, 0, '1' }, + {0} +}; + +/* Initialize the match. */ +static void +init(struct ipt_entry_match *m, unsigned int *nfcache) +{ + /* Can't cache this. */ + *nfcache |= NFC_UNKNOWN; +} + +/* Function which parses command options; returns true if it + ate an option */ +static int +parse(int c, char **argv, int invert, unsigned int *flags, + const struct ipt_entry *entry, + unsigned int *nfcache, + struct ipt_entry_match **match) +{ + struct ipt_connmark_info *markinfo = (struct ipt_connmark_info *)(*match)->data; + + switch (c) { + char *end; + case '1': + if (check_inverse(optarg, &invert)) + optind++; + markinfo->mark = strtoul(optarg, &end, 0); + if (*end == '/') { + markinfo->mask = strtoul(end+1, &end, 0); + } else + markinfo->mask = 0xffffffff; + if (*end != '\0' || end == optarg) + exit_error(PARAMETER_PROBLEM, "Bad MARK value `%s'", optarg); + if (invert) + markinfo->invert = 1; + *flags = 1; + break; + + default: + return 0; + } + return 1; +} + +static void +print_mark(unsigned long mark, unsigned long mask, int invert, int numeric) +{ + if (invert) + fputc('!', stdout); + + if(mask != 0xffffffff) + printf("0x%lx/0x%lx ", mark, mask); + else + printf("0x%lx ", mark); +} + +/* Final check; must have specified --mark. */ +static void +final_check(unsigned int flags) +{ + if (!flags) + exit_error(PARAMETER_PROBLEM, + "MARK match: You must specify `--mark'"); +} + +/* Prints out the matchinfo. */ +static void +print(const struct ipt_ip *ip, + const struct ipt_entry_match *match, + int numeric) +{ + printf("CONNMARK match "); + print_mark(((struct ipt_connmark_info *)match->data)->mark, + ((struct ipt_connmark_info *)match->data)->mask, + ((struct ipt_connmark_info *)match->data)->invert, numeric); +} + +/* Saves the union ipt_matchinfo in parsable form to stdout. */ +static void +save(const struct ipt_ip *ip, const struct ipt_entry_match *match) +{ + printf("--mark "); + print_mark(((struct ipt_connmark_info *)match->data)->mark, + ((struct ipt_connmark_info *)match->data)->mask, + ((struct ipt_connmark_info *)match->data)->invert, 0); +} + +struct iptables_match mark += { NULL, + "connmark", + NETFILTER_VERSION, + IPT_ALIGN(sizeof(struct ipt_connmark_info)), + IPT_ALIGN(sizeof(struct ipt_connmark_info)), + &help, + &init, + &parse, + &final_check, + &print, + &save, + opts +}; + +void _init(void) +{ + register_match(&mark); +} |