1 files changed, 235 insertions, 276 deletions

diff --git a/src/libct.c b/src/libct.c
index 47743d8..143901b 100644
--- a/src/libct.c
+++ b/src/libct.c
@@ -19,31 +19,20 @@
 extern struct list_head proto_list;
 extern char *proto2str[];
 
-/* Built-in generic proto handler */
-
-/* FIXME: This should die... */
-static int parse(char c, char *argv[], 
-	   struct ip_conntrack_tuple *orig,
-	   struct ip_conntrack_tuple *reply) {
-	return 0;
-}
-/* FIXME: die die too... */
-static void print(struct ip_conntrack_tuple *t) {}
-
-static struct ctproto_handler generic_handler = {
-	.name 		= "generic",
-	.protonum	= 0,
-	.parse		= parse,
-	.print		= print,
-	.opts		= NULL
-};
-
 static int handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh, void *arg)
 {
 	struct nfgenmsg *nfmsg;
 	struct nfattr *nfa;
 	int min_len = 0;
 	struct ctproto_handler *h = NULL;
+	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
+	int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
+
+	struct ip_conntrack_tuple *orig, *reply;
+	struct cta_counters *ctr;
+	unsigned long *status, *timeout;
+	struct cta_proto *proto;
+	unsigned long *id, *mark;
 
 	DEBUGP("netlink header\n");
 	DEBUGP("len: %d type: %d flags: %d seq: %d pid: %d\n", 
@@ -59,76 +48,62 @@ static int handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh, void *arg)
 
 	DEBUGP("size:%d\n", nlh->nlmsg_len);
 
-	while (nlh->nlmsg_len > min_len) {
-		struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-		int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-
-		struct ip_conntrack_tuple *orig, *reply;
-		struct cta_counters *ctr;
-		unsigned long *status, *timeout;
-		struct cta_proto *proto;
-		unsigned long *id, *mark;
-
-		while (NFA_OK(attr, attrlen)) {
-			switch(attr->nfa_type) {
-			case CTA_ORIG:
-				orig = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
-						NIPQUAD(orig->src.ip), 
-						NIPQUAD(orig->dst.ip));
-				h = findproto(proto2str[orig->dst.protonum]);
-				if (h)
-					h->print(orig);
-				break;
-			case CTA_RPLY:
-				reply = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-						NIPQUAD(reply->src.ip), 
-						NIPQUAD(reply->dst.ip));
-				h = findproto(proto2str[reply->dst.protonum]);
-				if (h)
-					h->print(reply);	
-				break;
-			case CTA_STATUS:
-				status = NFA_DATA(attr);
-				printf("status=%u ", *status);
-				break;
-			case CTA_PROTOINFO:
-				proto = NFA_DATA(attr);
-				if (proto2str[proto->num_proto])
-					printf("%s %d ", proto2str[proto->num_proto], proto->num_proto);
-				else
-					printf("unknown %d ", proto->num_proto);
-				break;
-			case CTA_TIMEOUT:
-				timeout = NFA_DATA(attr);
-				printf("timeout=%lu ", *timeout);
-				break;
-/*			case CTA_ID:
-				id = NFA_DATA(attr);
-				printf(" id:%lu ", *id);
-				break;*/
-			case CTA_MARK:
-				mark = NFA_DATA(attr);
-				printf("mark=%lu ", *mark);
-				break;
-			case CTA_COUNTERS:
-				ctr = NFA_DATA(attr);
-				printf("orig_packets=%lu orig_bytes=%lu, "
-				       "reply_packets=%lu reply_bytes=%lu ",
-				       ctr->orig.packets, ctr->orig.bytes,
-				       ctr->reply.packets, ctr->reply.bytes);
-				break;
-			}
-			DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
-			DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
-			attr = NFA_NEXT(attr, attrlen);
+	while (NFA_OK(attr, attrlen)) {
+		switch(attr->nfa_type) {
+		case CTA_ORIG:
+			orig = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
+					NIPQUAD(orig->src.ip), 
+					NIPQUAD(orig->dst.ip));
+			h = findproto(proto2str[orig->dst.protonum]);
+			if (h && h->print)
+				h->print(orig);
+			break;
+		case CTA_RPLY:
+			reply = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
+					NIPQUAD(reply->src.ip), 
+					NIPQUAD(reply->dst.ip));
+			h = findproto(proto2str[reply->dst.protonum]);
+			if (h && h->print)
+				h->print(reply);	
+			break;
+		case CTA_STATUS:
+			status = NFA_DATA(attr);
+			printf("status=%u ", *status);
+			break;
+		case CTA_PROTOINFO:
+			proto = NFA_DATA(attr);
+			if (proto2str[proto->num_proto])
+				printf("%s %d ", proto2str[proto->num_proto], proto->num_proto);
+			else
+				printf("unknown %d ", proto->num_proto);
+			break;
+		case CTA_TIMEOUT:
+			timeout = NFA_DATA(attr);
+			printf("timeout=%lu ", *timeout);
+			break;
+/*		case CTA_ID:
+			id = NFA_DATA(attr);
+			printf(" id:%lu ", *id);
+			break;*/
+		case CTA_MARK:
+			mark = NFA_DATA(attr);
+			printf("mark=%lu ", *mark);
+			break;
+		case CTA_COUNTERS:
+			ctr = NFA_DATA(attr);
+			printf("orig_packets=%lu orig_bytes=%lu, "
+			       "reply_packets=%lu reply_bytes=%lu ",
+			       ctr->orig.packets, ctr->orig.bytes,
+			       ctr->reply.packets, ctr->reply.bytes);
+			break;
 		}
