mka: Pass full structures down to macsec drivers' packet number ops

Clean up the driver interface by passing pointers to structs transmit_sa
and receive_sa down the stack to get_receive_lowest_pn(),
get_transmit_next_pn(), and set_transmit_next_pn() ops, instead of
passing the individual arguments.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 073219ee198c5a89f9ddb836fb979271d9301489..2c7ce6c8af678c989410d5f40313e00e39b0ba0c 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -3336,35 +3336,26 @@ struct wpa_driver_ops {
        /**
         * get_receive_lowest_pn - Get receive lowest pn
         * @priv: Private driver interface data
-        * @channel: secure channel
-        * @an: association number
-        * @lowest_pn: lowest accept pn
+        * @sa: secure association
         * Returns: 0 on success, -1 on failure (or if not supported)
         */
-       int (*get_receive_lowest_pn)(void *priv, u32 channel, u8 an,
-                                    u32 *lowest_pn);
+       int (*get_receive_lowest_pn)(void *priv, struct receive_sa *sa);
 
        /**
         * get_transmit_next_pn - Get transmit next pn
         * @priv: Private driver interface data
-        * @channel: secure channel
-        * @an: association number
-        * @next_pn: next pn
+        * @sa: secure association
         * Returns: 0 on success, -1 on failure (or if not supported)
         */
-       int (*get_transmit_next_pn)(void *priv, u32 channel, u8 an,
-                                   u32 *next_pn);
+       int (*get_transmit_next_pn)(void *priv, struct transmit_sa *sa);
 
        /**
         * set_transmit_next_pn - Set transmit next pn
         * @priv: Private driver interface data
-        * @channel: secure channel
-        * @an: association number
-        * @next_pn: next pn
+        * @sa: secure association
         * Returns: 0 on success, -1 on failure (or if not supported)
         */
-       int (*set_transmit_next_pn)(void *priv, u32 channel, u8 an,
-                                   u32 next_pn);
+       int (*set_transmit_next_pn)(void *priv, struct transmit_sa *sa);
 
        /**
         * get_available_receive_sc - get available receive channel

diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c
index 826d3cc621335a6d0595eb28a826c5d78758f857..95f1e27f843e54313542856f47d1e6d1ed86fb83 100644 (file)
--- a/src/drivers/driver_macsec_qca.c
+++ b/src/drivers/driver_macsec_qca.c
@@ -29,6 +29,7 @@
 #include "utils/eloop.h"
 #include "common/defs.h"
 #include "common/ieee802_1x_defs.h"
+#include "pae/ieee802_1x_kay.h"
 #include "driver.h"
 
 #include "nss_macsec_secy.h"
@@ -515,16 +516,16 @@ static int macsec_qca_enable_controlled_port(void *priv, Boolean enabled)
 }
 
 
-static int macsec_qca_get_receive_lowest_pn(void *priv, u32 channel, u8 an,
-                                           u32 *lowest_pn)
+static int macsec_qca_get_receive_lowest_pn(void *priv, struct receive_sa *sa)
 {
        struct macsec_qca_data *drv = priv;
        int ret = 0;
        u32 next_pn = 0;
        bool enabled = FALSE;
        u32 win;
+       u32 channel = sa->sc->channel;
 
-       ret += nss_macsec_secy_rx_sa_next_pn_get(drv->secy_id, channel, an,
+       ret += nss_macsec_secy_rx_sa_next_pn_get(drv->secy_id, channel, sa->an,
                                                 &next_pn);
        ret += nss_macsec_secy_rx_sc_replay_protect_get(drv->secy_id, channel,
                                                        &enabled);
@@ -532,40 +533,42 @@ static int macsec_qca_get_receive_lowest_pn(void *priv, u32 channel, u8 an,
                                                            channel, &win);
 
        if (enabled)
-               *lowest_pn = (next_pn > win) ? (next_pn - win) : 1;
+               sa->lowest_pn = (next_pn > win) ? (next_pn - win) : 1;
        else
-               *lowest_pn = next_pn;
+               sa->lowest_pn = next_pn;
 
-       wpa_printf(MSG_DEBUG, "%s: lpn=0x%x", __func__, *lowest_pn);
+       wpa_printf(MSG_DEBUG, "%s: lpn=0x%x", __func__, sa->lowest_pn);
 
        return ret;
 }
 
 
-static int macsec_qca_get_transmit_next_pn(void *priv, u32 channel, u8 an,
-                                          u32 *next_pn)
+static int macsec_qca_get_transmit_next_pn(void *priv, struct transmit_sa *sa)
 {
        struct macsec_qca_data *drv = priv;
        int ret = 0;
+       u32 channel = sa->sc->channel;
 
-       ret += nss_macsec_secy_tx_sa_next_pn_get(drv->secy_id, channel, an,
-                                                next_pn);
+       ret += nss_macsec_secy_tx_sa_next_pn_get(drv->secy_id, channel, sa->an,
+                                                &sa->next_pn);
 
-       wpa_printf(MSG_DEBUG, "%s: npn=0x%x", __func__, *next_pn);
+       wpa_printf(MSG_DEBUG, "%s: npn=0x%x", __func__, sa->next_pn);
 
        return ret;
 }
 
 
-int macsec_qca_set_transmit_next_pn(void *priv, u32 channel, u8 an, u32 next_pn)
+int macsec_qca_set_transmit_next_pn(void *priv, struct transmit_sa *sa)
 {
        struct macsec_qca_data *drv = priv;
        int ret = 0;
+       u32 channel = sa->sc->channel;
 
-       ret += nss_macsec_secy_tx_sa_next_pn_set(drv->secy_id, channel, an,
-                                                next_pn);
 
-       wpa_printf(MSG_INFO, "%s: npn=0x%x", __func__, next_pn);
+       ret += nss_macsec_secy_tx_sa_next_pn_set(drv->secy_id, channel, sa->an,
+                                                sa->next_pn);
+
+       wpa_printf(MSG_INFO, "%s: npn=0x%x", __func__, sa->next_pn);
 
        return ret;
 }

diff --git a/src/pae/ieee802_1x_kay.h b/src/pae/ieee802_1x_kay.h
index 0361e1ac49a7304267dd9575f5e55adf722aa280..a747b11c7186508bd4f5d64ad6560e10a0fd3c66 100644 (file)
--- a/src/pae/ieee802_1x_kay.h
+++ b/src/pae/ieee802_1x_kay.h
@@ -142,11 +142,9 @@ struct ieee802_1x_kay_ctx {
        int (*set_replay_protect)(void *ctx, Boolean enabled, u32 window);
        int (*set_current_cipher_suite)(void *ctx, u64 cs);
        int (*enable_controlled_port)(void *ctx, Boolean enabled);
-       int (*get_receive_lowest_pn)(void *ctx, u32 channel, u8 an,
-                                    u32 *lowest_pn);
-       int (*get_transmit_next_pn)(void *ctx, u32 channel, u8 an,
-                                   u32 *next_pn);
-       int (*set_transmit_next_pn)(void *ctx, u32 channel, u8 an, u32 next_pn);
+       int (*get_receive_lowest_pn)(void *ctx, struct receive_sa *sa);
+       int (*get_transmit_next_pn)(void *ctx, struct transmit_sa *sa);
+       int (*set_transmit_next_pn)(void *ctx, struct transmit_sa *sa);
        int (*get_available_receive_sc)(void *ctx, u32 *channel);
        int (*create_receive_sc)(void *ctx, u32 channel,
                                 struct ieee802_1x_mka_sci *sci,

diff --git a/src/pae/ieee802_1x_secy_ops.c b/src/pae/ieee802_1x_secy_ops.c
index 2d12911dbfcfdcc29d706d6096a0b21fd3590e48..d05e00f6f2cf97d1a558e60acc882264c8d75a31 100644 (file)
--- a/src/pae/ieee802_1x_secy_ops.c
+++ b/src/pae/ieee802_1x_secy_ops.c
@@ -130,10 +130,7 @@ int secy_get_receive_lowest_pn(struct ieee802_1x_kay *kay,
                return -1;
        }
 
-       return ops->get_receive_lowest_pn(ops->ctx,
-                                       rxsa->sc->channel,
-                                       rxsa->an,
-                                       &rxsa->lowest_pn);
+       return ops->get_receive_lowest_pn(ops->ctx, rxsa);
 }
 
 
@@ -154,10 +151,7 @@ int secy_get_transmit_next_pn(struct ieee802_1x_kay *kay,
                return -1;
        }
 
-       return ops->get_transmit_next_pn(ops->ctx,
-                                       txsa->sc->channel,
-                                       txsa->an,
-                                       &txsa->next_pn);
+       return ops->get_transmit_next_pn(ops->ctx, txsa);
 }
 
 
@@ -178,10 +172,7 @@ int secy_set_transmit_next_pn(struct ieee802_1x_kay *kay,
                return -1;
        }
 
-       return ops->set_transmit_next_pn(ops->ctx,
-                                       txsa->sc->channel,
-                                       txsa->an,
-                                       txsa->next_pn);
+       return ops->set_transmit_next_pn(ops->ctx, txsa);
 }
 
 

diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index 220b7ba3ddca6e9762b98dd6bd8dc66283106f0d..639bb83513c2a67d1a7e7e2180984000b53c4c34 100644 (file)
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -749,33 +749,27 @@ static inline int wpa_drv_enable_controlled_port(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_get_receive_lowest_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 *lowest_pn)
+                                               struct receive_sa *sa)
 {
        if (!wpa_s->driver->get_receive_lowest_pn)
                return -1;
-       return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, channel,
-                                                   an, lowest_pn);
+       return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_get_transmit_next_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 *next_pn)
+                                               struct transmit_sa *sa)
 {
        if (!wpa_s->driver->get_transmit_next_pn)
                return -1;
-       return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, channel,
-                                                   an, next_pn);
+       return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_set_transmit_next_pn(struct wpa_supplicant *wpa_s,
-                                               u32 channel, u8 an,
-                                               u32 next_pn)
+                                               struct transmit_sa *sa)
 {
        if (!wpa_s->driver->set_transmit_next_pn)
                return -1;
-       return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, channel,
-                                                   an, next_pn);
+       return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, sa);
 }
 
 static inline int wpa_drv_get_available_receive_sc(struct wpa_supplicant *wpa_s,

diff --git a/wpa_supplicant/wpas_kay.c b/wpa_supplicant/wpas_kay.c
index d6ec8c5090e9ad0af00cac15d6714ea5d66f5a1d..306d9f1897974241f2b3e7f69303e1a742f0b711 100644 (file)
--- a/wpa_supplicant/wpas_kay.c
+++ b/wpa_supplicant/wpas_kay.c
@@ -62,24 +62,21 @@ static int wpas_enable_controlled_port(void *wpa_s, Boolean enabled)
 }
 
 
-static int wpas_get_receive_lowest_pn(void *wpa_s, u32 channel,
-                                     u8 an, u32 *lowest_pn)
+static int wpas_get_receive_lowest_pn(void *wpa_s, struct receive_sa *sa)
 {
-       return wpa_drv_get_receive_lowest_pn(wpa_s, channel, an, lowest_pn);
+       return wpa_drv_get_receive_lowest_pn(wpa_s, sa);
 }
 
 
-static int wpas_get_transmit_next_pn(void *wpa_s, u32 channel,
-                                     u8 an, u32 *next_pn)
+static int wpas_get_transmit_next_pn(void *wpa_s, struct transmit_sa *sa)
 {
-       return wpa_drv_get_transmit_next_pn(wpa_s, channel, an, next_pn);
+       return wpa_drv_get_transmit_next_pn(wpa_s, sa);
 }
 
 
-static int wpas_set_transmit_next_pn(void *wpa_s, u32 channel,
-                                     u8 an, u32 next_pn)
+static int wpas_set_transmit_next_pn(void *wpa_s, struct transmit_sa *sa)
 {
-       return wpa_drv_set_transmit_next_pn(wpa_s, channel, an, next_pn);
+       return wpa_drv_set_transmit_next_pn(wpa_s, sa);
 }