summaryrefslogtreecommitdiff
path: root/src/sync-alarm.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-01-04 14:30:02 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2012-01-10 01:54:45 +0100
commit931c0eff309d8c7277ebe6d670fd72d8fbe3c674 (patch)
tree08de51d959a6e642aad1f506f089ea2e1393e3b9 /src/sync-alarm.c
parent395ac42f5f1844834698f29032b101c2890b6772 (diff)
downloadconntrack-tools-931c0eff309d8c7277ebe6d670fd72d8fbe3c674.tar.gz
conntrack-tools-931c0eff309d8c7277ebe6d670fd72d8fbe3c674.zip
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>
Diffstat (limited to 'src/sync-alarm.c')
-rw-r--r--src/sync-alarm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sync-alarm.c b/src/sync-alarm.c
index 8d6b34d..65154a1 100644
--- a/src/sync-alarm.c
+++ b/src/sync-alarm.c
@@ -42,7 +42,7 @@ static void refresher(struct alarm_block *a, void *data)
random() % CONFIG(refresh) + 1,
((random() % 5 + 1) * 200000) - 1);
- alarm_enqueue(obj, NET_T_STATE_UPD);
+ alarm_enqueue(obj, NET_T_STATE_CT_UPD);
}
static void cache_alarm_add(struct cache_object *obj, void *data)
@@ -137,7 +137,7 @@ static int tx_queue_xmit(struct queue_node *n, const void *data)
ca = (struct cache_alarm *)n;
obj = cache_data_get_object(STATE(mode)->internal->ct.data, ca);
- type = object_status_to_network_type(obj->status);
+ type = object_status_to_network_type(obj);
net = obj->cache->ops->build_msg(obj, type);
multichannel_send(STATE_SYNC(channel), net);
cache_object_put(obj);