From: Jouni Malinen <j@w1.fi>
Date: Sat, 18 Oct 2014 07:35:33 +0000 (+0300)
Subject: Remove duplicated Acct-Session-Id from Accounting-Request
X-Git-Tag: hostap_2_4~1316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff039fada2f10b0956312a53e1484b73314daa2;p=thirdparty%2Fhostap.git

Remove duplicated Acct-Session-Id from Accounting-Request

Commit 8b2486115479582b2ab164a4508f22ed23a9a4cb ('Add Acct-Session-Id
into Access-Request messages') added Acct-Session-Id building into the
helper function shared between authentication and accounting messages.
However, it forgot to remove the same code from the generation of
accounting messages and as such, ended up with Accounting-Request
messages containing two copies of this attribute. Fix this by removing
the addition of this attribute from the accounting specific function.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 6290d3f39..1fb1e92af 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -49,14 +49,6 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
 
 	if (sta) {
 		radius_msg_make_authenticator(msg, (u8 *) sta, sizeof(*sta));
-
-		os_snprintf(buf, sizeof(buf), "%08X-%08X",
-			    sta->acct_session_id_hi, sta->acct_session_id_lo);
-		if (!radius_msg_add_attr(msg, RADIUS_ATTR_ACCT_SESSION_ID,
-					 (u8 *) buf, os_strlen(buf))) {
-			wpa_printf(MSG_INFO, "Could not add Acct-Session-Id");
-			goto fail;
-		}
 	} else {
 		radius_msg_make_authenticator(msg, (u8 *) hapd, sizeof(*hapd));
 	}