Accumulative patch from commit dc013f1e37df3462085cf01a13f0c432f146ad7a

[android-x86/external-wpa_supplicant_8.git] / src / ap / accounting.c

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 2c3a6d9..9540531 100644 (file)
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -26,8 +26,8 @@
  * input/output octets and updates Acct-{Input,Output}-Gigawords. */
 #define ACCT_DEFAULT_UPDATE_INTERVAL 300
 
-static void accounting_sta_get_id(struct hostapd_data *hapd,
-                                 struct sta_info *sta);
+static void accounting_sta_interim(struct hostapd_data *hapd,
+                                  struct sta_info *sta);
 
 
 static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
@@ -40,7 +40,6 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
        size_t len;
        int i;
        struct wpabuf *b;
-       struct hostapd_radius_attr *attr;
 
        msg = radius_msg_new(RADIUS_CODE_ACCOUNTING_REQUEST,
                             radius_client_get_id(hapd->radius));
@@ -80,7 +79,17 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
        }
 
        if (sta) {
+               /* Use 802.1X identity if available */
                val = ieee802_1x_get_identity(sta->eapol_sm, &len);
+
+               /* Use RADIUS ACL identity if 802.1X provides no identity */
+               if (!val && sta->identity) {
+                       val = (u8 *) sta->identity;
+                       len = os_strlen(sta->identity);
+               }
+
+               /* Use STA MAC if neither 802.1X nor RADIUS ACL provided
+                * identity */
                if (!val) {
                        os_snprintf(buf, sizeof(buf), RADIUS_ADDR_FORMAT,
                                    MAC2STR(sta->addr));
@@ -95,86 +104,11 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
                }
        }
 
