sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
sending data out to the other node

(This used to be ctdb commit 0bc949c529094570da56c9007ff96b1f5ad02c59)
This commit is contained in:
Ronnie Sahlberg 2007-07-02 14:26:50 +10:00
parent 3a71dcf505
commit 027d40a5ee
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tcp/ctdb_tcp.h
View File

@ -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;
};

4
ctdb/tcp/tcp_connect.c
View File

@ -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);

2
ctdb/tcp/tcp_init.c
View File

@ -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;

2
ctdb/tcp/tcp_io.c
View File

@ -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);
}