sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

smbd-server: Use MSG_SMB_IP_DROPPED

Browse Source 
Signed-off-by: Vinit Agnihotri <vagnihotri@ddn.com>
Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Vinit Agnihotri 2024-02-29 00:52:08 -08:00 committed by Martin Schwenke
parent 644b50b05b
commit 916fabe7e8
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source3/smbd/server.c
View File

@ -1284,6 +1284,13 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
messaging_register(msg_ctx, NULL, MSG_SMB_NOTIFY_STARTED,
smb_parent_send_to_children);
if (lp_interfaces() && lp_bind_interfaces_only()) {
messaging_register(msg_ctx,
NULL,
MSG_SMB_IP_DROPPED,
smb_parent_send_to_children);
}
#ifdef DEVELOPER
messaging_register(msg_ctx, NULL, MSG_SMB_INJECT_FAULT,
msg_inject_fault);
@ -1640,6 +1647,7 @@ static void smbd_init_addrchange(TALLOC_CTX *mem_ctx,
}
static void smbd_close_socket_for_ip(struct smbd_parent_context *parent,
struct messaging_context *msg_ctx,
struct sockaddr_storage *addr)
{
struct smbd_open_socket *s = NULL;
@ -1655,12 +1663,25 @@ static void smbd_close_socket_for_ip(struct smbd_parent_context *parent,
if (sockaddr_equal((struct sockaddr *)&a,
(struct sockaddr *)addr)) {
char addrstr[INET6_ADDRSTRLEN];
DATA_BLOB blob;
NTSTATUS status;
DLIST_REMOVE(parent->sockets, s);
TALLOC_FREE(s);
print_sockaddr(addrstr, sizeof(addrstr), addr);
DBG_NOTICE("smbd: Closed listening socket for %s\n",
addrstr);
blob = data_blob_const(addrstr, strlen(addrstr)+1);
status = messaging_send(msg_ctx,
messaging_server_id(msg_ctx),
MSG_SMB_IP_DROPPED,
&blob);
if (!NT_STATUS_IS_OK(status)) {
DBG_NOTICE(
"messaging_send failed: %s - ignoring\n",
nt_errstr(status));
}
return;
}
}
@ -1693,7 +1714,7 @@ static void smbd_addr_changed(struct tevent_req *req)
"on if_index %u\n",
addrstr, if_index);
smbd_close_socket_for_ip(state->parent, &addr);
smbd_close_socket_for_ip(state->parent, state->msg_ctx, &addr);
goto rearm;
}

38
source3/smbd/smb2_process.c
View File

@ -1565,6 +1565,38 @@ static void msg_kill_client_ip(struct messaging_context *msg_ctx,
TALLOC_FREE(client_ip);
}
static void msg_kill_client_with_server_ip(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,
struct server_id server_id,
DATA_BLOB *data)
{
struct smbd_server_connection *sconn = talloc_get_type_abort(
private_data, struct smbd_server_connection);
const char *ip = (char *) data->data;
char *server_ip = NULL;
TALLOC_CTX *ctx = NULL;
DBG_NOTICE("Got kill request for source IP %s\n", ip);
ctx = talloc_stackframe();
server_ip = tsocket_address_inet_addr_string(sconn->local_address, ctx);
if (server_ip == NULL) {
goto out_free;
}
if (strequal(ip, server_ip)) {
DBG_NOTICE(
"Got ip dropped message for %s - exiting immediately\n",
ip);
TALLOC_FREE(ctx);
exit_server_cleanly("Forced disconnect for client");
}
out_free:
TALLOC_FREE(ctx);
}
/*
* Do the recurring check if we're idle
*/
@ -2019,6 +2051,12 @@ void smbd_process(struct tevent_context *ev_ctx,
messaging_register(sconn->msg_ctx, NULL,
MSG_DEBUG, debug_message);
messaging_deregister(sconn->msg_ctx, MSG_SMB_IP_DROPPED, NULL);
messaging_register(sconn->msg_ctx,
sconn,
MSG_SMB_IP_DROPPED,
msg_kill_client_with_server_ip);
#if defined(WITH_SMB1SERVER)
if ((lp_keepalive() != 0) &&
!(event_add_idle(ev_ctx,