From 381827a8152d27d8afe92a914968b814ec9ac155 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Thu, 20 Apr 2017 19:28:00 +0200 Subject: conntrackd: factorice tx_queue functions They are shared by both sync-ftfw and sync-notrack. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/sync-notrack.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'src/sync-notrack.c') diff --git a/src/sync-notrack.c b/src/sync-notrack.c index 7ade3a7..5b6814d 100644 --- a/src/sync-notrack.c +++ b/src/sync-notrack.c @@ -20,6 +20,7 @@ #include "conntrackd.h" #include "sync.h" #include "queue.h" +#include "queue_tx.h" #include "network.h" #include "log.h" #include "cache.h" @@ -56,25 +57,6 @@ static struct cache_extra cache_notrack_extra = { .destroy = cache_notrack_del }; -static void tx_queue_add_ctlmsg(uint32_t flags, uint32_t from, uint32_t to) -{ - struct queue_object *qobj; - struct nethdr_ack *ack; - - qobj = queue_object_new(Q_ELEM_CTL, sizeof(struct nethdr_ack)); - if (qobj == NULL) - return; - - ack = (struct nethdr_ack *)qobj->data; - ack->type = NET_T_CTL; - ack->flags = flags; - ack->from = from; - ack->to = to; - - if (queue_add(STATE_SYNC(tx_queue), &qobj->qnode) < 0) - queue_object_free(qobj); -} - static int do_cache_to_tx(void *data1, void *data2) { struct cache_object *obj = data2; @@ -228,23 +210,6 @@ static void notrack_enqueue(struct cache_object *obj, int query) cache_object_get(obj); } -static void tx_queue_add_ctlmsg2(uint32_t flags) -{ - struct queue_object *qobj; - struct nethdr *ctl; - - qobj = queue_object_new(Q_ELEM_CTL, sizeof(struct nethdr_ack)); - if (qobj == NULL) - return; - - ctl = (struct nethdr *)qobj->data; - ctl->type = NET_T_CTL; - ctl->flags = flags; - - if (queue_add(STATE_SYNC(tx_queue), &qobj->qnode) < 0) - queue_object_free(qobj); -} - static void do_alive_alarm(struct alarm_block *a, void *data) { tx_queue_add_ctlmsg2(NET_F_ALIVE); -- cgit v1.2.3