[PATCH] Send an Acct-Multi-Session-Id attribute in Access-Request packets.

[Nick Lowe]

Version without broken whitespace attached.

Send an Acct-Multi-Session-Id attribute in Access-Request packets.

Signed-off-by: Nick Lowe <nick.lowe at lugatech.com>
---
 src/ap/accounting.c | 14 --------------
 src/ap/ieee802_1x.c | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 7636cfc..163b715 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -52,20 +52,6 @@ static struct radius_msg * accounting_msg(struct
hostapd_data *hapd,

     if (sta) {
         radius_msg_make_authenticator(msg, (u8 *) sta, sizeof(*sta));
-
-        if ((hapd->conf->wpa & 2) &&
-            !hapd->conf->disable_pmksa_caching &&
-            sta->eapol_sm && sta->eapol_sm->acct_multi_session_id) {
-            os_snprintf(buf, sizeof(buf), "%016lX",
-                    sta->eapol_sm->acct_multi_session_id);
-            if (!radius_msg_add_attr(
-                    msg, RADIUS_ATTR_ACCT_MULTI_SESSION_ID,
-                    (u8 *) buf, os_strlen(buf))) {
-                wpa_printf(MSG_INFO,
-                       "Could not add Acct-Multi-Session-Id");
-                goto fail;
-            }
-        }
     } else {
         radius_msg_make_authenticator(msg, (u8 *) hapd, sizeof(*hapd));
     }
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index 5f95a65..6ac4379 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -448,6 +448,20 @@ static int add_common_radius_sta_attr(struct
hostapd_data *hapd,
         }
     }

+    if ((hapd->conf->wpa & 2) &&
+        !hapd->conf->disable_pmksa_caching &&
+        sta->eapol_sm && sta->eapol_sm->acct_multi_session_id) {
+        os_snprintf(buf, sizeof(buf), "%016lX",
+                sta->eapol_sm->acct_multi_session_id);
+        if (!radius_msg_add_attr(
+                msg, RADIUS_ATTR_ACCT_MULTI_SESSION_ID,
+                (u8 *) buf, os_strlen(buf))) {
+            wpa_printf(MSG_INFO,
+                   "Could not add Acct-Multi-Session-Id");
+            return -1;
+        }
+    }
+
 #ifdef CONFIG_IEEE80211R
     if (hapd->conf->wpa && wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt) &&
         sta->wpa_sm &&
-- 
2.5.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-Send-an-Acct-Multi-Session-Id-attribute-in-Access-Re.patch
Type: text/x-patch
Size: 2077 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/hostap/attachments/20160125/253c5ab9/attachment.bin>