You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/09/26 12:44:36 UTC
[15/19] guacamole-server git commit: GUACAMOLE-623: libwebsockets
requires an integer port number.
GUACAMOLE-623: libwebsockets requires an integer port number.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/5bae422b
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/5bae422b
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/5bae422b
Branch: refs/heads/master
Commit: 5bae422b29939c2e08aff13b33bdb8c2b9ab2ed9
Parents: b8bd0e4
Author: Michael Jumper <mj...@apache.org>
Authored: Sun Sep 9 21:49:58 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Sep 25 21:30:51 2018 -0700
----------------------------------------------------------------------
src/protocols/kubernetes/settings.c | 3 +--
src/protocols/kubernetes/settings.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/5bae422b/src/protocols/kubernetes/settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/settings.c b/src/protocols/kubernetes/settings.c
index 1f04b40..5ee6671 100644
--- a/src/protocols/kubernetes/settings.c
+++ b/src/protocols/kubernetes/settings.c
@@ -278,7 +278,7 @@ guac_kubernetes_settings* guac_kubernetes_parse_args(guac_user* user,
/* Read port */
settings->port =
- guac_user_parse_args_string(user, GUAC_KUBERNETES_CLIENT_ARGS, argv,
+ guac_user_parse_args_int(user, GUAC_KUBERNETES_CLIENT_ARGS, argv,
IDX_PORT, GUAC_KUBERNETES_DEFAULT_PORT);
/* Read typescript path */
@@ -340,7 +340,6 @@ void guac_kubernetes_settings_free(guac_kubernetes_settings* settings) {
/* Free network connection information */
free(settings->hostname);
- free(settings->port);
/* Free SSL/TLS details */
free(settings->client_cert_file);
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/5bae422b/src/protocols/kubernetes/settings.h
----------------------------------------------------------------------
diff --git a/src/protocols/kubernetes/settings.h b/src/protocols/kubernetes/settings.h
index 3e89ce5..fea6cf1 100644
--- a/src/protocols/kubernetes/settings.h
+++ b/src/protocols/kubernetes/settings.h
@@ -42,7 +42,7 @@
* The port to connect to when initiating any Kubernetes connection, if no
* other port is specified.
*/
-#define GUAC_KUBERNETES_DEFAULT_PORT "8443"
+#define GUAC_KUBERNETES_DEFAULT_PORT 8443
/**
* The filename to use for the typescript, if not specified.
@@ -74,7 +74,7 @@ typedef struct guac_kubernetes_settings {
/**
* The port of the Kubernetes server to connect to.
*/
- char* port;
+ int port;
/**
* Whether SSL/TLS should be used.