rename tnode->queue to tnode->out_queue to indicate this queue is for

sending data out to the other node

diff --git a/tcp/ctdb_tcp.h b/tcp/ctdb_tcp.h
index c8df8bb63f245a1baa9493cbc0a3b55b7c8fd636..9489028be01621aa572dccbaec4257401ee88030 100644 (file)
--- a/tcp/ctdb_tcp.h
+++ b/tcp/ctdb_tcp.h
@@ -38,7 +38,7 @@ struct ctdb_incoming {
 */
 struct ctdb_tcp_node {
        int fd;
-       struct ctdb_queue *queue;
+       struct ctdb_queue *out_queue;
        struct fd_event *connect_fde;
        struct timed_event *connect_te;
 };

diff --git a/tcp/tcp_connect.c b/tcp/tcp_connect.c
index 991623a512808825a1c86d779be6c98cd21738fc..77aa242c9f85dd69f1ee07c1cf915ebc1adcfd36 100644 (file)
--- a/tcp/tcp_connect.c
+++ b/tcp/tcp_connect.c
@@ -41,7 +41,7 @@ void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data)
 
        /* start a new connect cycle to try to re-establish the
           link */
-       ctdb_queue_set_fd(tnode->queue, -1);
+       ctdb_queue_set_fd(tnode->out_queue, -1);
        tnode->fd = -1;
        event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
                        ctdb_tcp_node_connect, node);
@@ -80,7 +80,7 @@ static void ctdb_node_connect_write(struct event_context *ev, struct fd_event *f
         setsockopt(tnode->fd,IPPROTO_TCP,TCP_NODELAY,(char *)&one,sizeof(one));
         setsockopt(tnode->fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&one,sizeof(one));
 
-       ctdb_queue_set_fd(tnode->queue, tnode->fd);
+       ctdb_queue_set_fd(tnode->out_queue, tnode->fd);
 
        /* tell the ctdb layer we are connected */
        node->ctdb->upcalls->node_connected(node);

diff --git a/tcp/tcp_init.c b/tcp/tcp_init.c
index ab1de71ca4abbb383f1fd2df47de92d7a9d5ec3d..603812632d4566557842602f288200f53b22cb95 100644 (file)
--- a/tcp/tcp_init.c
+++ b/tcp/tcp_init.c
@@ -41,7 +41,7 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
        tnode->fd = -1;
        node->private_data = tnode;
 
-       tnode->queue = ctdb_queue_setup(node->ctdb, ctcp, tnode->fd, CTDB_TCP_ALIGNMENT,
+       tnode->out_queue = ctdb_queue_setup(node->ctdb, ctcp, tnode->fd, CTDB_TCP_ALIGNMENT,
                                        ctdb_tcp_tnode_cb, node);
        
        return 0;

diff --git a/tcp/tcp_io.c b/tcp/tcp_io.c
index dff5ca670ed340ff2d064c306d1765e633bc7110..7d26eca2560e3771f4d9e2e989623a7bce377112 100644 (file)
--- a/tcp/tcp_io.c
+++ b/tcp/tcp_io.c
@@ -86,5 +86,5 @@ int ctdb_tcp_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length)
 {
        struct ctdb_tcp_node *tnode = talloc_get_type(node->private_data,
                                                      struct ctdb_tcp_node);
-       return ctdb_queue_send(tnode->queue, data, length);
+       return ctdb_queue_send(tnode->out_queue, data, length);
 }