This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository libx2goclient. from b4573c2 src/test/sshtest.c: very simple options checking. new e004c3a src/x2goclient-network.h: fix compile error. new 4b82bc9 src/x2goclient-network.h: reserve some space for future functions in the X2GoClientNetworkOptions class. new 0338e33 .gitignore: ignore binary translation files (build artifacts). new 0f4579f src/x2goclient-network.c: do not try to instantiate abstract class, just get a pointer to it. new 46a10aa src/Makefile.am: force "x2goclient" symbol prefix for gobject-introspection. new b9e6c1c src/Makefile.am: make --symbol-prefix scanner flag private to file. new dc7f904 src/x2goclient-network-ssh.c: start implementation x2goclient_network_ssh_parse_sockspec (). The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 1 + src/Makefile.am | 1 + src/x2goclient-network-ssh.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ src/x2goclient-network.c | 2 +- src/x2goclient-network.h | 4 +++ 5 files changed, 69 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit e004c3a1bfb9ad721b5ecb4b6fb7172e53719cb4 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 12:45:33 2019 +0200 src/x2goclient-network.h: fix compile error. Include gio/gio.h since we use it. --- src/x2goclient-network.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h index 910bb66..0e41baf 100644 --- a/src/x2goclient-network.h +++ b/src/x2goclient-network.h @@ -26,6 +26,7 @@ #define x2goclient_network_h #include <glib-object.h> +#include <gio/gio.h> G_BEGIN_DECLS -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 4b82bc95519864379957e083c93d0d0cf51b3bd4 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 12:47:09 2019 +0200 src/x2goclient-network.h: reserve some space for future functions in the X2GoClientNetworkOptions class. --- src/x2goclient-network.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/x2goclient-network.h b/src/x2goclient-network.h index 0e41baf..d05b3dc 100644 --- a/src/x2goclient-network.h +++ b/src/x2goclient-network.h @@ -35,6 +35,9 @@ G_DECLARE_DERIVABLE_TYPE (X2GoClientNetworkOptions, x2goclient_network_options, struct _X2GoClientNetworkOptionsClass { GObjectClass parent_class; + + /* Reserved space for future functions... */ + gpointer padding[100]; }; #define X2GOCLIENT_TYPE_NETWORK (x2goclient_network_get_type ()) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 0338e3310833036880d15886f5f7f206b99e8df7 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 12:48:00 2019 +0200 .gitignore: ignore binary translation files (build artifacts). --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c0f87f1..0e96fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ stamp-h* # gettext stuff. po/stamp-it po/POTFILES +po/*.gmo # GObject introspection stuff. *.gir -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 0f4579fcd84366a28ff1eb6f6dd515441377a0f6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 12:49:04 2019 +0200 src/x2goclient-network.c: do not try to instantiate abstract class, just get a pointer to it. --- src/x2goclient-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x2goclient-network.c b/src/x2goclient-network.c index 5cd1381..27ba691 100644 --- a/src/x2goclient-network.c +++ b/src/x2goclient-network.c @@ -91,7 +91,7 @@ static void x2goclient_network_set_property (GObject *object, guint prop_id, con break; case (X2GO_NET_PROP_OPTIONS): g_free (priv->options); - priv->options = x2goclient_network_options_new (); + priv->options = g_value_get_object (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, param_spec); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit 46a10aa336c950f3bf84f46f317f6187cb97e3d7 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 12:54:53 2019 +0200 src/Makefile.am: force "x2goclient" symbol prefix for gobject-introspection. The X2GoClient namespace would be normally converted into an x2_go_client symbol namespace, which is not exactly what we want. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 233e528..3f883af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,7 +59,7 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = X2GoClient-1.0.gir -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --symbol-prefix="x2goclient" INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit b9e6c1c9cf6c217ecd1393c2ee80ddb062e46576 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 13:38:34 2019 +0200 src/Makefile.am: make --symbol-prefix scanner flag private to file. --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3f883af..dbd76e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,7 +59,7 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = X2GoClient-1.0.gir -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all --symbol-prefix="x2goclient" +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) if HAVE_INTROSPECTION @@ -73,6 +73,7 @@ X2GoClient_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gio-2.0 X2GoClient_1_0_gir_CFLAGS = $(libx2goclient_la_CFLAGS) -I$(srcdir) X2GoClient_1_0_gir_LIBS = libx2goclient.la X2GoClient_1_0_gir_FILES = $(introspection_sources) +X2GoClient_1_0_gir_SCANNERFLAGS = --symbol-prefix="x2goclient" girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository libx2goclient. commit dc7f904de32f418a1297a8b6cbeaeb6eba601d0f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Jul 26 15:01:32 2019 +0200 src/x2goclient-network-ssh.c: start implementation x2goclient_network_ssh_parse_sockspec (). --- src/x2goclient-network-ssh.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/x2goclient-network-ssh.c b/src/x2goclient-network-ssh.c index 133b112..4b95b6d 100644 --- a/src/x2goclient-network-ssh.c +++ b/src/x2goclient-network-ssh.c @@ -22,8 +22,13 @@ Boston, MA 02110-1301, USA. */ +#include <sys/socket.h> +#include <sys/un.h> + #include <glib.h> #include <glib/gi18n.h> +#include <glib/gprintf.h> +#include <gmodule.h> #include <gio/gio.h> #ifdef HAVE_CONFIG_H @@ -52,6 +57,63 @@ struct _X2GoClientNetworkSSH { G_DEFINE_TYPE (X2GoClientNetworkSSH, x2goclient_network_ssh, X2GOCLIENT_TYPE_NETWORK); +static GSocketAddress* x2goclient_network_ssh_parse_sockspec (X2GoClientNetworkSSH *self, const GString *sockspec) { + GSocketAddress *ret = NULL; + + if (sockspec) { + /* + * Check if it's possibly a UNIX socket. + * + * N.B.: do *not* sanitize the string, since UNIX sockets are allowed to + * start and end on whitespace. + */ + gboolean is_abstract = FALSE; + + /* Max. path len without terminating NULL byte */ + if ((sizeof (((struct sockaddr_un*)(NULL))->sun_path) - 1) >= sockspec->len) { + /* Smells like a UNIX socket so far. */ + if (0 == sockspec->str[0]) { + /* + * Abstract UNIX sockets are specified with a preceding NULL byte. + * We can't check for them, since they have no equivalent on the file + * system. + * + * Encountering this means that we have to trust the socket exists. + */ + is_abstract = TRUE; + } + else { + /* Check if such a file exists on the file system. */ + ... /* Parse error is fine here. */ + } + } + + if (!ret) { + /* Must be not a UNIX socket, continue checking for IPv6 addresses. */ + + /* We're free to sanitize the string now. */ + g_strstrip (sockspec->str); + + gboolean is_v6 = FALSE; + gchar *v6_end = NULL; + + /* + * As a very common convention, IPv6 address have to be encapsulated in + * brackets, check for that. + */ + if ('[' == sockspec->str[0]) { + v6_end = g_strstr_len (sockspec->str, -1, "]"); + + if (v6_end) { + is_v6 = TRUE; + } + } + } + } + + return ret; +} + static void x2goclient_network_ssh_class_init (X2GoClientNetworkSSHClass *klass) { } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/libx2goclient.git
-
git-admin＠x2go.org