diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-03-12 21:19:19 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-03-12 21:19:19 +0100 |
| commit | 338d8fc2da19f5d6a75c339d9e6ecac43b68a1e4 (patch) | |
| tree | 4fcdc9911c9831de78bd5ae3ae7f0a805fc7ffc2 /src | |
| parent | 656d5ad7c69a5a7d356c6251743890f1eec0bb71 (diff) | |
| download | conntrack-tools-338d8fc2da19f5d6a75c339d9e6ecac43b68a1e4.tar.gz conntrack-tools-338d8fc2da19f5d6a75c339d9e6ecac43b68a1e4.zip | |
sync-mode: rename mcast_track_*() by nethdr_track_*()
This patch is a cleanup. It renames the mcast_track_*() functions
by nethdr_track_*() because this functions are related to message
sequence tracking. They are not stick to multicast at all.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network.c | 6 | ||||
| -rw-r--r-- | src/sync-alarm.c | 2 | ||||
| -rw-r--r-- | src/sync-ftfw.c | 6 | ||||
| -rw-r--r-- | src/sync-notrack.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/network.c b/src/network.c index bdfa10c..6a66a2b 100644 --- a/src/network.c +++ b/src/network.c @@ -68,7 +68,7 @@ void nethdr_set_ctl(struct nethdr *net) static int local_seq_set = 0; /* this function only tracks, it does not update the last sequence received */ -int mcast_track_seq(uint32_t seq, uint32_t *exp_seq) +int nethdr_track_seq(uint32_t seq, uint32_t *exp_seq) { int ret = SEQ_UNKNOWN; @@ -104,7 +104,7 @@ out: return ret; } -void mcast_track_update_seq(uint32_t seq) +void nethdr_track_update_seq(uint32_t seq) { if (!local_seq_set) local_seq_set = 1; @@ -112,7 +112,7 @@ void mcast_track_update_seq(uint32_t seq) STATE_SYNC(last_seq_recv) = seq; } -int mcast_track_is_seq_set() +int nethdr_track_is_seq_set() { return local_seq_set; } diff --git a/src/sync-alarm.c b/src/sync-alarm.c index caa6bb2..4757026 100644 --- a/src/sync-alarm.c +++ b/src/sync-alarm.c @@ -102,7 +102,7 @@ static int alarm_recv(const struct nethdr *net) * just joined the cluster, instead they just get resynchronized in * RefreshTime seconds at worst case. */ - mcast_track_seq(net->seq, &exp_seq); + nethdr_track_seq(net->seq, &exp_seq); return 0; } diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c index cacbb13..e026b1c 100644 --- a/src/sync-ftfw.c +++ b/src/sync-ftfw.c @@ -129,7 +129,7 @@ static void tx_queue_add_ctlmsg2(uint32_t flags) /* this function is called from the alarm framework */ static void do_alive_alarm(struct alarm_block *a, void *data) { - if (ack_from_set && mcast_track_is_seq_set()) { + if (ack_from_set && nethdr_track_is_seq_set()) { /* exp_seq contains the last update received */ tx_queue_add_ctlmsg(NET_F_ACK, ack_from, @@ -396,7 +396,7 @@ static int ftfw_recv(const struct nethdr *net) goto bypass; } - switch (mcast_track_seq(net->seq, &exp_seq)) { + switch (nethdr_track_seq(net->seq, &exp_seq)) { case SEQ_AFTER: ret = digest_msg(net); if (ret == MSG_BAD) { @@ -446,7 +446,7 @@ bypass: out: if ((ret == MSG_DATA || ret == MSG_CTL)) - mcast_track_update_seq(net->seq); + nethdr_track_update_seq(net->seq); return ret; } diff --git a/src/sync-notrack.c b/src/sync-notrack.c index 737ee52..6502bcd 100644 --- a/src/sync-notrack.c +++ b/src/sync-notrack.c @@ -114,12 +114,12 @@ static int notrack_recv(const struct nethdr *net) int ret; unsigned int exp_seq; - mcast_track_seq(net->seq, &exp_seq); + nethdr_track_seq(net->seq, &exp_seq); ret = digest_msg(net); if (ret != MSG_BAD) - mcast_track_update_seq(net->seq); + nethdr_track_update_seq(net->seq); return ret; } |