Updated nfnetlink includes; removed ifdefs; added delete exp program

6 files changed, 249 insertions, 15 deletions

diff --git a/src/.gitignore b/src/.gitignore
index 2c6d8394..3e091cb5 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,8 @@
 genl-ctrl-list
 nf-ct-list
 nf-exp-list
-nf-exp-create
+nf-exp-add
+nf-exp-delete
 nf-log
 nf-monitor
 nl-addr-add
diff --git a/src/Makefile.am b/src/Makefile.am
index 317f2d94..c318dccc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ sbin_PROGRAMS = \
 
 noinst_PROGRAMS = \
 	nf-ct-list nf-log nf-queue nf-monitor \
-	nf-exp-list nf-exp-create \
+	nf-exp-list nf-exp-add nf-exp-delete \
 	nl-addr-add nl-addr-delete nl-addr-list \
 	nl-link-set nl-link-stats \
 	nl-link-ifindex2name nl-link-name2ifindex \
@@ -45,6 +45,10 @@ nf_log_SOURCES = nf-log.c
 nf_queue_SOURCES = nf-queue.c 
 nf_monitor_SOURCES = nf-monitor.c
 
+nf_exp_list_SOURCES = nf-exp-list.c 
+nf_exp_add_SOURCES = nf-exp-add.c 
+nf_exp_delete_SOURCES = nf-exp-delete.c 
+
 nl_addr_add_SOURCES = nl-addr-add.c
 nl_addr_delete_SOURCES = nl-addr-delete.c
 nl_addr_list_SOURCES = nl-addr-list.c
diff --git a/src/lib/exp.c b/src/lib/exp.c
index 7cebacc3..7e0a017e 100644
--- a/src/lib/exp.c
+++ b/src/lib/exp.c
@@ -6,7 +6,8 @@
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 20012 Rich Fought <Rich.Fought@watchguard.com>
+ * Copyright (c) 2008-2009 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
 /**
@@ -64,6 +65,35 @@ void nl_cli_exp_parse_helper_name(struct nfnl_exp *exp, char *arg)
     nfnl_exp_set_helper_name(exp, arg);
 }
 
+void nl_cli_exp_parse_zone(struct nfnl_exp *exp, char *arg)
+{
+    uint32_t zone = nl_cli_parse_u32(arg);
+    nfnl_exp_set_zone(exp, zone);
+}
+
+void nl_cli_exp_parse_flags(struct nfnl_exp *exp, char *arg)
+{
+    uint32_t flags = nl_cli_parse_u32(arg);
+    nfnl_exp_set_flags(exp, flags);
+}
+
+void nl_cli_exp_parse_class(struct nfnl_exp *exp, char *arg)
+{
+    uint32_t class = nl_cli_parse_u32(arg);
+    nfnl_exp_set_class(exp, class);
+}
+
+void nl_cli_exp_parse_nat_dir(struct nfnl_exp *exp, char *arg)
+{
+    uint32_t nat_dir = nl_cli_parse_u32(arg);
+    nfnl_exp_set_nat_dir(exp, nat_dir);
+}
+
+void nl_cli_exp_parse_fn(struct nfnl_exp *exp, char *arg)
+{
+    nfnl_exp_set_fn(exp, arg);
+}
+
 void nl_cli_exp_parse_src(struct nfnl_exp *exp, int tuple, char *arg)
 {
 	int err;
@@ -97,14 +127,39 @@ void nl_cli_exp_parse_l4protonum(struct nfnl_exp *exp, int tuple, char *arg)
 void nl_cli_exp_parse_src_port(struct nfnl_exp *exp, int tuple, char *arg)
 {
 	uint32_t sport = nl_cli_parse_u32(arg);
-	nfnl_exp_set_ports(exp, tuple, sport, 0);
+    uint16_t dport = nfnl_exp_get_dst_port(exp, tuple);
+	nfnl_exp_set_ports(exp, tuple, sport, dport);
 }
 
 void nl_cli_exp_parse_dst_port(struct nfnl_exp *exp, int tuple, char *arg)
 {
 	uint32_t dport = nl_cli_parse_u32(arg);
-	uint32_t sport = nfnl_exp_get_src_port(exp, tuple);
+	uint16_t sport = nfnl_exp_get_src_port(exp, tuple);
 	nfnl_exp_set_ports(exp, tuple, sport, dport);
 }
 
+void nl_cli_exp_parse_icmp_id(struct nfnl_exp *exp, int tuple, char *arg)
+{
+    uint32_t id = nl_cli_parse_u32(arg);
+    uint8_t type = nfnl_exp_get_icmp_type(exp, tuple);
+    uint8_t code = nfnl_exp_get_icmp_code(exp, tuple);
+    nfnl_exp_set_icmp(exp, tuple, id, type, code);
+}
+
+void nl_cli_exp_parse_icmp_type(struct nfnl_exp *exp, int tuple, char *arg)
+{
+    uint32_t type = nl_cli_parse_u32(arg);
+    uint16_t id = nfnl_exp_get_icmp_id(exp, tuple);
+    uint8_t code = nfnl_exp_get_icmp_code(exp, tuple);
+    nfnl_exp_set_icmp(exp, tuple, id, type, code);
+}
+
+void nl_cli_exp_parse_icmp_code(struct nfnl_exp *exp, int tuple, char *arg)
+{
+    uint32_t code = nl_cli_parse_u32(arg);
+    uint16_t id = nfnl_exp_get_icmp_id(exp, tuple);
+    uint8_t type = nfnl_exp_get_icmp_type(exp, tuple);
+    nfnl_exp_set_icmp(exp, tuple, id, type, code);
+}
+
 /** @} */
