From e6795f28f9e75d241aa503bea83ba72c080d34c2 Mon Sep 17 00:00:00 2001
From: iliajie <gpg@ilia.engineer>
Date: Sun, 13 Nov 2022 23:40:58 +0200
Subject: [PATCH] Fix to place `cleanup_miniserv` to the lib file

---
 xterm/shellserver.pl | 30 +++++++-----------------------
 xterm/xterm-lib.pl   | 24 ++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/xterm/shellserver.pl b/xterm/shellserver.pl
index b6ec135e4..0719280d3 100755
--- a/xterm/shellserver.pl
+++ b/xterm/shellserver.pl
@@ -14,7 +14,7 @@ my @uinfo = getpwnam($user);
 my ($uid, $gid);
 if ($user ne "root" && !$<) {
 	if (!@uinfo) {
-		&cleanup_miniserv();
+		&cleanup_miniserv($port);
 		die "User $user does not exist!";
 		}
 	$uid = $uinfo[2];
@@ -68,7 +68,7 @@ my ($shellfh, $pid) = &proc::pty_process_exec($shellexec, $uid, $gid, $shelllogi
 &reset_environment();
 my $shcmd = "'$shellexec".($shelllogin ? " $shelllogin" : "")."'";
 if (!$pid) {
-	&cleanup_miniserv();
+	&cleanup_miniserv($port);
 	die "Failed to run shell with $shcmd\n";
 	}
 else {
@@ -83,7 +83,7 @@ untie(*STDIN);
 close(STDIN);
 
 $SIG{'ALRM'} = sub {
-	&cleanup_miniserv();
+	&cleanup_miniserv($port);
 	die "timeout waiting for connection";
 	};
 alarm(60);
@@ -133,13 +133,13 @@ Net::WebSocket::Server->new(
 					}
 				if (!syswrite($shellfh, $msg, length($msg))) {
 					print STDERR "write to shell failed : $!\n";
-					&cleanup_miniserv();
+					&cleanup_miniserv($port);
 					exit(1);
 					}
 				},
 			disconnect => sub {
 				print STDERR "websocket connection closed\n";
-				&cleanup_miniserv();
+				&cleanup_miniserv($port);
 				kill('KILL', $pid) if ($pid);
 				exit(0);
 				}
@@ -152,7 +152,7 @@ Net::WebSocket::Server->new(
 			my $ok = sysread($shellfh, $buf, 1024);
 			if ($ok <= 0) {
 				print STDERR "end of output from shell\n";
-				&cleanup_miniserv();
+				&cleanup_miniserv($port);
 				exit(0);
 				}
 			if ($wsconn) {
@@ -165,20 +165,4 @@ Net::WebSocket::Server->new(
 	],
 )->start;
 print STDERR "exited websockets server\n";
-&cleanup_miniserv();
-
-sub cleanup_miniserv
-{
-my %miniserv;
-if ($port) {
-	&lock_file(&get_miniserv_config_file());
-	&get_miniserv_config(\%miniserv);
-	my $wspath = "/$module_name/ws-".$port;
-	if ($miniserv{'websockets_'.$wspath}) {
-		delete($miniserv{'websockets_'.$wspath});
-		&put_miniserv_config(\%miniserv);
-		&reload_miniserv();
-		}
-	&unlock_file(&get_miniserv_config_file());
-	}
-}
+&cleanup_miniserv($port);
diff --git a/xterm/xterm-lib.pl b/xterm/xterm-lib.pl
index 89b00555a..fcaab70ba 100644
--- a/xterm/xterm-lib.pl
+++ b/xterm/xterm-lib.pl
@@ -5,9 +5,29 @@ use WebminCore;
 &init_config();
 our %access = &get_module_acl();
 
+# cleanup_miniserv(port)
+# Remove websocket in miniserv.conf
+# that is no longer being used
+sub cleanup_miniserv
+{
+my ($port) = @_;
+my %miniserv;
+if ($port) {
+    &lock_file(&get_miniserv_config_file());
+    &get_miniserv_config(\%miniserv);
+    my $wspath = "/$module_name/ws-".$port;
+    if ($miniserv{'websockets_'.$wspath}) {
+        delete($miniserv{'websockets_'.$wspath});
+        &put_miniserv_config(\%miniserv);
+        &reload_miniserv();
+        }
+    &unlock_file(&get_miniserv_config_file());
+    }
+}
+
 # cleanup_old_websockets([&skip-ports])
-# Called by scheduled status collection to remove any websockets in
-# miniserv.conf that are no longer used
+# Called by scheduled status collection to remove any
+# websockets in miniserv.conf that are no longer used
 sub cleanup_old_websockets
 {
 my ($skip) = @_;