simplify wolfSSH_ChannelIsPty to only take a pointer to a channel

Author: JacobBarthelmeh

apps/wolfsshd/wolfsshd.c

@@ -1164,6 +1164,23 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
     #include <sys/ioctl.h>
 #endif
 
+static int SHELL_IsPty(WOLFSSH* ssh)
+{
+    WOLFSSH_CHANNEL* channel;
+    int ret = WS_SUCCESS;
+    word32 channelId = 0;
+
+    ret = wolfSSH_GetLastRxId(ssh, &channelId);
+    if (ret == WS_SUCCESS) {
+        channel = wolfSSH_ChannelFind(ssh, channelId, WS_CHANNEL_ID_SELF);
+    }
+
+    if (ret == WS_SUCCESS) {
+        ret =  wolfSSH_ChannelIsPty(channel);
+    }
+    return ret;
+}
+
 /* handles creating a new shell env. and maintains SSH connection for incoming
  * user input as well as output of the shell.
  * return WS_SUCCESS on success */
@@ -1205,7 +1222,7 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh,
 
     forcedCmd = wolfSSHD_ConfigGetForcedCmd(usrConf);
 
-    ptyReq = wolfSSH_ChannelIsPty(ssh, NULL);
+    ptyReq = SHELL_IsPty(ssh);
     if (ptyReq < 0) {
         wolfSSH_Log(WS_LOG_ERROR, "[SSHD] Failure get channel PTY state");
         return WS_FATAL_ERROR;

src/ssh.c

@@ -3235,27 +3235,12 @@ WS_SessionType wolfSSH_ChannelGetSessionType(const WOLFSSH_CHANNEL* channel)
 
 #if defined(WOLFSSH_TERM)
 /* returns 1 if a PTY was requested, 0 if not, and negative on failure */
-int wolfSSH_ChannelIsPty(WOLFSSH* ssh, WOLFSSH_CHANNEL* channel)
+int wolfSSH_ChannelIsPty(const WOLFSSH_CHANNEL* channel)
 {
-    WOLFSSH_CHANNEL* channelPtr;
-    int ret = WS_SUCCESS;
-
-    channelPtr = channel;
-
-    /* if channel is NULL than use the last rxtx channel */
-    if (channelPtr == NULL) {
-        word32 channelId = 0;
-
-        ret = wolfSSH_GetLastRxId(ssh, &channelId);
-        if (ret == WS_SUCCESS) {
-            channelPtr = ChannelFind(ssh, channelId, WS_CHANNEL_ID_SELF);
-        }
-    }
-
-    if (ret == WS_SUCCESS) {
-        ret = channelPtr->ptyReq;
+    if (channel == NULL) {
+        return WS_BAD_ARGUMENT;
     }
-    return ret;
+    return channel->ptyReq;
 }
 #endif
 

wolfssh/ssh.h

@@ -233,7 +233,7 @@ WOLFSSH_API WS_SessionType wolfSSH_ChannelGetSessionType(
         const WOLFSSH_CHANNEL* channel);
 WOLFSSH_API const char* wolfSSH_ChannelGetSessionCommand(
         const WOLFSSH_CHANNEL* channel);
-WOLFSSH_API int wolfSSH_ChannelIsPty(WOLFSSH* ssh, WOLFSSH_CHANNEL* channel);
+WOLFSSH_API int wolfSSH_ChannelIsPty(const WOLFSSH_CHANNEL* channel);
 
 /* Channel callbacks */
 typedef int (*WS_CallbackChannelOpen)(WOLFSSH_CHANNEL* channel, void* ctx);