X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=c420a7f3a6f8914b215f4079b43e4e3ff7e550cb;hb=deab1cfe393edb3d04caf94340cb5c58aa2626ea;hp=d67acede310ea76508526958845534f70152c89c;hpb=bff1b59055aaba5927b1e2fc0c53f72d0b43a2df;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index d67aced..c420a7f 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -71,6 +71,8 @@
 #include "kill_interpreter_dialog.h"
 #include "connect_dialog.h"
 
+#include "vlp/config.h"
+
 /* File resides in top directory (where are Makefiles)*/
 #include "../../config.h"
 
@@ -196,93 +198,19 @@ void QKernel::loadConfig(const QString & fname)
  */
 void QKernel::loadConfig(const char * fname)
 {
-	config_t cfg;
-	config_setting_t *setting;
-
-	/* Hack for checking if file exists without using external libs.*/
-
-	FILE * file = fopen(fname, "rt");
-	if (!file) {
-		fprintf(stderr, "Error: Cannot load configuration file: %s!\n", 
-									fname);
-		exit(3);
-	}
-	/* File exists, so file has been locked. Release it. */
-
-	config_init(&cfg);
-
-	/* Read the file. If there is an error, report it and exit. */
-	if (!config_read(&cfg, file)) {
-		fprintf(stderr, "%s! In file %s, line %d\n", 
-			config_error_text(&cfg), 
-			config_error_file(&cfg), 
-			config_error_line(&cfg));
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
+	loglan::vlp::Config config;
+	if(config.load(fname)) {
+		NodeNumber = config.getNodeNumber();
+		ConType = config.getConnectionType();
 
-	setting = config_lookup(&cfg, "node_number");
-	if (setting) {
-		NodeNumber = config_setting_get_int(setting);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-					"Warning", fname, "node_number");
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
 
-	setting = config_lookup(&cfg, "type");
-	if (setting) {
-		/* same as strcmp(..) == 0 */
-		if (!strcmp(config_setting_get_string(setting), "explicit")) {
-			ConType = 1;
-		} else {
-			ConType = 2;
+		std::vector<std::string> hosts = config.getHosts();
+		for (int i = 0; i < hosts.size(); i++) {
+			ConnectList.append(new ConnectEntry(hosts[i].c_str()));
 		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "type");
-	}
 
-	setting = config_lookup(&cfg, "host");
-	if (setting) {
-		switch(config_setting_type(setting)) {
-		/* TODO: Deprecated. Made for back compatibility. */
-		case CONFIG_TYPE_STRING:
-			ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string(setting)));
-			break;
-		case CONFIG_TYPE_ARRAY: {
-			int size = config_setting_length(setting);
-			for (int i = 0; i < size; i++) {
-				ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string_elem(setting,
-									i)));
-			}
-			break;
-		}
-		default:
-			fprintf(stderr, "%s! In file %s, bad entry type for %s."
-							" Will not be read.\n", 
-							"Error", fname, "host");
-		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "host");
+		strncpy(progdir, config.getProgramDir(), 256);
 	}
-
-	setting = config_lookup(&cfg, "progdir");
-	if (setting){
-		strncpy(progdir, config_setting_get_string(setting), 256);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "progdir");
-	}
-
-	config_destroy(&cfg);
-	fclose(file);
 }
 
 /**