mirror of
https://github.com/lakinduakash/linux-wifi-hotspot.git
synced 2024-11-24 21:20:12 +00:00
fix return config file location
This commit is contained in:
parent
e73ad03eb2
commit
0e25719af2
@ -7,6 +7,7 @@
|
||||
#include <libconfig.h>
|
||||
|
||||
#include "h_prop.h"
|
||||
#include "read_config.h"
|
||||
|
||||
|
||||
#define BUFSIZE 1024
|
||||
@ -61,7 +62,9 @@ const char *build_wh_start_command(char *iface_src, char *iface_dest, char *ssid
|
||||
|
||||
const char *build_wh_mkconfig_command(char *iface_src, char *iface_dest, char *ssid, char *pass){
|
||||
|
||||
snprintf(cmd_mkconfig, BUFSIZE, "%s %s %s %s %s %s %s", CREATE_AP, iface_src, iface_dest, ssid, pass,MKCONFIG,CONFIG_FILE);
|
||||
const char* a=get_config_file(CONFIG_FILE_NAME);
|
||||
|
||||
snprintf(cmd_mkconfig, BUFSIZE, "%s %s %s %s %s %s %s", CREATE_AP, iface_src, iface_dest, ssid, pass,MKCONFIG,a);
|
||||
printf("%s \n",cmd_mkconfig);
|
||||
return cmd_mkconfig;
|
||||
|
||||
@ -69,7 +72,7 @@ const char *build_wh_mkconfig_command(char *iface_src, char *iface_dest, char *s
|
||||
|
||||
const char *build_wh_from_config(){
|
||||
|
||||
snprintf(cmd_config, BUFSIZE, "%s %s %s %s", SUDO, CREATE_AP,LOAD_CONFIG,CONFIG_FILE);
|
||||
snprintf(cmd_config, BUFSIZE, "%s %s %s %s", SUDO, CREATE_AP,LOAD_CONFIG,get_config_file(CONFIG_FILE_NAME));
|
||||
return cmd_config;
|
||||
|
||||
}
|
||||
@ -99,7 +102,7 @@ int write_config(char* file){
|
||||
config_setting_set_string(setting, "123456789");
|
||||
|
||||
/* Write out the new configuration. */
|
||||
if(! config_write_file(&cfg, CONFIG_FILE))
|
||||
if(! config_write_file(&cfg, get_config_file(CONFIG_FILE_NAME)))
|
||||
{
|
||||
fprintf(stderr, "Error while writing file.\n");
|
||||
config_destroy(&cfg);
|
||||
@ -107,7 +110,7 @@ int write_config(char* file){
|
||||
}
|
||||
|
||||
fprintf(stderr, "New configuration successfully written to: %s\n",
|
||||
CONFIG_FILE);
|
||||
get_config_file(CONFIG_FILE_NAME));
|
||||
|
||||
config_destroy(&cfg);
|
||||
return(EXIT_SUCCESS);
|
||||
|
@ -35,7 +35,9 @@
|
||||
#define PASSPHRASE "PASSPHRASE"
|
||||
#define USE_PSK "USE_PSK"
|
||||
|
||||
#define CONFIG_FILE "/home/lakinduakash/wh.config"
|
||||
|
||||
|
||||
#define CONFIG_FILE_NAME ".wh.config"
|
||||
|
||||
typedef struct{
|
||||
char *ssid;
|
||||
|
15
src/ui/ui.c
15
src/ui/ui.c
@ -91,12 +91,15 @@ int initUi(int argc, char *argv[]){
|
||||
|
||||
void init_ui_from_config(WIData* data){
|
||||
|
||||
read_config_file();
|
||||
ConfigValues *values=getConfigValues();
|
||||
if(read_config_file()==READ_CONFIG_FILE_SUCCESS){
|
||||
|
||||
ConfigValues *values=getConfigValues();
|
||||
|
||||
|
||||
if(values->ssid!=NULL)
|
||||
gtk_entry_set_text(data->ssid,values->ssid);
|
||||
if(values->pass!=NULL)
|
||||
gtk_entry_set_text(data->pass,values->pass);
|
||||
if(values->ssid!=NULL)
|
||||
gtk_entry_set_text(data->ssid,values->ssid);
|
||||
if(values->pass!=NULL)
|
||||
gtk_entry_set_text(data->pass,values->pass);
|
||||
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user