messages: Reformat ssh_packet_service_request()

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-09-25 15:54:30 +02:00
parent 1ec2ca4202
commit 54ec81db2d

View File

@@ -611,16 +611,20 @@ void ssh_message_free(ssh_message msg){
#ifdef WITH_SERVER #ifdef WITH_SERVER
SSH_PACKET_CALLBACK(ssh_packet_service_request){ SSH_PACKET_CALLBACK(ssh_packet_service_request)
{
ssh_string service = NULL; ssh_string service = NULL;
char *service_c = NULL; char *service_c = NULL;
ssh_message msg = NULL; ssh_message msg = NULL;
(void)type; (void)type;
(void)user; (void)user;
service = ssh_buffer_get_ssh_string(packet); service = ssh_buffer_get_ssh_string(packet);
if (service == NULL) { if (service == NULL) {
ssh_set_error(session, SSH_FATAL, "Invalid SSH_MSG_SERVICE_REQUEST packet"); ssh_set_error(session,
SSH_FATAL,
"Invalid SSH_MSG_SERVICE_REQUEST packet");
goto error; goto error;
} }
@@ -629,18 +633,21 @@ SSH_PACKET_CALLBACK(ssh_packet_service_request){
goto error; goto error;
} }
SSH_LOG(SSH_LOG_PACKET, SSH_LOG(SSH_LOG_PACKET,
"Received a SERVICE_REQUEST for service %s", service_c); "Received a SERVICE_REQUEST for service %s",
service_c);
msg = ssh_message_new(session); msg = ssh_message_new(session);
if(!msg){ if (msg == NULL) {
SAFE_FREE(service_c); SAFE_FREE(service_c);
goto error; goto error;
} }
msg->type=SSH_REQUEST_SERVICE; msg->type=SSH_REQUEST_SERVICE;
msg->service_request.service=service_c; msg->service_request.service=service_c;
error: error:
ssh_string_free(service); ssh_string_free(service);
if(msg != NULL) if (msg != NULL) {
ssh_message_queue(session, msg); ssh_message_queue(session, msg);
}
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }