summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2008-12-13 16:15:18 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2008-12-13 16:15:18 +0100
commit8d6efef0daed05925bf9b13c21948afa651482a5 (patch)
treeae9053c2a1579d3a74fd68cd508d1922eafccfb2
parent77d7daef4e41b5fb55d9fb2c4c0a66fe7039887d (diff)
network: use NET_T_* instead of NFCT_Q_*
This patch replaces the use of NFCT_Q_* in the message type by specific network message type NET_T_*. The query types are reserved for libnetfilter_conntrack operations. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/network.h7
-rw-r--r--src/sync-alarm.c2
-rw-r--r--src/sync-ftfw.c10
-rw-r--r--src/sync-mode.c16
-rw-r--r--src/sync-notrack.c2
5 files changed, 22 insertions, 15 deletions
diff --git a/include/network.h b/include/network.h
index 9098e5c..b6722bd 100644
--- a/include/network.h
+++ b/include/network.h
@@ -17,6 +17,13 @@ struct nethdr {
};
#define NETHDR_SIZ nethdr_align(sizeof(struct nethdr))
+enum nethdr_type {
+ NET_T_STATE_NEW = 0,
+ NET_T_STATE_UPD,
+ NET_T_STATE_DEL,
+ NET_T_STATE_MAX = NET_T_STATE_DEL,
+};
+
int nethdr_align(int len);
int nethdr_size(int len);
void nethdr_set(struct nethdr *net, int type);
diff --git a/src/sync-alarm.c b/src/sync-alarm.c
index fe3d9af..d871b75 100644
--- a/src/sync-alarm.c
+++ b/src/sync-alarm.c
@@ -38,7 +38,7 @@ static void refresher(struct alarm_block *a, void *data)
random() % CONFIG(refresh) + 1,
((random() % 5 + 1) * 200000) - 1);
- net = BUILD_NETMSG(u->ct, NFCT_Q_UPDATE);
+ net = BUILD_NETMSG(u->ct, NET_T_STATE_UPD);
mcast_buffered_send_netmsg(STATE_SYNC(mcast_client), net);
}
diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index a4895d4..05475ab 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -454,9 +454,9 @@ static void ftfw_send(struct nethdr *net, struct us_conntrack *u)
struct cache_ftfw *cn;
switch(net->type) {
- case NFCT_Q_CREATE:
- case NFCT_Q_UPDATE:
- case NFCT_Q_DESTROY:
+ case NET_T_STATE_NEW:
+ case NET_T_STATE_UPD:
+ case NET_T_STATE_DEL:
cn = (struct cache_ftfw *)
cache_get_extra(STATE_SYNC(internal), u);
@@ -537,9 +537,9 @@ static void ftfw_run(void)
u = cache_get_conntrack(STATE_SYNC(internal), cn);
if (alarm_pending(&u->alarm))
- tx_list_xmit(&cn->tx_list, u, NFCT_Q_DESTROY);
+ tx_list_xmit(&cn->tx_list, u, NET_T_STATE_DEL);
else
- tx_list_xmit(&cn->tx_list, u, NFCT_Q_UPDATE);
+ tx_list_xmit(&cn->tx_list, u, NET_T_STATE_UPD);
}
/* reset alive alarm */
diff --git a/src/sync-mode.c b/src/sync-mode.c
index cfed7f4..d5355a7 100644
--- a/src/sync-mode.c
+++ b/src/sync-mode.c
@@ -68,7 +68,7 @@ static void do_mcast_handler_step(struct nethdr *net, size_t remain)
}
switch(net->type) {
- case NFCT_Q_CREATE:
+ case NET_T_STATE_NEW:
retry:
if ((u = cache_add(STATE_SYNC(external), ct))) {
debug_ct(u->ct, "external new");
@@ -85,13 +85,13 @@ retry:
debug_ct(ct, "can't add");
}
break;
- case NFCT_Q_UPDATE:
+ case NET_T_STATE_UPD:
if ((u = cache_update_force(STATE_SYNC(external), ct))) {
debug_ct(u->ct, "external update");
} else
debug_ct(ct, "can't update");
break;
- case NFCT_Q_DESTROY:
+ case NET_T_STATE_DEL:
if (cache_del(STATE_SYNC(external), ct))
debug_ct(ct, "external destroy");
else
@@ -415,7 +415,7 @@ static int purge_step(void *data1, void *data2)
ret = nfct_query(h, NFCT_Q_GET, u->ct);
if (ret == -1 && errno == ENOENT) {
debug_ct(u->ct, "overrun purge resync");
- mcast_send_sync(u, NFCT_Q_DESTROY);
+ mcast_send_sync(u, NET_T_STATE_DEL);
__cache_del_timer(STATE_SYNC(internal), u, CONFIG(del_timeout));
}
@@ -448,7 +448,7 @@ static int overrun_sync(enum nf_conntrack_msg_type type,
if (!cache_test(STATE_SYNC(internal), ct)) {
if ((u = cache_update_force(STATE_SYNC(internal), ct))) {
debug_ct(u->ct, "overrun resync");
- mcast_send_sync(u, NFCT_Q_UPDATE);
+ mcast_send_sync(u, NET_T_STATE_UPD);
}
}
@@ -466,7 +466,7 @@ static void event_new_sync(struct nf_conntrack *ct)
nfct_attr_unset(ct, ATTR_REPL_COUNTER_PACKETS);
retry:
if ((u = cache_add(STATE_SYNC(internal), ct))) {
- mcast_send_sync(u, NFCT_Q_CREATE);
+ mcast_send_sync(u, NET_T_STATE_NEW);
debug_ct(u->ct, "internal new");
} else {
if (errno == EEXIST) {
@@ -489,7 +489,7 @@ static void event_update_sync(struct nf_conntrack *ct)
return;
}
debug_ct(u->ct, "internal update");
- mcast_send_sync(u, NFCT_Q_UPDATE);
+ mcast_send_sync(u, NET_T_STATE_UPD);
}
static int event_destroy_sync(struct nf_conntrack *ct)
@@ -502,7 +502,7 @@ static int event_destroy_sync(struct nf_conntrack *ct)
return 0;
}
- mcast_send_sync(u, NFCT_Q_DESTROY);
+ mcast_send_sync(u, NET_T_STATE_DEL);
__cache_del_timer(STATE_SYNC(internal), u, CONFIG(del_timeout));
debug_ct(ct, "internal destroy");
return 1;
diff --git a/src/sync-notrack.c b/src/sync-notrack.c
index fdb0c43..8e6601a 100644
--- a/src/sync-notrack.c
+++ b/src/sync-notrack.c
@@ -188,7 +188,7 @@ static void notrack_run(void)
struct us_conntrack *u;
u = cache_get_conntrack(STATE_SYNC(internal), cn);
- tx_list_xmit(&cn->tx_list, u, NFCT_Q_UPDATE);
+ tx_list_xmit(&cn->tx_list, u, NET_T_STATE_UPD);
}
}