7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rework MAC type handling so that split, local and both MAC's are possible

Browse Source
This commit is contained in:
Andreas Schultz
2016-08-17 14:09:31 +02:00
parent 0df59ddaad
commit 627ecd5a9e
3 changed files with 97 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/wtp/wtp.c
View File

@ -804,6 +804,20 @@ static int wtp_parsing_cfg_descriptor_info(config_t *config)
return 1;
}
static int wtp_parsing_mac_type(const char *str, int *type)
{
if (!strcmp(str, "localmac")) {
*type |= 0x01;
} else if (!strcmp(str, "splitmac")) {
*type |= 0x02;
} else {
log_printf(LOG_ERR, "Invalid configuration file, unknown application.mactype value");
return 0;
}
return 1;
}
/* Parsing configuration */
static int wtp_parsing_configuration_1_0(config_t* config) {
int i;
@ -946,13 +960,42 @@ static int wtp_parsing_configuration_1_0(config_t* config) {
}
/* Set mactype of WTP */
if (config_lookup_string(config, "application.mactype", &configString) == CONFIG_TRUE) {
if (!strcmp(configString, "localmac")) {
configSetting = config_lookup(config, "application.mactype");
if (configSetting != NULL) {
int type = 0;
switch (config_setting_type(configSetting)) {
case CONFIG_TYPE_ARRAY: {
int count = config_setting_length(configSetting);
for (i = 0; i < count; i++)
if (!wtp_parsing_mac_type(config_setting_get_string_elem(configSetting, i), &type))
return 0;
break;
}
case CONFIG_TYPE_STRING:
if (!wtp_parsing_mac_type(config_setting_get_string(configSetting), &type))
return 0;
break;
default:
log_printf(LOG_ERR, "Invalid configuration file, invalid application.mactype type");
return 0;
}
switch (type) {
case 0x01:
g_wtp.mactype.type = CAPWAP_LOCALMAC;
} else if (!strcmp(configString, "splitmac")) {
break;
case 0x02:
g_wtp.mactype.type = CAPWAP_SPLITMAC;
} else {
log_printf(LOG_ERR, "Invalid configuration file, unknown application.mactype value");
break;
case 0x03:
g_wtp.mactype.type = CAPWAP_LOCALANDSPLITMAC;
break;
default:
log_printf(LOG_ERR, "Invalid configuration file, invalid application.mactype value");
return 0;
}
}