shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

channels: Use a structure to store exit information

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2024-02-02 14:50:12 +01:00
parent bc1acb5312
commit b2d3a4670a
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/libssh/channels.h
View File

@@ -80,7 +80,12 @@ struct ssh_channel_struct {
ssh_buffer stdout_buffer; ssh_buffer stdout_buffer;
ssh_buffer stderr_buffer; ssh_buffer stderr_buffer;
void *userarg; void *userarg;
uint32_t exit_status; struct {
bool status;
uint32_t code;
char *signal;
bool core_dumped;
} exit;
enum ssh_channel_request_state_e request_state; enum ssh_channel_request_state_e request_state;
struct ssh_list *callbacks; /* list of ssh_channel_callbacks */ struct ssh_list *callbacks; /* list of ssh_channel_callbacks */

16
src/channels.c
View File

@@ -122,7 +122,7 @@ ssh_channel ssh_channel_new(ssh_session session)
} }
channel->session = session; channel->session = session;
channel->exit_status = (uint32_t)-1; channel->exit.code = (uint32_t)-1;
channel->flags = SSH_CHANNEL_FLAG_NOT_BOUND; channel->flags = SSH_CHANNEL_FLAG_NOT_BOUND;
if (session->channels == NULL) { if (session->channels == NULL) {
@@ -808,19 +808,23 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
if (strcmp(request,"exit-status") == 0) { if (strcmp(request,"exit-status") == 0) {
SAFE_FREE(request); SAFE_FREE(request);
rc = ssh_buffer_unpack(packet, "d", &channel->exit_status); rc = ssh_buffer_unpack(packet, "d", &channel->exit.code);
if (rc != SSH_OK) { if (rc != SSH_OK) {
SSH_LOG(SSH_LOG_PACKET, "Invalid exit-status packet"); SSH_LOG(SSH_LOG_PACKET, "Invalid exit-status packet");
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
SSH_LOG(SSH_LOG_PACKET, "received exit-status %d", channel->exit_status); channel->exit.status = true;
SSH_LOG(SSH_LOG_PACKET,
"received exit-status %u",
channel->exit.code);
ssh_callbacks_execute_list(channel->callbacks, ssh_callbacks_execute_list(channel->callbacks,
ssh_channel_callbacks, ssh_channel_callbacks,
channel_exit_status_function, channel_exit_status_function,
channel->session, channel->session,
channel, channel,
channel->exit_status); channel->exit.code);
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@@ -3360,7 +3364,7 @@ ssh_session ssh_channel_get_session(ssh_channel channel)
static int ssh_channel_exit_status_termination(void *c) static int ssh_channel_exit_status_termination(void *c)
{ {
ssh_channel channel = c; ssh_channel channel = c;
if (channel->exit_status != (uint32_t)-1 || if (channel->exit.status ||
/* When a channel is closed, no exit status message can /* When a channel is closed, no exit status message can
* come anymore */ * come anymore */
(channel->flags & SSH_CHANNEL_FLAG_CLOSED_REMOTE) || (channel->flags & SSH_CHANNEL_FLAG_CLOSED_REMOTE) ||
@@ -3402,7 +3406,7 @@ int ssh_channel_get_exit_status(ssh_channel channel)
if (rc == SSH_ERROR || channel->session->session_state == if (rc == SSH_ERROR || channel->session->session_state ==
SSH_SESSION_STATE_ERROR) SSH_SESSION_STATE_ERROR)
return SSH_ERROR; return SSH_ERROR;
return channel->exit_status; return channel->exit.code;
} }
/* /*