DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Print Acct-Session-Id and Acct-Multi-Session-Id 64-bit values

Browse source 
These are now 64-bit variables and the printf formats and type casts
need to be updated to match.

Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
This commit is contained in:
Nick Lowe 2016-02-13 20:29:47 +00:00 • committed by Jouni Malinen
parent e21cecaf54
commit 1492fbb90c
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ap/accounting.c
View file

@ -220,8 +220,8 @@ void accounting_sta_start(struct hostapd_data *hapd, struct sta_info *sta)
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS, hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS,
HOSTAPD_LEVEL_INFO, HOSTAPD_LEVEL_INFO,
"starting accounting session %016lX", "starting accounting session %016llX",
(long unsigned int) sta->acct_session_id); (unsigned long long) sta->acct_session_id);
os_get_reltime(&sta->acct_session_start); os_get_reltime(&sta->acct_session_start);
sta->last_rx_bytes = sta->last_tx_bytes = 0; sta->last_rx_bytes = sta->last_tx_bytes = 0;
@ -370,8 +370,8 @@ void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta)
eloop_cancel_timeout(accounting_interim_update, hapd, sta); eloop_cancel_timeout(accounting_interim_update, hapd, sta);
hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS, hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS,
HOSTAPD_LEVEL_INFO, HOSTAPD_LEVEL_INFO,
"stopped accounting session %016lX", "stopped accounting session %016llX",
(long unsigned int) sta->acct_session_id); (unsigned long long) sta->acct_session_id);
sta->acct_session_started = 0; sta->acct_session_started = 0;
} }
} }
@ -430,8 +430,8 @@ static void accounting_report_state(struct hostapd_data *hapd, int on)
if (hapd->acct_session_id) { if (hapd->acct_session_id) {
char buf[20]; char buf[20];
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) hapd->acct_session_id); (unsigned long long) hapd->acct_session_id);
if (!radius_msg_add_attr(msg, RADIUS_ATTR_ACCT_SESSION_ID, if (!radius_msg_add_attr(msg, RADIUS_ATTR_ACCT_SESSION_ID,
(u8 *) buf, os_strlen(buf))) (u8 *) buf, os_strlen(buf)))
wpa_printf(MSG_ERROR, "Could not add Acct-Session-Id"); wpa_printf(MSG_ERROR, "Could not add Acct-Session-Id");

8
src/ap/hostapd.c
View file

@ -683,8 +683,8 @@ static struct sta_info * hostapd_das_find_sta(struct hostapd_data *hapd,
for (sta = hapd->sta_list; sta; sta = sta->next) { for (sta = hapd->sta_list; sta; sta = sta->next) {
if (!sta->radius_das_match) if (!sta->radius_das_match)
continue; continue;
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) sta->acct_session_id); (unsigned long long) sta->acct_session_id);
if (os_memcmp(attr->acct_session_id, buf, 16) != 0) if (os_memcmp(attr->acct_session_id, buf, 16) != 0)
sta->radius_das_match = 0; sta->radius_das_match = 0;
else else
@ -716,8 +716,8 @@ static struct sta_info * hostapd_das_find_sta(struct hostapd_data *hapd,
sta->radius_das_match = 0; sta->radius_das_match = 0;
continue; continue;
} }
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) (unsigned long long)
sta->eapol_sm->acct_multi_session_id); sta->eapol_sm->acct_multi_session_id);
if (os_memcmp(attr->acct_multi_session_id, buf, 16) != if (os_memcmp(attr->acct_multi_session_id, buf, 16) !=
0) 0)

16
src/ap/ieee802_1x.c
View file

