uci: fix loading of config

This commit is contained in:
Polynomialdivision 2020-05-30 19:26:55 +02:00
parent b5043ad98e
commit 71536468ff
6 changed files with 38 additions and 23 deletions

View file

@ -82,15 +82,16 @@ struct time_config_s {
time_t update_beacon_reports;
};
#define MAX_IP_LENGTH 46
#define MAX_KEY_LENGTH 65
struct network_config_s {
const char *broadcast_ip;
char broadcast_ip[MAX_IP_LENGTH];
int broadcast_port;
int tcp_port;
int network_option;
const char *multicast;
const char *shared_key;
const char *iv;
int bool_multicast;
char shared_key[MAX_KEY_LENGTH];
char iv[MAX_KEY_LENGTH];
int use_symm_enc;
int collision_domain;
int bandwidth;
@ -280,7 +281,8 @@ void send_beacon_reports(uint8_t bssid[], int id);
#define SORT_NUM 5
// ---------------- Global variables ----------------
char *sort_string;
#define SORT_LENGTH 5
char sort_string[SORT_LENGTH];
// ---------------- Functions -------------------
int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], char* neighbor_report, int automatic_kick);

View file

@ -35,13 +35,13 @@ struct network_config_s uci_get_dawn_network();
* Function that returns the hostapd directory reading from the config file.
* @return the hostapd directory.
*/
const char *uci_get_dawn_hostapd_dir();
bool uci_get_dawn_hostapd_dir();
/**
* Function that returns the sort order.
* @return the sort order.
*/
const char *uci_get_dawn_sort_order();
bool uci_get_dawn_sort_order();
int uci_set_network(char* uci_cmd);

View file

@ -17,7 +17,8 @@
#define UNSPECIFIED_REASON 0
#define NO_MORE_STAS 5
const char *hostapd_dir_glob;
#define HOSTAPD_DIR_LEN 200
char hostapd_dir_glob[HOSTAPD_DIR_LEN];
/**
* Init ubus.