From 0ed82f71e8b3208d12f164ea8900195cd868032e Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Sun, 31 Mar 2019 21:54:09 -0700
Subject: [PATCH] xrdp: check term event for more responsive shutdown

---
 common/trans.c | 20 ++++++++++++++++++--
 xrdp/xrdp_mm.c | 10 ++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/common/trans.c b/common/trans.c
index 5909e4eb..0882d643 100644
--- a/common/trans.c
+++ b/common/trans.c
@@ -712,13 +712,21 @@ trans_connect(struct trans *self, const char *server, const char *port,
                 now = g_time3();
                 if (now - start_time < timeout)
                 {
-                    g_sleep(timeout / 5);
+                    g_sleep(100);
                 }
                 else
                 {
                     self->status = TRANS_STATUS_DOWN;
                     return 1;
                 }
+                if (self->is_term != NULL)
+                {
+                    if (self->is_term())
+                    {
+                        self->status = TRANS_STATUS_DOWN;
+                        return 1;
+                    }
+                }
             }
         }
     }
@@ -748,13 +756,21 @@ trans_connect(struct trans *self, const char *server, const char *port,
                 now = g_time3();
                 if (now - start_time < timeout)
                 {
-                    g_sleep(timeout / 5);
+                    g_sleep(100);
                 }
                 else
                 {
                     self->status = TRANS_STATUS_DOWN;
                     return 1;
                 }
+                if (self->is_term != NULL)
+                {
+                    if (self->is_term())
+                    {
+                        self->status = TRANS_STATUS_DOWN;
+                        return 1;
+                    }
+                }
             }
         }
     }
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 7d204b5b..757620ac 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -1440,7 +1440,10 @@ xrdp_mm_connect_chansrv(struct xrdp_mm *self, const char *ip, const char *port)
             self->chan_trans_up = 1;
             break;
         }
-
+        if (g_is_term())
+        {
+            break;
+        }
         g_sleep(1000);
         log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: connect failed "
                   "trying again...");
@@ -2275,7 +2278,10 @@ xrdp_mm_connect(struct xrdp_mm *self)
                 ok = 1;
                 break;
             }
-
+            if (g_is_term())
+            {
+                break;
+            }
             g_sleep(1000);
             g_writeln("xrdp_mm_connect: connect failed "
                       "trying again...");