diff --git a/src/nf-exp-create.c b/src/nf-exp-add.c
index d003a4a1..6b718972 100644
--- a/src/nf-exp-create.c
+++ b/src/nf-exp-add.c
@@ -1,12 +1,16 @@
 /*
- * src/nf-exp-create.c     Create an expectation
+ * src/nf-exp-add.c     Create an expectation
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2012 Rich Fought <Rich.Fought@watchguard.com>
+ * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2007 Philip Craig <philipc@snapgear.com>
+ * Copyright (c) 2007 Secure Computing Corporation
+ * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
+ *
  */
 
 #include <netlink/cli/utils.h>
@@ -45,7 +49,7 @@ static void print_usage(void)
 	" -F, --family=FAMILY         Address family\n"
 	"     --timeout=NUM           Timeout value\n"
     "     --helper=STRING         Helper Name\n"
-	//"     --flags                 Flags\n"
+	"     --flags                 Flags (Kernel 2.6.37)\n"
 	);
 	exit(0);
 }
@@ -85,7 +89,7 @@ int main(int argc, char *argv[])
 			ARG_TIMEOUT,
             ARG_HELPER_NAME,
             ARG_REPLACE,
-			//ARG_FLAGS,
+			ARG_FLAGS,
 		};
 		static struct option long_opts[] = {
 			{ "replace", 1, 0, ARG_REPLACE },
@@ -111,7 +115,7 @@ int main(int argc, char *argv[])
 			{ "family", 1, 0, 'F' },
 			{ "timeout", 1, 0, ARG_TIMEOUT },
 			{ "helper", 1, 0, ARG_HELPER_NAME },
-            //{ "flags", 1, 0, ARG_FLAGS},
+            { "flags", 1, 0, ARG_FLAGS},
 			{ 0, 0, 0, 0 }
 		};
 	
@@ -146,7 +150,7 @@ int main(int argc, char *argv[])
 		case 'F': nl_cli_exp_parse_family(exp, optarg); break;
 		case ARG_TIMEOUT: nl_cli_exp_parse_timeout(exp, optarg); break;
         case ARG_HELPER_NAME: nl_cli_exp_parse_helper_name(exp, optarg); break;
-		//case ARG_FLAGS: nl_cli_exp_parse_flags(exp, optarg); break;
+		case ARG_FLAGS: nl_cli_exp_parse_flags(exp, optarg); break;
 		}
  	}
 
