From 57c41f64ace45b5c1b5df47328bd0324f4cc581a Mon Sep 17 00:00:00 2001
From: lakinduakash <lakinduakash@gmail.com>
Date: Sun, 14 Apr 2019 15:36:40 +0530
Subject: [PATCH] remove redundant functions

---
 src/ui/h_prop.c | 93 ++++++++++++++-----------------------------------
 src/ui/h_prop.h | 23 ++++++------
 2 files changed, 37 insertions(+), 79 deletions(-)

diff --git a/src/ui/h_prop.c b/src/ui/h_prop.c
index 3f4b5ea..8a29762 100644
--- a/src/ui/h_prop.c
+++ b/src/ui/h_prop.c
@@ -15,15 +15,20 @@
 #define SUDO "pkexec --user root"
 #define CREATE_AP "create_ap"
 
+#define MKCONFIG "--mkconfig"
+#define LOAD_CONFIG "--config"
 
-char cmd[BUFSIZE];
+
+char cmd_start[BUFSIZE];
+char cmd_mkconfig[BUFSIZE];
+char cmd_config[BUFSIZE];
 
 const char* g_ssid=NULL;
 const char* g_pass=NULL;
 
 config_t cfg;
 
-static int parse_output(char *cmd) {
+static int parse_output(const char *cmd) {
 
     char buf[BUFSIZE];
     FILE *fp;
@@ -47,22 +52,35 @@ static int parse_output(char *cmd) {
 }
 
 
-char *build_command(char *iface_src, char *iface_dest, char *ssid, char *pass) {
+const char *build_wh_start_command(char *iface_src, char *iface_dest, char *ssid, char *pass) {
 
-    snprintf(cmd, BUFSIZE, "%s %s %s %s %s %s", SUDO, CREATE_AP, iface_src, iface_dest, ssid, pass);
+    snprintf(cmd_start, BUFSIZE, "%s %s %s %s %s %s", SUDO, CREATE_AP, iface_src, iface_dest, ssid, pass);
 
-
-    return cmd;
+    return cmd_start;
 }
 
+const char *build_wh_mkconfig_command(char *iface_src, char *iface_dest, char *ssid, char *pass){
 
-int startShell(char *cmd) {
+    snprintf(cmd_mkconfig, BUFSIZE, "%s %s %s %s %s %s %s", CREATE_AP, iface_src, iface_dest, ssid, pass,MKCONFIG,CONFIG_FILE);
+    printf("%s \n",cmd_mkconfig);
+    return cmd_mkconfig;
+
+}
+
+const char *build_wh_from_config(){
+
+    snprintf(cmd_config, BUFSIZE, "%s %s %s %s", SUDO, CREATE_AP,LOAD_CONFIG,CONFIG_FILE);
+    return cmd_config;
+
+}
+
+int startShell(const char *cmd) {
     parse_output(cmd);
     return 0;
 }
 
 
-int create_config(char* file){
+int write_config(char* file){
 
     config_t cfg;
     config_setting_t *root, *setting, *group, *array;
@@ -95,62 +113,3 @@ int create_config(char* file){
     return(EXIT_SUCCESS);
 }
 
-
-int init_read_wh_config(){
-
-
-    config_init(&cfg);
-
-    if (!config_read_file(&cfg, CONFIG_FILE)) {
-        fprintf(stderr, "%s:%d - %s\n",
-                config_error_file(&cfg),
-                config_error_line(&cfg),
-                config_error_text(&cfg));
-        config_destroy(&cfg);
-        return(EXIT_FAILURE);
-    }
-
-
-    if (config_lookup_string(&cfg, SSID, &g_ssid))
-        printf("SSID: %s", g_ssid);
-    else
-        printf("SSID is not defined\n");
-
-    if (config_lookup_string(&cfg, PASSPHRASE, &g_pass))
-        printf("PASS: %s", g_pass);
-    else
-        printf("PASS is not defined\n");
-
-
-
-
-
-    //config_destroy(cfg);
-    return 0;
-
-
-}
-
-
-
-void set_ssid(const char* ssid){
-
-    g_ssid=ssid;
-}
-
-const char* get_ssid(){
-
-    return g_ssid;
-}
-
-
-void set_pass(const char* pass){
-
-    g_pass=pass;
-}
-
-
-const char* get_pass(){
-
-    return g_pass;
-}
diff --git a/src/ui/h_prop.h b/src/ui/h_prop.h
index 4ede8d6..782cd4f 100644
--- a/src/ui/h_prop.h
+++ b/src/ui/h_prop.h
@@ -35,23 +35,22 @@
 #define PASSPHRASE       "PASSPHRASE"
 #define USE_PSK          "USE_PSK"
 
-#define CONFIG_FILE "wh.config"
+#define CONFIG_FILE "/home/lakinduakash/wh.config"
 
-static int parse_output(char *);
+typedef struct{
+    char *ssid;
+    char *pass;
+} ConfigValues;
 
-char *build_command(char *, char *, char *, char *);
+static int parse_output(const char *);
 
-int startShell(char *);
+const char *build_wh_start_command(char *, char *, char *, char *);
+const char *build_wh_mkconfig_command(char *, char *, char *, char *);
+const char *build_wh_from_config(void);
 
-int create_config(char *);
+int startShell(const char *);
 
-int init_read_wh_config(void);
+int write_config(char *);
 
 
-void set_ssid(const char* ssid);
-const char* get_ssid(void);
-
-void set_pass(const char* pass);
-const char* get_pass(void);
-
 #endif //WIHOTSPOT_H_PROP_H