Skip to content

ftp server: call logout callback on client timeout for consistency #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vb-linetco wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

ftp server: call logout callback on client timeout for consistency #372

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcf5a11
ftp server: call logout callback on client timeout for consistency
vb-linetco Mar 25, 2026
737adf7
Correct some formatting and documentation issues from self review
vb-linetco Mar 26, 2026
63c976a
Fix typo
vb-linetco Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 85 additions & 66 deletions addons/ftp/nxd_ftp_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ NX_CALLER_CHECKING_EXTERNS
#define NX_FTP_CODE_BAD_NAME "553" /* Requested action not taken, File name not allowed. */

static VOID _nx_ftp_server_number_to_ascii(UCHAR *buffer_ptr, UINT buffer_size, UINT number, UCHAR pad);

static VOID _nx_ftp_server_logout_client(NX_FTP_SERVER *ftp_server_ptr, NX_FTP_CLIENT_REQUEST *client_request_ptr);

/**************************************************************************/
/* */
/* FUNCTION RELEASE */
Expand Down Expand Up @@ -1445,6 +1446,7 @@ ULONG events;
/* nx_tcp_socket_transmit_configure Configure data transer socket */
/* _nx_utility_uint_to_string Convert number to string */
/* _nx_ftp_server_data_socket_cleanup Clean up data socket */
/* _nx_ftp_server_logout_client Logout the client */
/* */
/* CALLED BY */
/* */
Expand Down Expand Up @@ -1720,39 +1722,9 @@ ULONG block_size;
/* Increment the number of disconnection requests. */
ftp_server_ptr -> nx_ftp_server_disconnection_requests++;

/* Check if this client login. */
if (client_req_ptr -> nx_ftp_client_request_login)
{

/* Call the logout function. */

#ifndef NX_DISABLE_IPV4
/* Does this server have an IPv4 login function? */
if (ftp_server_ptr -> nx_ftp_logout_ipv4)
{

/* Call the logout which takes IPv4 address input. */
(ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr,
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_req_ptr -> nx_ftp_client_request_username,
client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
}
#endif /* NX_DISABLE_IPV4 */
if (ftp_server_ptr -> nx_ftp_logout)
{

/* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
(ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_req_ptr -> nx_ftp_client_request_username,
client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
}

/* Set the login as FALSE. */
client_req_ptr -> nx_ftp_client_request_login = NX_FALSE;
}

/* Logout the client */
_nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);

/* Clear authentication. */
client_req_ptr -> nx_ftp_client_request_authenticated = NX_FALSE;

Expand Down Expand Up @@ -4554,6 +4526,7 @@ NX_FTP_SERVER *server_ptr;
/* fx_file_close Close file */
/* nx_ftp_packet_allocate Allocate a packet */
/* _nx_ftp_server_data_socket_cleanup Clean up data socket */
/* _nx_ftp_server_logout_client Logout the client */
/* */
/* CALLED BY */
/* */
Expand Down Expand Up @@ -5133,6 +5106,7 @@ NX_FTP_SERVER *server_ptr;
/* nx_tcp_server_socket_unaccept Unaccept server connection */
/* nx_tcp_socket_disconnect Disconnect socket */
/* _nx_ftp_server_data_socket_cleanup Clean up data socket */
/* _nx_ftp_server_logout_client Logout the client */
/* */
/* CALLED BY */
/* */
Expand Down Expand Up @@ -5187,6 +5161,9 @@ NX_FTP_CLIENT_REQUEST *client_req_ptr;
/* Reset the block bytes. */
client_req_ptr -> nx_ftp_client_request_block_bytes = 0;

/* Logout the client. */
_nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);

/* Now disconnect the command socket. */
nx_tcp_socket_disconnect(&(client_req_ptr -> nx_ftp_client_request_control_socket), NX_NO_WAIT);

Expand Down Expand Up @@ -5344,38 +5321,8 @@ NX_FTP_CLIENT_REQUEST *client_req_ptr;
/* Reset the block bytes. */
client_req_ptr -> nx_ftp_client_request_block_bytes = 0;

