[conntrack-tools] sync-mode: rename mcast_send_sync() to sync_send()

Pablo Neira netfilter-cvslog-bounces at lists.netfilter.org
Mon Mar 9 11:34:02 CET 2009


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=39fdc2e703eb5e82b2bec25e49900684cf689386
commit 39fdc2e703eb5e82b2bec25e49900684cf689386
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Mon Mar 9 11:32:36 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Mon Mar 9 11:32:36 2009 +0100

    sync-mode: rename mcast_send_sync() to sync_send()
    
    This patch is a cleanup. It renames the function mcast_send_sync()
    to sync_send() since the function itself is not related to multicast
    anymore (it enqueues state-changes to the upper layer).
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  39fdc2e703eb5e82b2bec25e49900684cf689386 (commit)
      from  40698eacd312893cc9feba2b6b93d81d47245f74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39fdc2e703eb5e82b2bec25e49900684cf689386
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Mon Mar 9 11:32:36 2009 +0100

    sync-mode: rename mcast_send_sync() to sync_send()
    
    This patch is a cleanup. It renames the function mcast_send_sync()
    to sync_send() since the function itself is not related to multicast
    anymore (it enqueues state-changes to the upper layer).
    
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 src/sync-mode.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
This patch is a cleanup. It renames the function mcast_send_sync()
to sync_send() since the function itself is not related to multicast
anymore (it enqueues state-changes to the upper layer).

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

diff --git a/src/sync-mode.c b/src/sync-mode.c
index 26e1358..ba504a5 100644
--- a/src/sync-mode.c
+++ b/src/sync-mode.c
@@ -513,7 +513,7 @@ static int local_handler_sync(int fd, int type, void *data)
 	return ret;
 }
 
-static void mcast_send_sync(struct cache_object *obj, int query)
+static void sync_send(struct cache_object *obj, int query)
 {
 	STATE_SYNC(sync)->enqueue(obj, query);
 }
@@ -539,7 +539,7 @@ static int purge_step(void *data1, void *data2)
 	if (!STATE(get_retval)) {
 		if (obj->status != C_OBJ_DEAD) {
 			cache_object_set_status(obj, C_OBJ_DEAD);
-			mcast_send_sync(obj, NET_T_STATE_DEL);
+			sync_send(obj, NET_T_STATE_DEL);
 			cache_object_put(obj);
 		}
 	}
@@ -576,10 +576,10 @@ static int resync_sync(enum nf_conntrack_msg_type type,
 
 	switch (obj->status) {
 	case C_OBJ_NEW:
-		mcast_send_sync(obj, NET_T_STATE_NEW);
+		sync_send(obj, NET_T_STATE_NEW);
 		break;
 	case C_OBJ_ALIVE:
-		mcast_send_sync(obj, NET_T_STATE_UPD);
+		sync_send(obj, NET_T_STATE_UPD);
 		break;
 	}
 	return NFCT_CB_CONTINUE;
@@ -606,7 +606,7 @@ retry:
 			cache_object_free(obj);
 			return;
 		}
-		mcast_send_sync(obj, NET_T_STATE_NEW);
+		sync_send(obj, NET_T_STATE_NEW);
 	} else {
 		cache_del(STATE_SYNC(internal), obj);
 		cache_object_free(obj);
@@ -622,7 +622,7 @@ static void event_update_sync(struct nf_conntrack *ct)
 	if (obj == NULL)
 		return;
 
-	mcast_send_sync(obj, NET_T_STATE_UPD);
+	sync_send(obj, NET_T_STATE_UPD);
 }
 
 static int event_destroy_sync(struct nf_conntrack *ct)
@@ -636,7 +636,7 @@ static int event_destroy_sync(struct nf_conntrack *ct)
 
 	if (obj->status != C_OBJ_DEAD) {
 		cache_object_set_status(obj, C_OBJ_DEAD);
-		mcast_send_sync(obj, NET_T_STATE_DEL);
+		sync_send(obj, NET_T_STATE_DEL);
 		cache_object_put(obj);
 	}
 	return 1;



More information about the netfilter-cvslog mailing list