@ -439,8 +439,8 @@ static int add_common_radius_sta_attr(struct hostapd_data *hapd,
} }
if (sta->acct_session_id) { if (sta->acct_session_id) {
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) sta->acct_session_id); (unsigned long long) sta->acct_session_id);
if (!radius_msg_add_attr(msg, RADIUS_ATTR_ACCT_SESSION_ID, if (!radius_msg_add_attr(msg, RADIUS_ATTR_ACCT_SESSION_ID,
(u8 *) buf, os_strlen(buf))) { (u8 *) buf, os_strlen(buf))) {
wpa_printf(MSG_ERROR, "Could not add Acct-Session-Id"); wpa_printf(MSG_ERROR, "Could not add Acct-Session-Id");
@ -451,8 +451,8 @@ static int add_common_radius_sta_attr(struct hostapd_data *hapd,
if ((hapd->conf->wpa & 2) && if ((hapd->conf->wpa & 2) &&
!hapd->conf->disable_pmksa_caching && !hapd->conf->disable_pmksa_caching &&
sta->eapol_sm && sta->eapol_sm->acct_multi_session_id) { sta->eapol_sm && sta->eapol_sm->acct_multi_session_id) {
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) (unsigned long long)
sta->eapol_sm->acct_multi_session_id); sta->eapol_sm->acct_multi_session_id);
if (!radius_msg_add_attr( if (!radius_msg_add_attr(
msg, RADIUS_ATTR_ACCT_MULTI_SESSION_ID, msg, RADIUS_ATTR_ACCT_MULTI_SESSION_ID,
@ -2533,12 +2533,12 @@ int ieee802_1x_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
/* TODO: dot1xAuthSessionOctetsTx */ /* TODO: dot1xAuthSessionOctetsTx */
/* TODO: dot1xAuthSessionFramesRx */ /* TODO: dot1xAuthSessionFramesRx */
/* TODO: dot1xAuthSessionFramesTx */ /* TODO: dot1xAuthSessionFramesTx */
"dot1xAuthSessionId=%016lX\n" "dot1xAuthSessionId=%016llX\n"
"dot1xAuthSessionAuthenticMethod=%d\n" "dot1xAuthSessionAuthenticMethod=%d\n"
"dot1xAuthSessionTime=%u\n" "dot1xAuthSessionTime=%u\n"
"dot1xAuthSessionTerminateCause=999\n" "dot1xAuthSessionTerminateCause=999\n"
"dot1xAuthSessionUserName=%s\n", "dot1xAuthSessionUserName=%s\n",
(long unsigned int) sta->acct_session_id, (unsigned long long) sta->acct_session_id,
(wpa_key_mgmt_wpa_ieee8021x( (wpa_key_mgmt_wpa_ieee8021x(
wpa_auth_sta_key_mgmt(sta->wpa_sm))) ? wpa_auth_sta_key_mgmt(sta->wpa_sm))) ?
1 : 2, 1 : 2,
@ -2550,8 +2550,8 @@ int ieee802_1x_get_mib_sta(struct hostapd_data *hapd, struct sta_info *sta,
if (sm->acct_multi_session_id) { if (sm->acct_multi_session_id) {
ret = os_snprintf(buf + len, buflen - len, ret = os_snprintf(buf + len, buflen - len,
"authMultiSessionId=%016lX\n", "authMultiSessionId=%016llX\n",
(long unsigned int) (unsigned long long)
sm->acct_multi_session_id); sm->acct_multi_session_id);
if (os_snprintf_error(buflen - len, ret)) if (os_snprintf_error(buflen - len, ret))
return len; return len;

4
src/ap/pmksa_cache_auth.c
View file

@ -492,8 +492,8 @@ static int das_attr_match(struct rsn_pmksa_cache_entry *entry,
if (attr->acct_multi_session_id_len != 16) if (attr->acct_multi_session_id_len != 16)
return 0; return 0;
os_snprintf(buf, sizeof(buf), "%016lX", os_snprintf(buf, sizeof(buf), "%016llX",
(long unsigned int) entry->acct_multi_session_id); (unsigned long long) entry->acct_multi_session_id);
if (os_memcmp(attr->acct_multi_session_id, buf, 16) != 0) if (os_memcmp(attr->acct_multi_session_id, buf, 16) != 0)
return 0; return 0;
match++; match++;