GUAC-847: Add placeholder for file parsing.

This commit is contained in:
Michael Jumper 2014-09-08 10:26:49 -07:00
parent 4f578a160f
commit 8c78f105cc
3 changed files with 86 additions and 0 deletions

View File

@ -30,6 +30,7 @@ man_MANS = man/guacd.8
noinst_HEADERS = \
client.h \
client-map.h \
conf-file.h \
conf-parse.h \
log.h
@ -37,6 +38,7 @@ guacd_SOURCES = \
daemon.c \
client.c \
client-map.c \
conf-file.c \
conf-parse.c \
log.c

36
src/guacd/conf-file.c Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (C) 2014 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "config.h"
#include "conf-file.h"
#include "conf-parse.h"
int guacd_conf_parse_file(guacd_config* conf, int fd) {
/* Load defaults */
conf->bind_port = 4822;
/* STUB */
return 0;
}

48
src/guacd/conf-file.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2014 Glyptodon LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef _GUACD_CONF_FILE_H
#define _GUACD_CONF_FILE_H
#include "config.h"
/**
* The contents of a guacd configuration file.
*/
typedef struct guacd_config {
/**
* The port to bind on.
*/
int bind_port;
} guacd_config;
/**
* Reads the given file descriptor, parsing its contents into the guacd_config.
* On success, zero is returned. If parsing fails, non-zero is returned, and an
* error message is printed to stderr.
*/
int guacd_conf_parse_file(guacd_config* conf, int fd);
#endif