-		min_len += nlh->nlmsg_len;
-		nlh = (struct nlmsghdr *) attr;
-		printf("\n");
+		DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
+		DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
+		attr = NFA_NEXT(attr, attrlen);
 	}
-	DEBUGP("exit from handler\n");
+	printf("\n");
 
 	return 0;
 }
@@ -156,6 +131,14 @@ static int event_handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh,
 	int min_len = 0;
 	struct ctproto_handler *h = NULL;
 	int type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
+	int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
+
+	struct ip_conntrack_tuple *orig, *reply;
+	struct cta_counters *ctr;
+	unsigned long *status, *timeout, *mark;
+	struct cta_proto *proto;
+	unsigned long *id;
 
 	DEBUGP("netlink header\n");
 	DEBUGP("len: %d type: %d flags: %d seq: %d pid: %d\n", 
@@ -173,76 +156,62 @@ static int event_handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh,
 
 	printf("type: [%s] ", typemsg2str(type, nlh->nlmsg_flags));
 
-	while (nlh->nlmsg_len > min_len) {
-		struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-		int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-
-		struct ip_conntrack_tuple *orig, *reply;
-		struct cta_counters *ctr;
-		unsigned long *status, *timeout, *mark;
-		struct cta_proto *proto;
-		unsigned long *id;
-
-		while (NFA_OK(attr, attrlen)) {
-			switch(attr->nfa_type) {
-			case CTA_ORIG:
-				orig = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
-						NIPQUAD(orig->src.ip), 
-						NIPQUAD(orig->dst.ip));
-				h = findproto(proto2str[orig->dst.protonum]);
-				if (h)
-					h->print(orig);
-				break;
-			case CTA_RPLY:
-				reply = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-						NIPQUAD(reply->src.ip), 
-						NIPQUAD(reply->dst.ip));
-				h = findproto(proto2str[reply->dst.protonum]);
-				if (h)
-					h->print(reply);	
-				break;
-			case CTA_STATUS:
-				status = NFA_DATA(attr);
-				printf("status:%u ", *status);
-				break;
-			case CTA_PROTOINFO:
-				proto = NFA_DATA(attr);
-				if (proto2str[proto->num_proto])
-					printf("%s %d ", proto2str[proto->num_proto], proto->num_proto);
-				else
-					printf("unknown %d ", proto->num_proto);
-				break;
-			case CTA_TIMEOUT:
-				timeout = NFA_DATA(attr);
-				printf("timeout:%lu ", *timeout);
-				break;
-/*			case CTA_ID:
-				id = NFA_DATA(attr);
-				printf(" id:%lu ", *id);
-				break;*/
-			case CTA_MARK:
-				mark = NFA_DATA(attr);
-				printf("mark=%lu ", *mark);
-				break;
-			case CTA_COUNTERS:
-				ctr = NFA_DATA(attr);
-				printf("orig_packets=%lu orig_bytes=%lu, "
-				       "reply_packets=%lu reply_bytes=%lu ",
-				       ctr->orig.packets, ctr->orig.bytes,
-				       ctr->reply.packets, ctr->reply.bytes);
-				break;
-			}
-			DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
-			DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
-			attr = NFA_NEXT(attr, attrlen);
+	while (NFA_OK(attr, attrlen)) {
+		switch(attr->nfa_type) {
+		case CTA_ORIG:
+			orig = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
+					NIPQUAD(orig->src.ip), 
+					NIPQUAD(orig->dst.ip));
+			h = findproto(proto2str[orig->dst.protonum]);
+			if (h && h->print)
+				h->print(orig);
+			break;
+		case CTA_RPLY:
+			reply = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
+					NIPQUAD(reply->src.ip), 
+					NIPQUAD(reply->dst.ip));
+			h = findproto(proto2str[reply->dst.protonum]);
+			if (h && h->print)
+				h->print(reply);	
+			break;
+		case CTA_STATUS:
+			status = NFA_DATA(attr);
+			printf("status:%u ", *status);
+			break;
+		case CTA_PROTOINFO:
+			proto = NFA_DATA(attr);
+			if (proto2str[proto->num_proto])
+				printf("%s %d ", proto2str[proto->num_proto], proto->num_proto);
+			else
+				printf("unknown %d ", proto->num_proto);
+			break;
+		case CTA_TIMEOUT:
+			timeout = NFA_DATA(attr);
+			printf("timeout:%lu ", *timeout);
+			break;
+/*		case CTA_ID:
+			id = NFA_DATA(attr);
+			printf(" id:%lu ", *id);
+			break;*/
+		case CTA_MARK:
+			mark = NFA_DATA(attr);
+			printf("mark=%lu ", *mark);
+			break;
+		case CTA_COUNTERS:
+			ctr = NFA_DATA(attr);
+			printf("orig_packets=%lu orig_bytes=%lu, "
+			       "reply_packets=%lu reply_bytes=%lu ",
+			       ctr->orig.packets, ctr->orig.bytes,
+			       ctr->reply.packets, ctr->reply.bytes);
+			break;
 		}
