Completely remove glib as dependency

5 files changed, 6 insertions, 63 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f33c744..3451816 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,9 @@ FIND_PACKAGE(PkgConfig REQUIRED)
 #FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(ZLIB REQUIRED)
 
-PKG_CHECK_MODULES(GLIB glib-2.0 REQUIRED)
+#PKG_CHECK_MODULES(GLIB glib-2.0 REQUIRED)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${GLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${ZLIB_INCLUDE_DIR})
 
 
 
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${GLIB_INCLUDE_DIRS}
 
 FILE(GLOB_RECURSE CLIENT_SRCS src/client/*.c)
 ADD_EXECUTABLE(dnbd3-client ${CLIENT_SRCS})
-TARGET_LINK_LIBRARIES(dnbd3-client ${GLIB_LDFLAGS})
+TARGET_LINK_LIBRARIES(dnbd3-client)
 
 
 
diff --git a/src/client/client.c b/src/client/client.c
index bd28d51..80c6403 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -25,7 +25,6 @@
 #include <getopt.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
-#include <glib.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <string.h>
@@ -33,14 +32,12 @@
 #include "../types.h"
 #include "../version.h"
 
-char *_config_file_name = DEFAULT_CLIENT_CONFIG_FILE;
-
 void dnbd3_print_help(char *argv_0)
 {
 	printf("\nUsage: %s\n"
 	       "\t-h <host> -i <image name> [-r <rid>] -d <device> [-a <KB>] || -f <file> || -c <device>\n\n", argv_0);
 	printf("Start the DNBD3 client.\n");
-	printf("-f or --file \t\t Configuration file (default /etc/dnbd3-client.conf)\n");
+	//printf("-f or --file \t\t Configuration file (default /etc/dnbd3-client.conf)\n");
 	printf("-h or --host \t\t Host running dnbd3-server.\n");
 	printf("-i or --image \t\t Image name of exported image.\n");
 	printf("-r or --rid \t\t Release-ID of exported image (default 0, latest).\n");
@@ -197,7 +194,6 @@ int main(int argc, char *argv[])
 		switch (opt)
 		{
 		case 'f':
-			_config_file_name = strdup(optarg);
 			break;
 		case 'h':
 			dnbd3_get_ip(optarg, &msg.host);
@@ -289,53 +285,6 @@ int main(int argc, char *argv[])
 		exit(EXIT_SUCCESS);
 	}
 
-	// use configuration file if existent
-	GKeyFile *gkf;
-	int i = 0;
-	size_t j = 0;
-
-	gkf = g_key_file_new();
-
-	if (g_key_file_load_from_file(gkf, _config_file_name, G_KEY_FILE_NONE, NULL))
-	{
-		gchar **groups = NULL;
-		groups = g_key_file_get_groups(gkf, &j);
-
-		for (i = 0; i < j; i++)
-		{
-			dnbd3_get_ip(g_key_file_get_string(gkf, groups[i], "server", NULL), &msg.host);
-			msg.imgname = g_key_file_get_string(gkf, groups[i], "name", NULL);
-			msg.rid = g_key_file_get_integer(gkf, groups[i], "rid", NULL);
-			dev = g_key_file_get_string(gkf, groups[i], "device", NULL);
-
-			msg.read_ahead_kb = g_key_file_get_integer(gkf, groups[i], "ahead", NULL);
-			if (!msg.read_ahead_kb)
-				msg.read_ahead_kb = DEFAULT_READ_AHEAD_KB;
-
-			fd = open(dev, O_WRONLY);
-			printf("INFO: Connecting %s to %s (%s rid:%i)\n", dev, "<fixme>", msg.imgname, msg.rid);
-
-			const int ret = ioctl(fd, IOCTL_OPEN, &msg);
-			if (ret < 0)
-			{
-				printf("ERROR: ioctl not successful (config file, %s (%d))\n", strerror(-ret), ret);
-				exit(EXIT_FAILURE);
-			}
-
-			close(fd);
-		}
-
-		g_strfreev(groups);
-		g_key_file_free(gkf);
-		exit(EXIT_SUCCESS);
-	}
-	else
-	{
-		printf("ERROR: Config file not found: %s\n", _config_file_name);
-	}
-
-	g_key_file_free(gkf);
-
 	dnbd3_print_help(argv[0]);
 	exit(EXIT_FAILURE);
 }
diff --git a/src/config.h b/src/config.h
index a59f7bc..0e3e786 100644
--- a/src/config.h
+++ b/src/config.h
@@ -74,8 +74,4 @@
 #define NUMBER_DEVICES 8
 #define DEFAULT_READ_AHEAD_KB 512
 
-// +++++ Misc +++++
-#define DEFAULT_SERVER_CONFIG_FILE "/etc/dnbd3/server.conf"
-#define DEFAULT_CLIENT_CONFIG_FILE "/etc/dnbd3/client.conf"
-
 #endif /* CONFIG_H_ */
diff --git a/src/server/server.c b/src/server/server.c
index 6e49eb0..56e5123 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -50,7 +50,6 @@ dnbd3_client_t *_clients[SERVER_MAX_CLIENTS];
 int _num_clients = 0;
 pthread_spinlock_t _clients_lock;
 
-char *_config_file_name = DEFAULT_SERVER_CONFIG_FILE;
 char *_rpc_password = NULL;
 char *_cache_dir = NULL;
 
@@ -67,7 +66,7 @@ void dnbd3_print_help(char *argv_0)
 {
 	printf( "Usage: %s [OPTIONS]...\n", argv_0 );
 	printf( "Start the DNBD3 server\n" );
-	printf( "-f or --file        Configuration file (default /etc/dnbd3-server.conf)\n" );
+	//printf( "-f or --file        Configuration file (default /etc/dnbd3-server.conf)\n" );
 #ifdef _DEBUG
 	printf( "-d or --delay       Add a fake network delay of X µs\n" );
 #endif
@@ -153,7 +152,6 @@ int main(int argc, char *argv[])
 	while ( opt != -1 ) {
 		switch ( opt ) {
 		case 'f':
-			_config_file_name = strdup( optarg );
 			break;
 		case 'd':
 #ifdef _DEBUG
diff --git a/src/server/server.h b/src/server/server.h
index ced760d..ba35bf7 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -34,7 +34,7 @@ extern dnbd3_client_t *_clients[SERVER_MAX_CLIENTS];
 extern int _num_clients;
 extern pthread_spinlock_t _clients_lock;
 
-extern char *_config_file_name, *_rpc_password, *_cache_dir;
+extern char *_rpc_password, *_cache_dir;
 
 #ifdef _DEBUG
 extern int _fake_delay;