GUACAMOLE-351: Separate guac_config structure into own header file, independent of how that config is loaded.

This commit is contained in:
Michael Jumper 2018-02-07 13:33:52 -08:00
parent 05f54d098c
commit f4f5b4e65a
8 changed files with 80 additions and 48 deletions

View File

@ -26,6 +26,7 @@ man_MANS = \
man/guacd.conf.5
noinst_HEADERS = \
conf.h \
conf-args.h \
conf-file.h \
conf-parse.h \

View File

@ -19,8 +19,8 @@
#include "config.h"
#include "conf.h"
#include "conf-args.h"
#include "conf-file.h"
#include "conf-parse.h"
#include <getopt.h>

View File

@ -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

View File

@ -19,6 +19,7 @@
#include "config.h"
#include "conf.h"
#include "conf-file.h"
#include "conf-parse.h"

View File

@ -22,51 +22,7 @@
#include "config.h"
#include <guacamole/client.h>
/**
* 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.

View File

@ -19,6 +19,7 @@
#include "config.h"
#include "conf.h"
#include "conf-parse.h"
#include <guacamole/client.h>

72
src/guacd/conf.h Normal file
View File

@ -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 <guacamole/client.h>
/**
* 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

View File

@ -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"