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

Remove radio channel from wtp configuration

Browse Source
This commit is contained in:
vemax78 2013-10-14 18:09:09 +02:00
parent e0800c672f
commit 5da4cd4a03
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/wtp.conf
View File

@ -98,12 +98,10 @@ application: {
selection = [ "internal" ]; selection = [ "internal" ];
}; };
dsss = { dsss = {
channel = 1;
clearchannelassessment = 0; clearchannelassessment = 0;
energydetectthreshold = 0; energydetectthreshold = 0;
}; };
ofdm = { ofdm = {
channel = 1;
bandsupported = 0; bandsupported = 0;
tithreshold = 100; tithreshold = 100;
}; };

26
src/wtp/wtp.c
View File

@ -314,16 +314,7 @@ static int wtp_parsing_radio_configuration(config_setting_t* configElement, stru
configSection = config_setting_get_member(configElement, "dsss"); configSection = config_setting_get_member(configElement, "dsss");
if (configSection) { if (configSection) {
radio->directsequencecontrol.radioid = radio->radioid; radio->directsequencecontrol.radioid = radio->radioid;
radio->directsequencecontrol.currentchannel = 0;
if (config_setting_lookup_int(configSection, "channel", &configInt) == CONFIG_TRUE) {
if ((configInt > 0) && (configInt < 256)) {
radio->directsequencecontrol.currentchannel = (uint8_t)configInt;
} else {
return 0;
}
} else {
return 0;
}
if (config_setting_lookup_int(configSection, "clearchannelassessment", &configInt) == CONFIG_TRUE) { if (config_setting_lookup_int(configSection, "clearchannelassessment", &configInt) == CONFIG_TRUE) {
if ((configInt & CAPWAP_DSCONTROL_CCA_MASK) == configInt) { if ((configInt & CAPWAP_DSCONTROL_CCA_MASK) == configInt) {
@ -346,16 +337,7 @@ static int wtp_parsing_radio_configuration(config_setting_t* configElement, stru
configSection = config_setting_get_member(configElement, "ofdm"); configSection = config_setting_get_member(configElement, "ofdm");
if (configSection) { if (configSection) {
radio->ofdmcontrol.radioid = radio->radioid; radio->ofdmcontrol.radioid = radio->radioid;
radio->ofdmcontrol.currentchannel = 0;
if (config_setting_lookup_int(configSection, "channel", &configInt) == CONFIG_TRUE) {
if ((configInt > 0) && (configInt < 256)) {
radio->ofdmcontrol.currentchannel = (uint8_t)configInt;
} else {
return 0;
}
} else {
return 0;
}
if (config_setting_lookup_int(configSection, "bandsupported", &configInt) == CONFIG_TRUE) { if (config_setting_lookup_int(configSection, "bandsupported", &configInt) == CONFIG_TRUE) {
if ((configInt & CAPWAP_OFDMCONTROL_BAND_MASK) == configInt) { if ((configInt & CAPWAP_OFDMCONTROL_BAND_MASK) == configInt) {
@ -828,6 +810,7 @@ static int wtp_parsing_configuration_1_0(config_t* config) {
/* Set Radio WTP */ /* Set Radio WTP */
configSetting = config_lookup(config, "application.radio"); configSetting = config_lookup(config, "application.radio");
if (configSetting != NULL) { if (configSetting != NULL) {
struct wifi_capability* capability;
int count = config_setting_length(configSetting); int count = config_setting_length(configSetting);
if (g_wtp.binding == CAPWAP_WIRELESS_BINDING_IEEE80211) { if (g_wtp.binding == CAPWAP_WIRELESS_BINDING_IEEE80211) {
@ -861,12 +844,9 @@ static int wtp_parsing_configuration_1_0(config_t* config) {
capwap_logging_info("Register radioid %d with radio device: %s - %s", radio->radioid, radio->device, configString); capwap_logging_info("Register radioid %d with radio device: %s - %s", radio->radioid, radio->device, configString);
/* Update radio capability with device query */ /* Update radio capability with device query */
/* TODO
struct wifi_capability* capability = NULL;
capability = wifi_get_capability_device(radio->radioid); capability = wifi_get_capability_device(radio->radioid);
if (capability) { if (capability) {
} }
*/
} else { } else {
radio->status = WTP_RADIO_HWFAILURE; radio->status = WTP_RADIO_HWFAILURE;
capwap_logging_warning("Unable to register radio device: %s - %s", radio->device, configString); capwap_logging_warning("Unable to register radio device: %s - %s", radio->device, configString);