-		min_len += nlh->nlmsg_len;
-		nlh = (struct nlmsghdr *) attr;
-		printf("\n");
+		DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
+		DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
+		attr = NFA_NEXT(attr, attrlen);
 	}
-	DEBUGP("exit from handler\n");
+	printf("\n");
 
 	return 0;
 }
@@ -253,6 +222,11 @@ static int expect_handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh, void *
 	struct nfattr *nfa;
 	int min_len = 0;
 	struct ctproto_handler *h = NULL;
+	struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
+	int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
+
+	struct ip_conntrack_tuple *exp, *mask;
+	unsigned long *timeout;
 
 	DEBUGP("netlink header\n");
 	DEBUGP("len: %d type: %d flags: %d seq: %d pid: %d\n", 
@@ -268,56 +242,45 @@ static int expect_handler(struct sockaddr_nl *sock, struct nlmsghdr *nlh, void *
 
 	DEBUGP("size:%d\n", nlh->nlmsg_len);
 
-	while (nlh->nlmsg_len > min_len) {
-		struct nfattr *attr = NFM_NFA(NLMSG_DATA(nlh));
-		int attrlen = nlh->nlmsg_len - NLMSG_ALIGN(min_len);
-
-		struct ip_conntrack_tuple *exp, *mask;
-		unsigned long *timeout;
-
-		while (NFA_OK(attr, attrlen)) {
-			switch(attr->nfa_type) {
-			case CTA_EXP_TUPLE:
-				exp = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
-						NIPQUAD(exp->src.ip), 
-						NIPQUAD(exp->dst.ip));
-				h = findproto(proto2str[exp->dst.protonum]);
-				if (h)
-					h->print(exp);
-				break;
-			case CTA_EXP_MASK:
-				mask = NFA_DATA(attr);
-				printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
-						NIPQUAD(mask->src.ip), 
-						NIPQUAD(mask->dst.ip));
-				h = findproto(proto2str[mask->dst.protonum]);
-				if (h)
-					h->print(mask);	
-				break;
-			case CTA_EXP_TIMEOUT:
-				timeout = NFA_DATA(attr);
-				printf("timeout:%lu ", *timeout);
-				break;
-			}
-			DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
-			DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
-			attr = NFA_NEXT(attr, attrlen);
+	while (NFA_OK(attr, attrlen)) {
+		switch(attr->nfa_type) {
+		case CTA_EXP_TUPLE:
+			exp = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ", 
+					NIPQUAD(exp->src.ip), 
+					NIPQUAD(exp->dst.ip));
+			h = findproto(proto2str[exp->dst.protonum]);
+			if (h && h->print)
+				h->print(exp);
+			break;
+		case CTA_EXP_MASK:
+			mask = NFA_DATA(attr);
+			printf("src=%u.%u.%u.%u dst=%u.%u.%u.%u ",
+					NIPQUAD(mask->src.ip), 
+					NIPQUAD(mask->dst.ip));
+			h = findproto(proto2str[mask->dst.protonum]);
+			if (h && h->print)
+				h->print(mask);	
+			break;
+		case CTA_EXP_TIMEOUT:
+			timeout = NFA_DATA(attr);
+			printf("timeout:%lu ", *timeout);
+			break;
 		}
-		min_len += nlh->nlmsg_len;
-		nlh = (struct nlmsghdr *) attr;
-		printf("\n");
+		DEBUGP("nfa->nfa_type: %d\n", attr->nfa_type);
+		DEBUGP("nfa->nfa_len: %d\n", attr->nfa_len);
+		attr = NFA_NEXT(attr, attrlen);
 	}
-	DEBUGP("exit from handler\n");
+	printf("\n");
 
 	return 0;
 }
 
