From f4f5b4e65a7b26995cd260742dc9965b9c054c43 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 7 Feb 2018 13:33:52 -0800 Subject: [PATCH 1/2] GUACAMOLE-351: Separate guac_config structure into own header file, independent of how that config is loaded. --- src/guacd/Makefile.am | 1 + src/guacd/conf-args.c | 2 +- src/guacd/conf-args.h | 2 +- src/guacd/conf-file.c | 1 + src/guacd/conf-file.h | 46 +-------------------------- src/guacd/conf-parse.c | 1 + src/guacd/conf.h | 72 ++++++++++++++++++++++++++++++++++++++++++ src/guacd/daemon.c | 3 +- 8 files changed, 80 insertions(+), 48 deletions(-) create mode 100644 src/guacd/conf.h diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am index 8edcd252..fb8e8ebd 100644 --- a/src/guacd/Makefile.am +++ b/src/guacd/Makefile.am @@ -26,6 +26,7 @@ man_MANS = \ man/guacd.conf.5 noinst_HEADERS = \ + conf.h \ conf-args.h \ conf-file.h \ conf-parse.h \ diff --git a/src/guacd/conf-args.c b/src/guacd/conf-args.c index 448f84d6..1e92e864 100644 --- a/src/guacd/conf-args.c +++ b/src/guacd/conf-args.c @@ -19,8 +19,8 @@ #include "config.h" +#include "conf.h" #include "conf-args.h" -#include "conf-file.h" #include "conf-parse.h" #include diff --git a/src/guacd/conf-args.h b/src/guacd/conf-args.h index 8fa2c3ba..2fb86b4c 100644 --- a/src/guacd/conf-args.h +++ b/src/guacd/conf-args.h @@ -22,7 +22,7 @@ #include "config.h" -#include "conf-file.h" +#include "conf.h" /** * Parses the given arguments into the given configuration. Zero is returned on diff --git a/src/guacd/conf-file.c b/src/guacd/conf-file.c index 21044b61..b99a8528 100644 --- a/src/guacd/conf-file.c +++ b/src/guacd/conf-file.c @@ -19,6 +19,7 @@ #include "config.h" +#include "conf.h" #include "conf-file.h" #include "conf-parse.h" diff --git a/src/guacd/conf-file.h b/src/guacd/conf-file.h index 9042cc80..c38d859d 100644 --- a/src/guacd/conf-file.h +++ b/src/guacd/conf-file.h @@ -22,51 +22,7 @@ #include "config.h" -#include - -/** - * The contents of a guacd configuration file. - */ -typedef struct guacd_config { - - /** - * The host to bind on. - */ - char* bind_host; - - /** - * The port to bind on. - */ - char* bind_port; - - /** - * The file to write the PID in, if any. - */ - char* pidfile; - - /** - * Whether guacd should run in the foreground. - */ - int foreground; - -#ifdef ENABLE_SSL - /** - * SSL certificate file. - */ - char* cert_file; - - /** - * SSL private key file. - */ - char* key_file; -#endif - - /** - * The maximum log level to be logged by guacd. - */ - guac_client_log_level max_log_level; - -} guacd_config; +#include "conf.h" /** * Reads the given file descriptor, parsing its contents into the guacd_config. diff --git a/src/guacd/conf-parse.c b/src/guacd/conf-parse.c index e5a034f2..8381aba4 100644 --- a/src/guacd/conf-parse.c +++ b/src/guacd/conf-parse.c @@ -19,6 +19,7 @@ #include "config.h" +#include "conf.h" #include "conf-parse.h" #include diff --git a/src/guacd/conf.h b/src/guacd/conf.h new file mode 100644 index 00000000..3ecccb40 --- /dev/null +++ b/src/guacd/conf.h @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#ifndef GUACD_CONF_H +#define GUACD_CONF_H + +#include "config.h" + +#include + +/** + * The contents of a guacd configuration file. + */ +typedef struct guacd_config { + + /** + * The host to bind on. + */ + char* bind_host; + + /** + * The port to bind on. + */ + char* bind_port; + + /** + * The file to write the PID in, if any. + */ + char* pidfile; + + /** + * Whether guacd should run in the foreground. + */ + int foreground; + +#ifdef ENABLE_SSL + /** + * SSL certificate file. + */ + char* cert_file; + + /** + * SSL private key file. + */ + char* key_file; +#endif + + /** + * The maximum log level to be logged by guacd. + */ + guac_client_log_level max_log_level; + +} guacd_config; + +#endif + diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c index 2e80ef38..af7b29dd 100644 --- a/src/guacd/daemon.c +++ b/src/guacd/daemon.c @@ -19,9 +19,10 @@ #include "config.h" -#include "connection.h" +#include "conf.h" #include "conf-args.h" #include "conf-file.h" +#include "connection.h" #include "log.h" #include "proc-map.h" From 3b327378eba90f744ec9d9ac2b93dde10dcbfdf3 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 7 Feb 2018 13:41:22 -0800 Subject: [PATCH 2/2] GUACAMOLE-351: Add "-v" option which causes guacd to print its version information and exit. --- src/guacd/conf-args.c | 10 ++++++++-- src/guacd/conf-file.c | 1 + src/guacd/conf.h | 5 +++++ src/guacd/daemon.c | 7 +++++++ src/guacd/man/guacd.8.in | 6 ++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/guacd/conf-args.c b/src/guacd/conf-args.c index 1e92e864..239eb3ae 100644 --- a/src/guacd/conf-args.c +++ b/src/guacd/conf-args.c @@ -32,7 +32,7 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) { /* Parse arguments */ int opt; - while ((opt = getopt(argc, argv, "l:b:p:L:C:K:f")) != -1) { + while ((opt = getopt(argc, argv, "l:b:p:L:C:K:fv")) != -1) { /* -l: Bind port */ if (opt == 'l') { @@ -51,6 +51,11 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) { config->foreground = 1; } + /* -v: Print version and exit */ + else if (opt == 'v') { + config->print_version = 1; + } + /* -p: PID file */ else if (opt == 'p') { free(config->pidfile); @@ -105,7 +110,8 @@ int guacd_conf_parse_args(guacd_config* config, int argc, char** argv) { " [-C CERTIFICATE_FILE]" " [-K PEM_FILE]" #endif - " [-f]\n", argv[0]); + " [-f]" + " [-v]\n", argv[0]); return 1; } diff --git a/src/guacd/conf-file.c b/src/guacd/conf-file.c index b99a8528..460ec95e 100644 --- a/src/guacd/conf-file.c +++ b/src/guacd/conf-file.c @@ -180,6 +180,7 @@ guacd_config* guacd_conf_load() { conf->bind_port = strdup("4822"); conf->pidfile = NULL; conf->foreground = 0; + conf->print_version = 0; conf->max_log_level = GUAC_LOG_INFO; #ifdef ENABLE_SSL diff --git a/src/guacd/conf.h b/src/guacd/conf.h index 3ecccb40..f444cee5 100644 --- a/src/guacd/conf.h +++ b/src/guacd/conf.h @@ -49,6 +49,11 @@ typedef struct guacd_config { */ int foreground; + /** + * Whether guacd should simply print its version information and exit. + */ + int print_version; + #ifdef ENABLE_SSL /** * SSL certificate file. diff --git a/src/guacd/daemon.c b/src/guacd/daemon.c index af7b29dd..054821a8 100644 --- a/src/guacd/daemon.c +++ b/src/guacd/daemon.c @@ -280,6 +280,13 @@ int main(int argc, char* argv[]) { if (config == NULL || guacd_conf_parse_args(config, argc, argv)) exit(EXIT_FAILURE); + /* If requested, simply print version and exit, without initializing the + * logging system, etc. */ + if (config->print_version) { + printf("Guacamole proxy daemon (guacd) version " VERSION "\n"); + exit(EXIT_SUCCESS); + } + /* Init logging as early as possible */ guacd_log_level = config->max_log_level; openlog(GUACD_LOG_NAME, LOG_PID, LOG_DAEMON); diff --git a/src/guacd/man/guacd.8.in b/src/guacd/man/guacd.8.in index c5ed918f..65fc9d59 100644 --- a/src/guacd/man/guacd.8.in +++ b/src/guacd/man/guacd.8.in @@ -30,6 +30,7 @@ guacd \- Guacamole proxy daemon [\fB-C\fR \fICERTIFICATE FILE\fR] [\fB-K\fR \fIKEY FILE\fR] [\fB-f\fR] +[\fB-v\fR] . .SH DESCRIPTION .B guacd @@ -80,6 +81,11 @@ Causes .B guacd to run in the foreground, rather than automatically forking into the background. +.TP +\fB\-v\fR +Causes +.B guacd +to simply print its version information and exit. . .SH SSL/TLS OPTIONS If libssl was present at the time