diff options
| -rw-r--r-- | conntrack.8 | 17 | ||||
| -rw-r--r-- | extensions/Makefile.am | 3 | ||||
| -rw-r--r-- | extensions/libct_proto_udplite.c | 197 | ||||
| -rw-r--r-- | include/conntrack.h | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/conntrack.c | 1 |
6 files changed, 218 insertions, 3 deletions
diff --git a/conntrack.8 b/conntrack.8 index 208f7a2..b797a1f 100644 --- a/conntrack.8 +++ b/conntrack.8 @@ -1,4 +1,4 @@ -.TH CONNTRACK 8 "Oct 22, 2008" "" "" +.TH CONNTRACK 8 "Apr 11, 2009" "" "" .\" Man page written by Harald Welte <laforge@netfilter.org (Jun 2005) .\" Maintained by Pablo Neira Ayuso <pablo@netfilter.org (May 2007) @@ -199,6 +199,21 @@ ICMP Code. Has to be specified numerically. .TP .BI "--icmp-id " "ID" ICMP Id. Has to be specified numerically (non-mandatory) +.TP +UDPlite-specific fields: +.TP +.BI "--sport, --orig-port-src " "PORT" +Source port in original direction +.TP +.BI "--dport, --orig-port-dst " "PORT" +Destination port in original direction +.TP +.BI "--reply-port-src " "PORT" +Source port in reply direction +.TP +.BI "--reply-port-dst " "PORT" +Destination port in reply direction +.TP .SH DIAGNOSTICS The exit code is 0 for correct function. Errors which appear to be caused by invalid command line parameters cause an exit code of 2. Any other errors diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 7b48f05..70edf47 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -2,10 +2,11 @@ include $(top_srcdir)/Make_global.am noinst_LTLIBRARIES = libct_proto_tcp.la libct_proto_udp.la \ libct_proto_icmp.la libct_proto_icmpv6.la \ - libct_proto_unknown.la + libct_proto_unknown.la libct_proto_udplite.la libct_proto_tcp_la_SOURCES = libct_proto_tcp.c libct_proto_udp_la_SOURCES = libct_proto_udp.c +libct_proto_udplite_la_SOURCES = libct_proto_udplite.c libct_proto_icmp_la_SOURCES = libct_proto_icmp.c libct_proto_icmpv6_la_SOURCES = libct_proto_icmpv6.c libct_proto_unknown_la_SOURCES = libct_proto_unknown.c diff --git a/extensions/libct_proto_udplite.c b/extensions/libct_proto_udplite.c new file mode 100644 index 0000000..bffd5fe --- /dev/null +++ b/extensions/libct_proto_udplite.c @@ -0,0 +1,197 @@ +/* + * (C) 2009 by Pablo Neira Ayuso <pablo@netfilter.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ +#include <stdio.h> +#include <getopt.h> +#include <stdlib.h> +#include <netinet/in.h> /* For htons */ +#include <libnetfilter_conntrack/libnetfilter_conntrack.h> + +#include "conntrack.h" + +#ifndef IPPROTO_UDPLITE +#define IPPROTO_UDPLITE 136 +#endif + +enum { + CT_UDPLITE_ORIG_SPORT = (1 << 0), + CT_UDPLITE_ORIG_DPORT = (1 << 1), + CT_UDPLITE_REPL_SPORT = (1 << 2), + CT_UDPLITE_REPL_DPORT = (1 << 3), + CT_UDPLITE_MASK_SPORT = (1 << 4), + CT_UDPLITE_MASK_DPORT = (1 << 5), + CT_UDPLITE_EXPTUPLE_SPORT = (1 << 6), + CT_UDPLITE_EXPTUPLE_DPORT = (1 << 7) +}; + +#define UDP_OPT_MAX 11 +static struct option opts[UDP_OPT_MAX] = { + { .name = "orig-port-src", .has_arg = 1, .val = '1' }, + { .name = "orig-port-dst", .has_arg = 1, .val = '2' }, + { .name = "reply-port-src", .has_arg = 1, .val = '3' }, + { .name = "reply-port-dst", .has_arg = 1, .val = '4' }, + { .name = "mask-port-src", .has_arg = 1, .val = '5' }, + { .name = "mask-port-dst", .has_arg = 1, .val = '6' }, + { .name = "tuple-port-src", .has_arg = 1, .val = '7' }, + { .name = "tuple-port-dst", .has_arg = 1, .val = '8' }, + { .name = "sport", .has_arg = 1, .val = '1' }, + { .name = "dport", .has_arg = 1, .val = '2' }, + {0, 0, 0, 0} +}; + +static const char *udplite_optflags[UDP_OPT_MAX] = { + [0] = "sport", + [1] = "dport", + [2] = "reply-port-src", + [3] = "reply-port-dst", + [4] = "mask-port-src", + [5] = "mask-port-dst", + [6] = "tuple-port-src", + [7] = "tuple-port-dst" +}; + +static void help(void) +{ + fprintf(stdout, " --orig-port-src\t\toriginal source port\n"); + fprintf(stdout, " --orig-port-dst\t\toriginal destination port\n"); + fprintf(stdout, " --reply-port-src\t\treply source port\n"); + fprintf(stdout, " --reply-port-dst\t\treply destination port\n"); + fprintf(stdout, " --mask-port-src\t\tmask source port\n"); + fprintf(stdout, " --mask-port-dst\t\tmask destination port\n"); + fprintf(stdout, " --tuple-port-src\t\texpectation tuple src port\n"); + fprintf(stdout, " --tuple-port-src\t\texpectation tuple dst port\n"); +} + +static char udplite_commands_v_options[NUMBER_OF_CMD][UDP_OPT_MAX] = +{ + /* 1 2 3 4 5 6 7 8 */ +/*CT_LIST*/ {2,2,2,2,0,0,0,0}, +/*CT_CREATE*/ {3,3,3,3,0,0,0,0}, +/*CT_UPDATE*/ {2,2,2,2,0,0,0,0}, +/*CT_DELETE*/ {2,2,2,2,0,0,0,0}, +/*CT_GET*/ {3,3,3,3,0,0,0,0}, +/*CT_FLUSH*/ {0,0,0,0,0,0,0,0}, +/*CT_EVENT*/ {2,2,2,2,0,0,0,0}, +/*CT_VERSION*/ {0,0,0,0,0,0,0,0}, +/*CT_HELP*/ {0,0,0,0,0,0,0,0}, +/*EXP_LIST*/ {0,0,0,0,0,0,0,0}, +/*EXP_CREATE*/ {1,1,1,1,1,1,1,1}, +/*EXP_DELETE*/ {1,1,1,1,0,0,0,0}, +/*EXP_GET*/ {1,1,1,1,0,0,0,0}, +/*EXP_FLUSH*/ {0,0,0,0,0,0,0,0}, +/*EXP_EVENT*/ {0,0,0,0,0,0,0,0}, +}; + +static int parse_options(char c, + struct nf_conntrack *ct, + struct nf_conntrack *exptuple, + struct nf_conntrack *mask, + unsigned int *flags) +{ + switch(c) { + u_int16_t port; + case '1': + port = htons(atoi(optarg)); + nfct_set_attr_u16(ct, ATTR_ORIG_PORT_SRC, port); + nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_ORIG_SPORT; + break; + case '2': + port = htons(atoi(optarg)); + nfct_set_attr_u16(ct, ATTR_ORIG_PORT_DST, port); + nfct_set_attr_u8(ct, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_ORIG_DPORT; + break; + case '3': + port = htons(atoi(optarg)); + nfct_set_attr_u16(ct, ATTR_REPL_PORT_SRC, port); + nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_REPL_SPORT; + break; + case '4': + port = htons(atoi(optarg)); + nfct_set_attr_u16(ct, ATTR_REPL_PORT_DST, port); + nfct_set_attr_u8(ct, ATTR_REPL_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_REPL_DPORT; + break; + case '5': + port = htons(atoi(optarg)); + nfct_set_attr_u16(mask, ATTR_ORIG_PORT_SRC, port); + nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_MASK_SPORT; + break; + case '6': + port = htons(atoi(optarg)); + nfct_set_attr_u16(mask, ATTR_ORIG_PORT_DST, port); + nfct_set_attr_u8(mask, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_MASK_DPORT; + break; + case '7': + port = htons(atoi(optarg)); + nfct_set_attr_u16(exptuple, ATTR_ORIG_PORT_SRC, port); + nfct_set_attr_u8(exptuple, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_EXPTUPLE_SPORT; + break; + case '8': + port = htons(atoi(optarg)); + nfct_set_attr_u16(exptuple, ATTR_ORIG_PORT_DST, port); + nfct_set_attr_u8(exptuple, ATTR_ORIG_L4PROTO, IPPROTO_UDPLITE); + *flags |= CT_UDPLITE_EXPTUPLE_DPORT; + break; + } + return 1; +} + +#define UDPLITE_VALID_FLAGS_MAX 2 +static unsigned int udplite_valid_flags[UDPLITE_VALID_FLAGS_MAX] = { + CT_UDPLITE_ORIG_SPORT | CT_UDPLITE_ORIG_DPORT, + CT_UDPLITE_REPL_SPORT | CT_UDPLITE_REPL_DPORT, +}; + +static void +final_check(unsigned int flags, unsigned int cmd, struct nf_conntrack *ct) +{ + int ret, partial; + + ret = generic_opt_check(flags, UDP_OPT_MAX, + udplite_commands_v_options[cmd], + udplite_optflags, + udplite_valid_flags, UDPLITE_VALID_FLAGS_MAX, + &partial); + if (!ret) { + switch(partial) { + case -1: + case 0: + exit_error(PARAMETER_PROBLEM, "you have to specify " + "`--sport' and " + "`--dport'"); + break; + case 1: + exit_error(PARAMETER_PROBLEM, "you have to specify " + "`--reply-src-port' and " + "`--reply-dst-port'"); + break; + } + } +} + +static struct ctproto_handler udplite = { + .name = "udplite", + .protonum = IPPROTO_UDPLITE, + .parse_opts = parse_options, + .final_check = final_check, + .help = help, + .opts = opts, + .version = VERSION, +}; + +void register_udplite(void) +{ + register_proto(&udplite); +} diff --git a/include/conntrack.h b/include/conntrack.h index 17c0121..2995d71 100644 --- a/include/conntrack.h +++ b/include/conntrack.h @@ -198,6 +198,7 @@ extern void register_proto(struct ctproto_handler *h); extern void register_tcp(void); extern void register_udp(void); +extern void register_udplite(void); extern void register_icmp(void); extern void register_icmpv6(void); extern void register_unknown(void); diff --git a/src/Makefile.am b/src/Makefile.am index 667040c..6c5b1a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ CLEANFILES = read_config_yy.c read_config_lex.c sbin_PROGRAMS = conntrack conntrackd conntrack_SOURCES = conntrack.c -conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_unknown.la +conntrack_LDADD = ../extensions/libct_proto_tcp.la ../extensions/libct_proto_udp.la ../extensions/libct_proto_udplite.la ../extensions/libct_proto_icmp.la ../extensions/libct_proto_icmpv6.la ../extensions/libct_proto_unknown.la conntrack_LDFLAGS = $(all_libraries) @LIBNETFILTER_CONNTRACK_LIBS@ conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c rbtree.c \ diff --git a/src/conntrack.c b/src/conntrack.c index e1c57e5..bf3e8e0 100644 --- a/src/conntrack.c +++ b/src/conntrack.c @@ -1051,6 +1051,7 @@ int main(int argc, char *argv[]) register_tcp(); register_udp(); + register_udplite(); register_icmp(); register_icmpv6(); register_unknown(); |