-void create_conntrack(struct ip_conntrack_tuple *orig,
-		      struct ip_conntrack_tuple *reply,
-		      unsigned long timeout,
-		      union ip_conntrack_proto *proto,
-		      unsigned int status)
+int create_conntrack(struct ip_conntrack_tuple *orig,
+		     struct ip_conntrack_tuple *reply,
+		     unsigned long timeout,
+		     union ip_conntrack_proto *proto,
+		     unsigned int status)
 {
 	struct cta_proto cta;
 	struct nfattr *cda[CTA_MAX];
@@ -331,45 +294,39 @@ void create_conntrack(struct ip_conntrack_tuple *orig,
 	}
 
 	/* FIXME: please unify returns values... */
-	if (ctnl_new_conntrack(&cth, orig, reply, timeout, proto, status) < 0) {
-		printf("error new conntrack\n");
-		exit(0);
-	}
+	if (ctnl_new_conntrack(&cth, orig, reply, timeout, proto, status) < 0)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+	
+	return 0;
 }
 
-void delete_conntrack(struct ip_conntrack_tuple *tuple,
-		      enum ctattr_type_t t,
-		      unsigned long id)
+int delete_conntrack(struct ip_conntrack_tuple *tuple,
+		     enum ctattr_type_t t,
+		     unsigned long id)
 {
 	struct nfattr *cda[CTA_MAX];
 	struct ctnl_handle cth;
 
-	if (ctnl_open(&cth, 0) < 0) {
-		printf("error\n");
-		exit(0);
-	}
+	if (ctnl_open(&cth, 0) < 0)
+		return -1;
 
 	/* FIXME: please unify returns values... */
-	if (ctnl_del_conntrack(&cth, tuple, t, id) < 0) {
-		printf("error del conntrack\n");
-		exit(0);
-	}
+	if (ctnl_del_conntrack(&cth, tuple, t, id) < 0)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
 }
 
 /* get_conntrack_handler */
-void get_conntrack(struct ip_conntrack_tuple *tuple, 
-		   enum ctattr_type_t t,
-		   unsigned long id)
+int get_conntrack(struct ip_conntrack_tuple *tuple, 
+		  enum ctattr_type_t t,
+		  unsigned long id)
 {
 	struct nfattr *cda[CTA_MAX];
 	struct ctnl_handle cth;
@@ -378,26 +335,22 @@ void get_conntrack(struct ip_conntrack_tuple *tuple,
 		.handler = handler
 	};
 
-	if (ctnl_open(&cth, 0) < 0) {
-		printf("error\n");
-		exit(0);
-	}
+	if (ctnl_open(&cth, 0) < 0)
+		return -1;
 
 	ctnl_register_handler(&cth, &h);
 
 	/* FIXME!!!! get_conntrack_handler returns -100 */
-	if (ctnl_get_conntrack(&cth, tuple, t, id) != -100) {
-		printf("error get conntrack\n");
-		exit(0);
-	}
+	if (ctnl_get_conntrack(&cth, tuple, t, id) != -100)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
 }
 