-       if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                                           RADIUS_ATTR_NAS_IP_ADDRESS) &&
-           hapd->conf->own_ip_addr.af == AF_INET &&
-           !radius_msg_add_attr(msg, RADIUS_ATTR_NAS_IP_ADDRESS,
-                                (u8 *) &hapd->conf->own_ip_addr.u.v4, 4)) {
-               printf("Could not add NAS-IP-Address\n");
-               goto fail;
-       }
-
-#ifdef CONFIG_IPV6
-       if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                                           RADIUS_ATTR_NAS_IPV6_ADDRESS) &&
-           hapd->conf->own_ip_addr.af == AF_INET6 &&
-           !radius_msg_add_attr(msg, RADIUS_ATTR_NAS_IPV6_ADDRESS,
-                                (u8 *) &hapd->conf->own_ip_addr.u.v6, 16)) {
-               printf("Could not add NAS-IPv6-Address\n");
+       if (add_common_radius_attr(hapd, hapd->conf->radius_acct_req_attr, sta,
+                                  msg) < 0)
                goto fail;
-       }
-#endif /* CONFIG_IPV6 */
-
-       if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                                           RADIUS_ATTR_NAS_IDENTIFIER) &&
-           hapd->conf->nas_identifier &&
-           !radius_msg_add_attr(msg, RADIUS_ATTR_NAS_IDENTIFIER,
-                                (u8 *) hapd->conf->nas_identifier,
-                                os_strlen(hapd->conf->nas_identifier))) {
-               printf("Could not add NAS-Identifier\n");
-               goto fail;
-       }
-
-       if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                                           RADIUS_ATTR_NAS_PORT) &&
-           sta &&
-           !radius_msg_add_attr_int32(msg, RADIUS_ATTR_NAS_PORT, sta->aid)) {
-               printf("Could not add NAS-Port\n");
-               goto fail;
-       }
-
-       os_snprintf(buf, sizeof(buf), RADIUS_802_1X_ADDR_FORMAT ":%s",
-                   MAC2STR(hapd->own_addr), hapd->conf->ssid.ssid);
-       if (!hostapd_config_get_radius_attr(hapd->conf->radius_acct_req_attr,
-                                           RADIUS_ATTR_CALLED_STATION_ID) &&
-           !radius_msg_add_attr(msg, RADIUS_ATTR_CALLED_STATION_ID,
-                                (u8 *) buf, os_strlen(buf))) {
-               printf("Could not add Called-Station-Id\n");
-               goto fail;
-       }
 
        if (sta) {
-               os_snprintf(buf, sizeof(buf), RADIUS_802_1X_ADDR_FORMAT,
-                           MAC2STR(sta->addr));
-               if (!radius_msg_add_attr(msg, RADIUS_ATTR_CALLING_STATION_ID,
-                                        (u8 *) buf, os_strlen(buf))) {
-                       printf("Could not add Calling-Station-Id\n");
-                       goto fail;
-               }
-
-               if (!hostapd_config_get_radius_attr(
-                           hapd->conf->radius_acct_req_attr,
-                           RADIUS_ATTR_NAS_PORT_TYPE) &&
-                   !radius_msg_add_attr_int32(
-                           msg, RADIUS_ATTR_NAS_PORT_TYPE,
-                           RADIUS_NAS_PORT_TYPE_IEEE_802_11)) {
-                       printf("Could not add NAS-Port-Type\n");
-                       goto fail;
-               }
-
-               os_snprintf(buf, sizeof(buf), "CONNECT %d%sMbps %s",
-                           radius_sta_rate(hapd, sta) / 2,
-                           (radius_sta_rate(hapd, sta) & 1) ? ".5" : "",
-                           radius_mode_txt(hapd));
-               if (!hostapd_config_get_radius_attr(
-                           hapd->conf->radius_acct_req_attr,
-                           RADIUS_ATTR_CONNECT_INFO) &&
-                   !radius_msg_add_attr(msg, RADIUS_ATTR_CONNECT_INFO,
-                                        (u8 *) buf, os_strlen(buf))) {
-                       printf("Could not add Connect-Info\n");
-                       goto fail;
-               }
-
                for (i = 0; ; i++) {
                        val = ieee802_1x_get_radius_class(sta->eapol_sm, &len,
                                                          i);
@@ -196,15 +130,13 @@ static struct radius_msg * accounting_msg(struct hostapd_data *hapd,
                        wpa_printf(MSG_ERROR, "Could not add CUI");
                        goto fail;
                }
-       }
 
-       for (attr = hapd->conf->radius_acct_req_attr; attr; attr = attr->next)
-       {
-               if (!radius_msg_add_attr(msg, attr->type,
-                                        wpabuf_head(attr->val),
-                                        wpabuf_len(attr->val))) {
-                       wpa_printf(MSG_ERROR, "Could not add RADIUS "
-                                  "attribute");
+               if (!b && sta->radius_cui &&
+                   !radius_msg_add_attr(msg,
+                                        RADIUS_ATTR_CHARGEABLE_USER_IDENTITY,
+                                        (u8 *) sta->radius_cui,
+                                        os_strlen(sta->radius_cui))) {
+                       wpa_printf(MSG_ERROR, "Could not add CUI from ACL");
                        goto fail;
                }
        }
@@ -276,7 +208,6 @@ void accounting_sta_start(struct hostapd_data *hapd, struct sta_info *sta)
        if (sta->acct_session_started)
                return;
 
-       accounting_sta_get_id(hapd, sta);
        hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_RADIUS,
                       HOSTAPD_LEVEL_INFO,
                       "starting accounting session %08X-%08X",
@@ -415,7 +346,8 @@ static void accounting_sta_report(struct hostapd_data *hapd,
  * @hapd: hostapd BSS data
  * @sta: The station
  */
-void accounting_sta_interim(struct hostapd_data *hapd, struct sta_info *sta)
+static void accounting_sta_interim(struct hostapd_data *hapd,
+                                  struct sta_info *sta)
 {
        if (sta->acct_session_started)
                accounting_sta_report(hapd, sta, 0);
@@ -442,7 +374,7 @@ void accounting_sta_stop(struct hostapd_data *hapd, struct sta_info *sta)
 }
 
 
-static void accounting_sta_get_id(struct hostapd_data *hapd,
+void accounting_sta_get_id(struct hostapd_data *hapd,
                                  struct sta_info *sta)
 {
        sta->acct_session_id_lo = hapd->acct_session_id_lo++;