/* Check if this client login. */
if (client_req_ptr -> nx_ftp_client_request_login)
{

/* Call the logout function. */

#ifndef NX_DISABLE_IPV4
/* Does this server have an IPv4 login function? */
if (ftp_server_ptr -> nx_ftp_logout_ipv4)
{

/* Call the logout which takes IPv4 address input. */
(ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr,
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_req_ptr -> nx_ftp_client_request_username,
client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
}
#endif /* NX_DISABLE_IPV4 */
if (ftp_server_ptr -> nx_ftp_logout)
{

/* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
(ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
client_req_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_req_ptr -> nx_ftp_client_request_username,
client_req_ptr -> nx_ftp_client_request_password, NX_NULL);
}

/* Set the login as FALSE. */
client_req_ptr -> nx_ftp_client_request_login = NX_FALSE;
}
/* Logout the client. */
_nx_ftp_server_logout_client(ftp_server_ptr, client_req_ptr);

/* Now disconnect the command socket. */
nx_tcp_socket_disconnect(&(client_req_ptr -> nx_ftp_client_request_control_socket), NX_FTP_SERVER_TIMEOUT);
Expand Down Expand Up @@ -6498,6 +6445,78 @@ UINT size;
}
}

/**************************************************************************/
/* */
/* FUNCTION RELEASE */
/* */
/* _nx_ftp_server_logout_client PORTABLE C */
/* 6.4.3 */
/* AUTHOR */
/* */
/* TBD */
Copy link
Copy Markdown
Author

@vb-linetco vb-linetco Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fdesbiens Since I've only moved this code, I was not sure which Autor to put here. What is the policy about this?

/* */
/* DESCRIPTION */
/* */
/* This function logs out the client if it was previously logged in */
/* */
/* INPUT */
/* */
/* ftp_server_ptr Pointer to FTP server */
/* client_request_ptr Pointer to FTP client */
/* */
/* OUTPUT */
/* */
/* None */
/* */
/* CALLS */
/* */
/* None */
/* */
/* CALLED BY */
/* _nx_ftp_server_control_disconnect_processing */
/* Disconnect processing */
/* _nx_ftp_server_command_process */
/* QUIT command */
/* _nx_ftp_server_timeout_processing */
/* Timeout proccessing */
/* */
/**************************************************************************/

static VOID _nx_ftp_server_logout_client(NX_FTP_SERVER *ftp_server_ptr, NX_FTP_CLIENT_REQUEST *client_request_ptr)
{
/* Check if this client login. */
if (client_request_ptr -> nx_ftp_client_request_login)
{

/* Call the logout function. */

#ifndef NX_DISABLE_IPV4
/* Does this server have an IPv4 logout function? */
if (ftp_server_ptr -> nx_ftp_logout_ipv4)
{

/* Call the logout which takes IPv4 address input. */
(ftp_server_ptr -> nx_ftp_logout_ipv4)(ftp_server_ptr,
client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip.nxd_ip_address.v4,
client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_request_ptr -> nx_ftp_client_request_username,
client_request_ptr -> nx_ftp_client_request_password, NX_NULL);
}
#endif /* NX_DISABLE_IPV4 */
if (ftp_server_ptr -> nx_ftp_logout)
{

/* Call the 'duo' logout function which takes IPv6 or IPv4 IP addresses. */
(ftp_server_ptr -> nx_ftp_logout)(ftp_server_ptr, &(client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_ip),
client_request_ptr -> nx_ftp_client_request_control_socket.nx_tcp_socket_connect_port,
client_request_ptr -> nx_ftp_client_request_username,
client_request_ptr -> nx_ftp_client_request_password, NX_NULL);
}

/* Set the login as FALSE. */
client_request_ptr -> nx_ftp_client_request_login = NX_FALSE;
}
}

/**************************************************************************/
/* */
Expand Down