Add CCP support to sesexec

sesexec can now tell the xrdp process to exit, and is aware when
the xrdp process exits.

Author: matt335672

sesman/sesexec/Makefile.am

@@ -21,6 +21,8 @@ xrdp_sesexec_SOURCES = \
   sesexec.h \
   session.c \
   session.h \
+  ccp_server.c \
+  ccp_server.h \
   eicp_server.c \
   eicp_server.h \
   ercp_server.c \

sesman/sesexec/ccp_server.c

@@ -0,0 +1,53 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2004-2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * @file eicp_server.c
+ * @brief eicp (executive initialisation control protocol) server function
+ * @author Matt Burt
+ *
+ */
+
+#if defined(HAVE_CONFIG_H)
+#include <config_ac.h>
+#endif
+
+#include "trans.h"
+
+#include "ccp.h"
+#include "ccp_server.h"
+
+/******************************************************************************/
+int
+ccp_server(struct trans *self)
+{
+    int rv = 0;
+    enum ccp_msg_code msgno;
+
+    switch ((msgno = ccp_msg_in_get_msgno(self)))
+    {
+        default:
+        {
+            char buff[64];
+            ccp_msgno_to_str(msgno, buff, sizeof(buff));
+            LOG(LOG_LEVEL_ERROR, "Ignored CCP message %s", buff);
+        }
+    }
+    return rv;
+}

sesman/sesexec/ccp_server.h

@@ -0,0 +1,39 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2004-2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * @file ccp_server.h
+ * @brief ccp (connection control protocol) server function
+ * @author Matt Burt
+ *
+ */
+
+#ifndef CCP_SERVER_H
+#define CCP_SERVER_H
+
+/**
+ *
+ * @brief Processes an CCP message
+ * @param self The CCP transport the message is coming in on
+ *
+ */
+int
+ccp_server(struct trans *self);
+
+#endif // CCP_SERVER_H

sesman/sesexec/ercp_server.c

@@ -87,15 +87,33 @@ handle_connect_session_request(struct trans *self)
         }
         else
         {
-            scp_fd = -1; // Don't close this twice!
+            // Ownership of the file descriptor is passed to scp_trans;
+            // don't delete it separately.
+            scp_fd = -1;
 
             // Now we've got a transport we can send data back to
             // the SCP client
             enum scp_sconnect_status scp_status;
             int display_fd = -1;
             int chan_fd = -1;
+
+            // Terminate any existing xrdp process to sesexec
+            if (g_ccp_trans != NULL)
+            {
+                sesexec_terminate_connected_xrdp_process(
+                    CCP_CLOSE_DISCONNECTED_BY_OTHERCONNECTION);
+                g_sleep(500);
+            }
             scp_status = get_session_fds(g_session_data, scp_flags,
                                          &display_fd, &chan_fd);
+
+            // Tell sesman about the new client connection
+            if (g_ecp_trans != NULL)
+            {
+                /// TODO: client connect event
+            }
+
+            // Pass the session file descriptors to the client
             rv = scp_send_connect_session_response(scp_trans, scp_status,
                                                    display_fd, chan_fd);
 
@@ -120,10 +138,17 @@ handle_connect_session_request(struct trans *self)
                     session_run_reconnect_script(g_login_info,
                                                  g_session_data);
                 }
+
+                // Convert the SCP transport to a CCP transport, and
+                // record it
+                if (sesexec_set_ccp_trans(scp_trans) == 0)
+                {
+                    scp_trans = NULL; // Prevent transport being deleted.
+                }
             }
 
-            // Regardless of the result of the send, we must close all
-            // our copies of file descriptors.
+            // Close all our copies of file descriptors, including the
+            // SCP transport if we failed to convert it to a CCP transport
             if (display_fd >= 0)
             {
                 g_file_close(display_fd);
@@ -132,7 +157,10 @@ handle_connect_session_request(struct trans *self)
             {
                 g_file_close(chan_fd);
             }
-            trans_delete(scp_trans);
+            if (scp_trans != NULL)
+            {
+                trans_delete(scp_trans);
+            }
         }
     }