-void dump_conntrack_table(int zero)
+int dump_conntrack_table(int zero)
 {
 	int ret;
 	struct ctnl_handle cth;
@@ -406,10 +359,8 @@ void dump_conntrack_table(int zero)
 		.handler = handler
 	};
 	
-	if (ctnl_open(&cth, 0) < 0) {
-		printf("error\n");
-		exit(0);
-	}
+	if (ctnl_open(&cth, 0) < 0) 
+		return -1;
 
 	ctnl_register_handler(&cth, &h);
 
@@ -418,18 +369,16 @@ void dump_conntrack_table(int zero)
 	} else
 		ret = ctnl_list_conntrack(&cth, AF_INET);
 
-	if (ret != -100) {
-		printf("error list\n");
-		exit(0);
-	}
+	if (ret != -100)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2\n");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
 }
 
-void event_conntrack()
+int event_conntrack(unsigned int event_mask)
 {
 	struct ctnl_handle cth;
 	struct ctnl_msg_handler hnew = {
@@ -441,19 +390,18 @@ void event_conntrack()
 		.handler = event_handler
 	};
 	
-	if (ctnl_open(&cth, NFGRP_IPV4_CT_TCP) < 0) {
-		printf("error\n");
-		exit(0);
-	}
+	if (ctnl_open(&cth, event_mask) < 0)
+		return -1;
 
 	ctnl_register_handler(&cth, &hnew);
 	ctnl_register_handler(&cth, &hdestroy);
-	ctnl_event_conntrack(&cth, AF_INET);
+	if (ctnl_event_conntrack(&cth, AF_INET) < 0)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2\n");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
 }
 
 struct ctproto_handler *findproto(char *name)
@@ -462,6 +410,9 @@ struct ctproto_handler *findproto(char *name)
 	struct list_head *i;
 	struct ctproto_handler *cur = NULL, *handler = NULL;
 
+	if (!name) 
+		return handler;
+
 	list_for_each(i, &proto_list) {
 		cur = (struct ctproto_handler *) i;
 		if (strcmp(cur->name, name) == 0) {
@@ -480,9 +431,6 @@ struct ctproto_handler *findproto(char *name)
 			fprintf (stderr, "%s\n", dlerror());*/
 	}
 
-	if (!handler)
-		handler = &generic_handler;
-
 	return handler;
 }
 
@@ -496,7 +444,7 @@ void unregister_proto(struct ctproto_handler *h)
 	list_del(&h->head);
 }
 
-void dump_expect_list()
+int dump_expect_list()
 {
 	struct ctnl_handle cth;
 	struct ctnl_msg_handler h = {
@@ -504,21 +452,32 @@ void dump_expect_list()
 		.handler = expect_handler
 	};
 	
-	if (ctnl_open(&cth, 0) < 0) {
-		printf("error\n");
-		exit(0);
-	}
+	if (ctnl_open(&cth, 0) < 0)
+		return -1;
 
 	ctnl_register_handler(&cth, &h);
 
-	if (ctnl_list_expect(&cth, AF_INET) != -100) {
-		printf("error list\n");
-		exit(0);
-	}
+	if (ctnl_list_expect(&cth, AF_INET) != -100)
+		return -1;
 
-	if (ctnl_close(&cth) < 0) {
-		printf("error2\n");
-		exit(0);
-	}
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
 }
 
+int set_dump_mask(unsigned int mask)
+{
+	struct ctnl_handle cth;
+
+	if (ctnl_open(&cth, 0) < 0)
+		return -1;
+	
+	if (ctnl_set_dumpmask(&cth, mask) < 0)
+		return -1;
+	
+	if (ctnl_close(&cth) < 0)
+		return -1;
+
+	return 0;
+}