jeltz
/
hostap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move acct_interim_interval away from RADIUS client configuration 

This is not used at all inside RADIUS client and as such, it belongs
into hostapd configuration.
This commit is contained in:
Jouni Malinen 2009-11-28 23:03:20 +02:00
parent df1e24aceb
commit 5843e1c9a6
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hostapd/config.c
View File

@ -1757,7 +1757,7 @@ struct hostapd_config * hostapd_config_read(const char *fname)
bss->radius->retry_primary_interval = atoi(pos); bss->radius->retry_primary_interval = atoi(pos);
} else if (os_strcmp(buf, "radius_acct_interim_interval") == 0) } else if (os_strcmp(buf, "radius_acct_interim_interval") == 0)
{ {
bss->radius->acct_interim_interval = atoi(pos); bss->acct_interim_interval = atoi(pos);
#endif /* CONFIG_NO_RADIUS */ #endif /* CONFIG_NO_RADIUS */
} else if (os_strcmp(buf, "auth_algs") == 0) { } else if (os_strcmp(buf, "auth_algs") == 0) {
bss->auth_algs = atoi(pos); bss->auth_algs = atoi(pos);

1
hostapd/config.h
View File

@ -167,6 +167,7 @@ struct hostapd_bss_config {
struct hostapd_ip_addr own_ip_addr; struct hostapd_ip_addr own_ip_addr;
char *nas_identifier; char *nas_identifier;
struct hostapd_radius_servers *radius; struct hostapd_radius_servers *radius;
int acct_interim_interval;
struct hostapd_ssid ssid; struct hostapd_ssid ssid;

3
hostapd/ieee802_11.c
View File

@ -601,8 +601,7 @@ static void handle_auth(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
sta->flags &= ~WLAN_STA_PREAUTH; sta->flags &= ~WLAN_STA_PREAUTH;
ieee802_1x_notify_pre_auth(sta->eapol_sm, 0); ieee802_1x_notify_pre_auth(sta->eapol_sm, 0);
if (hapd->conf->radius->acct_interim_interval == 0 && if (hapd->conf->acct_interim_interval == 0 && acct_interim_interval)
acct_interim_interval)
sta->acct_interim_interval = acct_interim_interval; sta->acct_interim_interval = acct_interim_interval;
if (res == HOSTAPD_ACL_ACCEPT_TIMEOUT) if (res == HOSTAPD_ACL_ACCEPT_TIMEOUT)
ap_sta_session_timeout(hapd, sta, session_timeout); ap_sta_session_timeout(hapd, sta, session_timeout);

2
hostapd/ieee802_1x.c
View File

@ -1256,7 +1256,7 @@ ieee802_1x_receive_auth(struct radius_msg *msg, struct radius_msg *req,
&termination_action)) &termination_action))
termination_action = RADIUS_TERMINATION_ACTION_DEFAULT; termination_action = RADIUS_TERMINATION_ACTION_DEFAULT;
if (hapd->conf->radius->acct_interim_interval == 0 && if (hapd->conf->acct_interim_interval == 0 &&
msg->hdr->code == RADIUS_CODE_ACCESS_ACCEPT && msg->hdr->code == RADIUS_CODE_ACCESS_ACCEPT &&
radius_msg_get_attr_int32(msg, RADIUS_ATTR_ACCT_INTERIM_INTERVAL, radius_msg_get_attr_int32(msg, RADIUS_ATTR_ACCT_INTERIM_INTERVAL,
&acct_interim_interval) == 0) { &acct_interim_interval) == 0) {

2
hostapd/sta_info.c
View File

@ -435,7 +435,7 @@ struct sta_info * ap_sta_add(struct hostapd_data *hapd, const u8 *addr)
wpa_printf(MSG_ERROR, "malloc failed"); wpa_printf(MSG_ERROR, "malloc failed");
return NULL; return NULL;
} }
sta->acct_interim_interval = hapd->conf->radius->acct_interim_interval; sta->acct_interim_interval = hapd->conf->acct_interim_interval;
/* initialize STA info data */ /* initialize STA info data */
eloop_register_timeout(hapd->conf->ap_max_inactivity, 0, eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,

7
src/radius/radius_client.h
View File

@ -166,13 +166,6 @@ struct hostapd_radius_servers {
*/ */
int retry_primary_interval; int retry_primary_interval;
/**
* acct_interim_interval - Interim accounting update interval
*
* This parameter is not used inside RADIUS client code.
*/
int acct_interim_interval;
/** /**
* msg_dumps - Whether RADIUS message details are shown in stdout * msg_dumps - Whether RADIUS message details are shown in stdout
*/ */