Use socat instead of socket-sucker.c from lightdm-remote-session-freerdp.

4 files changed, 13 insertions, 83 deletions

diff --git a/debian/changelog b/debian/changelog
index 820a9b4..9a77a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm-remote-session-x2go (0.0.0.1-0~x2go2) UNRELEASED; urgency=low
+
+  [ Jan Engelhardt ]
+  * New upstream version (0.0.0.2):
+    - Use socat instead of socket-sucker.c from lightdm-remote-session-freerdp.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sun, 11 Nov 2012 13:12:23 +0100
+
 lightdm-remote-session-x2go (0.0.0.1-0~x2go1) unstable; urgency=low
 
   * Initial upstream release. Forked from Canonical's
diff --git a/debian/control b/debian/control
index df11b2e..f0b2e36 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Architecture: any
 Depends: 
  ${shlibs:Depends},
  ${misc:Depends},
+ socat,
  zenity,
  pyhoca-cli (>= 0.2.1.0-0~),
  libpam-x2go,
diff --git a/socket-sucker.c b/socket-sucker.c
deleted file mode 100644
index 403819b..0000000
--- a/socket-sucker.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
- * Author libpam-freerdp (where we forked from): Ted Gould <ted@canonical.com>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#define BUFFER_SIZE  256
-
-int
-main (int argc, char * argv[])
-{
-	int socket_fd = 0;
-	int servlen = 0;
-	struct sockaddr_un serv_addr;
-
-	bzero((char *)&serv_addr, sizeof(serv_addr));
-
-	const char * home = getenv("HOME");
-	if (home == NULL) {
-		return -1;
-	}
-
-	serv_addr.sun_family = AF_UNIX;
-	
-	int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".x2go-socket");
-	if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
-		return -1;
-	}
-
-	servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family);
-
-	if ((socket_fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-		return -1;
-	}
-
-	if (connect(socket_fd, (struct sockaddr *)&serv_addr, servlen) < 0) {
-		return -1;
-	}
-
-	char buffer[BUFFER_SIZE + 2];
-	int in = 0;
-	int out = 0;
-
-	in = read(socket_fd, buffer, BUFFER_SIZE);
-
-	if (in > 0) {
-		out = write(1, buffer, in);
-	}
-
-	close(socket_fd);
-
-	if (in > 0 && out > 0 && in == out) {
-		return 0;
-	} else {
-		return -1;
-	}
-}
-
diff --git a/x2go-session.in b/x2go-session.in
index 7466509..1b3c739 100755
--- a/x2go-session.in
+++ b/x2go-session.in
@@ -20,10 +20,11 @@
 # Author lightdm-remote-session-freerdp (where we forked from): Ted Gould <ted@canonical.com>
 #
 
-if [ -e ~/.x2go-socket ]; then
-	@libexecdir@/socket-sucker | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go --
+socket="$HOME/.x2go-socket";
+if [ -e "$socket" ]; then
+	socat unix-connect:"$socket" - | /usr/bin/pyhoca-cli --from-stdin --add-to-known-hosts --kbd-type auto --sound pulse 2>&1 | logger -t lightdm-remote-session-x2go --
 else
 	zenity --warning --text="Unable to locate X2GoSession/PyHoca socket"
 fi;
 
-rm -f ~/.x2go-socket
+rm -f "$socket"