sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

ctdb-tcp: Mark node as disconnected if incoming connection goes away

Browse Source 
To make it easy to pass the node data to the upcall, the private data
for ctdb_tcp_read_cb() needs to be changed from tnode to node.

RN: Avoid marking a node as connected before it can receive packets
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14084

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Aug 16 22:50:35 UTC 2019 on sn-devel-184

(cherry picked from commit 73c850eda4209b688a169aeeb20c453b738cbb35)
This commit is contained in:
Martin Schwenke 2019-08-13 17:08:43 +10:00 committed by Karolin Seeger
parent 1e45ab3c23
commit f4442942fb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tcp/tcp_connect.c
View File

@ -339,7 +339,7 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
fd,
CTDB_TCP_ALIGNMENT,
ctdb_tcp_read_cb,
tnode,
node,
"ctdbd-%s",
ctdb_addr_to_str(&addr));
if (tnode->in_queue == NULL) {

5
ctdb/tcp/tcp_io.c
View File

@ -37,8 +37,9 @@
*/
void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args)
{
struct ctdb_node *node = talloc_get_type_abort(args, struct ctdb_node);
struct ctdb_tcp_node *tnode = talloc_get_type_abort(
args, struct ctdb_tcp_node);
node->private_data, struct ctdb_tcp_node);
struct ctdb_req_header *hdr = (struct ctdb_req_header *)data;
if (data == NULL) {
@ -77,6 +78,8 @@ failed:
TALLOC_FREE(tnode->in_queue);
close(tnode->in_fd);
tnode->in_fd = -1;
node->ctdb->upcalls->node_dead(node);
TALLOC_FREE(data);
}