conntrackd: generalize/cleanup network message building/parsing

This patch generalizes the network message building and parsing
to prepare the upcoming expectation support.

Basically, it renames:

- NET_T_STATE_* by NET_T_STATE_CT_*, as I plan to add NET_T_STATE_EXP_*
- BUILD_NETMSG by BUILD_NETMSG_FROM_CT, and build_payload by ct2msg.
  I plan to add exp2msg.
- parse_payload by msg2ct, since I plan to add msg2exp.
- modify object_status_to_network_type to prepare the support of
  expectations.
- add prefix ct_ to all parsing functions in parse.c, as we will have
  similar functions to convert messages to expectation objects.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/network.c b/src/network.c
index 6a66a2b..cadc466 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1,6 +1,7 @@
 /*
- * (C) 2006-2007 by Pablo Neira Ayuso <pablo@netfilter.org>
- * 
+ * (C) 2006-2011 by Pablo Neira Ayuso <pablo@netfilter.org>
+ * (C) 2011 by Vyatta Inc. <http://www.vyatta.com>
+ *
  * 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
@@ -119,13 +120,15 @@ int nethdr_track_is_seq_set()
 
 #include "cache.h"
 
-static int status2type[] = {
-	[C_OBJ_NEW]	= NET_T_STATE_NEW,
-	[C_OBJ_ALIVE]	= NET_T_STATE_UPD,
-	[C_OBJ_DEAD]	= NET_T_STATE_DEL,
+static int status2type[CACHE_T_MAX][C_OBJ_MAX] = {
+	[CACHE_T_CT] = {
+		[C_OBJ_NEW]	= NET_T_STATE_CT_NEW,
+		[C_OBJ_ALIVE]	= NET_T_STATE_CT_UPD,
+		[C_OBJ_DEAD]	= NET_T_STATE_CT_DEL,
+	},
 };
 
-int object_status_to_network_type(int status)
+int object_status_to_network_type(struct cache_object *obj)
 {
-	return status2type[status];
+	return status2type[obj->cache->type][obj->status];
 }