diff --git a/src/nf-exp-delete.c b/src/nf-exp-delete.c
new file mode 100644
index 00000000..12539458
--- /dev/null
+++ b/src/nf-exp-delete.c
@@ -0,0 +1,167 @@
+/*
+ * src/nf-exp-delete.c     Delete an expectation
+ *
+ *	This library is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Lesser General Public
+ *	License as published by the Free Software Foundation version 2.1
+ *	of the License.
+ *
+ * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2007 Philip Craig <philipc@snapgear.com>
+ * Copyright (c) 2007 Secure Computing Corporation
+ * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
+ */
+
+#include <netlink/cli/utils.h>
+#include <netlink/cli/exp.h>
+
+static int quiet = 0;
+
+static void print_usage(void)
+{
+	printf(
+	"Usage: nf-exp-list [OPTION]... [CONNTRACK ENTRY]\n"
+	"\n"
+	"Options\n"
+    "     --replace             Replace the address if it exists.\n"
+    " -q, --quiet               Do not print informal notifications.\n"
+	" -h, --help                Show this help\n"
+	" -v, --version             Show versioning information\n"
+	"\n"
+	"Expectation Selection\n"
+	" -i, --id=NUM                Identifier\n"
+    "     --expect-proto=PROTOCOL Expectation protocol\n"
+	"     --expect-src=ADDR       Expectation source address\n"
+	"     --expect-sport=PORT     Expectation source port\n"
+	"     --expect-dst=ADDR       Expectation destination address\n"
+	"     --expect-dport=PORT     Expectation destination port\n"
+    "     --master-proto=PROTOCOL Master conntrack protocol\n"
+	"     --master-src=ADDR       Master conntrack source address\n"
+	"     --master-sport=PORT     Master conntrack source port\n"
+	"     --master-dst=ADDR       Master conntrack destination address\n"
+	"     --master-dport=PORT     Master conntrack destination port\n"
+    "     --mask-proto=PROTOCOL   Mask protocol\n"
+    "     --mask-src=ADDR         Mask source address\n"
+    "     --mask-sport=PORT       Mask source port\n"
+    "     --mask-dst=ADDR         Mask destination address\n"
+    "     --mask-dport=PORT       Mask destination port\n"
+	" -F, --family=FAMILY         Address family\n"
+	"     --timeout=NUM           Timeout value\n"
+    "     --helper=STRING         Helper Name\n"
+	"     --flags                 Flags\n"
+	);
+	exit(0);
+}
+
+int main(int argc, char *argv[])
+{
+	struct nl_sock *sock;
+	struct nfnl_exp *exp;
+	struct nl_dump_params params = {
+		.dp_type = NL_DUMP_LINE,
+		.dp_fd = stdout,
+	};
+	int err, nlflags = 0;
+
+ 	exp = nl_cli_exp_alloc();
+ 
+	for (;;) {
+		int c, optidx = 0;
+		enum {
+			ARG_MARK = 270,
+			ARG_TCP_STATE = 271,
+			ARG_EXPECT_PROTO,
+			ARG_EXPECT_SRC,
+			ARG_EXPECT_SPORT,
+			ARG_EXPECT_DST,
+			ARG_EXPECT_DPORT,
+            ARG_MASTER_PROTO,
+			ARG_MASTER_SRC,
+			ARG_MASTER_SPORT,
+			ARG_MASTER_DST,
+			ARG_MASTER_DPORT,
+            ARG_MASK_PROTO,
+            ARG_MASK_SRC,
+            ARG_MASK_SPORT,
+            ARG_MASK_DST,
+            ARG_MASK_DPORT,
+			ARG_TIMEOUT,
+            ARG_HELPER_NAME,
+			ARG_FLAGS,
+		};
+		static struct option long_opts[] = {
+            { "quiet", 0, 0, 'q' },
+			{ "help", 0, 0, 'h' },
+			{ "version", 0, 0, 'v' },
+			{ "id", 1, 0, 'i' },
+			{ "expect-proto", 1, 0, ARG_EXPECT_PROTO },
+			{ "expect-src", 1, 0, ARG_EXPECT_SRC },
+			{ "expect-sport", 1, 0, ARG_EXPECT_SPORT },
+			{ "expect-dst", 1, 0, ARG_EXPECT_DST },
+			{ "expect-dport", 1, 0, ARG_EXPECT_DPORT },
+            { "master-proto", 1, 0, ARG_MASTER_PROTO },
+			{ "master-src", 1, 0, ARG_MASTER_SRC },
+			{ "master-sport", 1, 0, ARG_MASTER_SPORT },
+			{ "master-dst", 1, 0, ARG_MASTER_DST },
+			{ "master-dport", 1, 0, ARG_MASTER_DPORT },
+            { "mask-proto", 1, 0, ARG_MASK_PROTO },
+            { "mask-src", 1, 0, ARG_MASK_SRC },
+            { "mask-sport", 1, 0, ARG_MASK_SPORT },
+            { "mask-dst", 1, 0, ARG_MASK_DST },
+            { "mask-dport", 1, 0, ARG_MASK_DPORT },
+			{ "family", 1, 0, 'F' },
+			{ "timeout", 1, 0, ARG_TIMEOUT },
+			{ "helper", 1, 0, ARG_HELPER_NAME },
+            { "flags", 1, 0, ARG_FLAGS},
+			{ 0, 0, 0, 0 }
+		};
+	
+		c = getopt_long(argc, argv, "46f:hvi:p:F:", long_opts, &optidx);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case '?': exit(NLE_INVAL);
+        case 'q': quiet = 1; break;
+        case '4': nfnl_exp_set_family(exp, AF_INET); break;
+		case '6': nfnl_exp_set_family(exp, AF_INET6); break;
+		case 'h': print_usage(); break;
+		case 'v': nl_cli_print_version(); break;
+		case 'i': nl_cli_exp_parse_id(exp, optarg); break;
+		case ARG_EXPECT_PROTO: nl_cli_exp_parse_l4protonum(exp, NFNL_EXP_TUPLE_EXPECT, optarg); break;
+		case ARG_EXPECT_SRC: nl_cli_exp_parse_src(exp, NFNL_EXP_TUPLE_EXPECT, optarg); break;
+		case ARG_EXPECT_SPORT: nl_cli_exp_parse_src_port(exp, NFNL_EXP_TUPLE_EXPECT, optarg); break;
+		case ARG_EXPECT_DST: nl_cli_exp_parse_dst(exp, NFNL_EXP_TUPLE_EXPECT, optarg); break;
+		case ARG_EXPECT_DPORT: nl_cli_exp_parse_dst_port(exp, NFNL_EXP_TUPLE_EXPECT, optarg); break;
+        case ARG_MASTER_PROTO: nl_cli_exp_parse_l4protonum(exp, NFNL_EXP_TUPLE_MASTER, optarg); break;
+		case ARG_MASTER_SRC: nl_cli_exp_parse_src(exp, NFNL_EXP_TUPLE_MASTER, optarg); break;
+		case ARG_MASTER_SPORT: nl_cli_exp_parse_src_port(exp, NFNL_EXP_TUPLE_MASTER, optarg); break;
+		case ARG_MASTER_DST: nl_cli_exp_parse_dst(exp, NFNL_EXP_TUPLE_MASTER, optarg); break;
+		case ARG_MASTER_DPORT: nl_cli_exp_parse_dst_port(exp, NFNL_EXP_TUPLE_MASTER, optarg); break;
+        case ARG_MASK_PROTO: nl_cli_exp_parse_l4protonum(exp, NFNL_EXP_TUPLE_MASK, optarg); break;
+        case ARG_MASK_SRC: nl_cli_exp_parse_src(exp, NFNL_EXP_TUPLE_MASK, optarg); break;
+        case ARG_MASK_SPORT: nl_cli_exp_parse_src_port(exp, NFNL_EXP_TUPLE_MASK, optarg); break;
+        case ARG_MASK_DST: nl_cli_exp_parse_dst(exp, NFNL_EXP_TUPLE_MASK, optarg); break;
+        case ARG_MASK_DPORT: nl_cli_exp_parse_dst_port(exp, NFNL_EXP_TUPLE_MASK, optarg); break;
+		case 'F': nl_cli_exp_parse_family(exp, optarg); break;
+		case ARG_TIMEOUT: nl_cli_exp_parse_timeout(exp, optarg); break;
+        case ARG_HELPER_NAME: nl_cli_exp_parse_helper_name(exp, optarg); break;
+		case ARG_FLAGS: nl_cli_exp_parse_flags(exp, optarg); break;
+		}
+ 	}
+
+	sock = nl_cli_alloc_socket();
+	nl_cli_connect(sock, NETLINK_NETFILTER);
+
+    if ((err = nfnl_exp_del(sock, exp, nlflags)) < 0)
+        nl_cli_fatal(err, "Unable to delete expectation: %s",
+                 nl_geterror(err));
+
+    if (!quiet) {
+        printf("Deleted ");
+        nl_object_dump(OBJ_CAST(exp), &params);
+    }
+
+
+	return 0;
+}
diff --git a/src/nf-exp-list.c b/src/nf-exp-list.c
index 3bdb6c57..a447ba26 100644
--- a/src/nf-exp-list.c
+++ b/src/nf-exp-list.c
@@ -1,12 +1,15 @@
 /*
- * src/nf-exp-list.c     List Conntrack Entries
+ * src/nf-exp-list.c     List Expectation Entries
  *
  *	This library is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Lesser General Public
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2012 Rich Fought <Rich.Fought@watchguard.com>
+ * Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2007 Philip Craig <philipc@snapgear.com>
+ * Copyright (c) 2007 Secure Computing Corporation
+ * Copyright (c) 2012 Rich Fought <rich.fought@watchguard.com>
  */
 
 #include <netlink/cli/utils.h>
@@ -15,10 +18,10 @@
 static void print_usage(void)
 {
 	printf(
-	"Usage: nf-exp-list [OPTION]... [CONNTRACK ENTRY]\n"
+	"Usage: nf-exp-list [OPTION]... [EXPECTATION ENTRY]\n"
 	"\n"
 	"Options\n"
-	" -f, --format=TYPE     Output format { brief | details | stats }\n"
+	" -f, --format=TYPE     Output format { brief | details }\n"
 	" -h, --help            Show this help\n"
 	" -v, --version         Show versioning information\n"
 	"\n"