libipsec: Remove unused reqid parameter from ipsec_sa_mgr_t.get_spi()

diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
index 24640a07dfdb4a35ebea5a5eb7dda6196b7c6214..84b3b600dd5d0638977d9d7933d3f1a401380a09 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
+++ b/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
@@ -50,7 +50,7 @@ METHOD(kernel_ipsec_t, get_spi, status_t,
        private_kernel_android_ipsec_t *this, host_t *src, host_t *dst,
        u_int8_t protocol, u_int32_t reqid, u_int32_t *spi)
 {
-       return ipsec->sas->get_spi(ipsec->sas, src, dst, protocol, reqid, spi);
+       return ipsec->sas->get_spi(ipsec->sas, src, dst, protocol, spi);
 }
 
 METHOD(kernel_ipsec_t, get_cpi, status_t,

diff --git a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
index bd07a67a214be2ab61753ccad5f65384c0dec664..5ab0c974329c80e2ec95a17a9bbabda8f531ff44 100644 (file)
--- a/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
+++ b/src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
@@ -238,7 +238,7 @@ METHOD(kernel_ipsec_t, get_spi, status_t,
        private_kernel_libipsec_ipsec_t *this, host_t *src, host_t *dst,
        u_int8_t protocol, u_int32_t reqid, u_int32_t *spi)
 {
-       return ipsec->sas->get_spi(ipsec->sas, src, dst, protocol, reqid, spi);
+       return ipsec->sas->get_spi(ipsec->sas, src, dst, protocol, spi);
 }
 
 METHOD(kernel_ipsec_t, get_cpi, status_t,

diff --git a/src/libipsec/ipsec_sa_mgr.c b/src/libipsec/ipsec_sa_mgr.c
index 1db1776c06670e7caa941d8a723237fca11e96e3..d1850b04837a7ffd9d534a6b9c2a0fb186525812 100644 (file)
--- a/src/libipsec/ipsec_sa_mgr.c
+++ b/src/libipsec/ipsec_sa_mgr.c
@@ -396,12 +396,10 @@ static bool allocate_spi(private_ipsec_sa_mgr_t *this, u_int32_t spi)
 
 METHOD(ipsec_sa_mgr_t, get_spi, status_t,
        private_ipsec_sa_mgr_t *this, host_t *src, host_t *dst, u_int8_t protocol,
-       u_int32_t reqid, u_int32_t *spi)
+       u_int32_t *spi)
 {
        u_int32_t spi_new;
 
-       DBG2(DBG_ESP, "allocating SPI for reqid {%u}", reqid);
-
        this->mutex->lock(this->mutex);
        if (!this->rng)
        {
@@ -420,7 +418,7 @@ METHOD(ipsec_sa_mgr_t, get_spi, status_t,
                                                                 (u_int8_t*)&spi_new))
                {
                        this->mutex->unlock(this->mutex);
-                       DBG1(DBG_ESP, "failed to allocate SPI for reqid {%u}", reqid);
+                       DBG1(DBG_ESP, "failed to allocate SPI");
                        return FAILED;
                }
                /* make sure the SPI is valid (not in range 0-255) */
@@ -432,7 +430,7 @@ METHOD(ipsec_sa_mgr_t, get_spi, status_t,
 
        *spi = spi_new;
 
-       DBG2(DBG_ESP, "allocated SPI %.8x for reqid {%u}", ntohl(*spi), reqid);
+       DBG2(DBG_ESP, "allocated SPI %.8x", ntohl(*spi));
        return SUCCESS;
 }
 

diff --git a/src/libipsec/ipsec_sa_mgr.h b/src/libipsec/ipsec_sa_mgr.h
index 8c234cefa1ae269bbcebfe118bf779b70401bf72..3e6efaa6d994e87ef93818981eb182528fec9d44 100644 (file)
--- a/src/libipsec/ipsec_sa_mgr.h
+++ b/src/libipsec/ipsec_sa_mgr.h
@@ -45,12 +45,11 @@ struct ipsec_sa_mgr_t {
         * @param src                   source address of the SA
         * @param dst                   destination address of the SA
         * @param protocol              protocol of the SA (only ESP supported)
-        * @param reqid                 reqid for the SA
         * @param spi                   the allocated SPI
         * @return                              SUCCESS of operation successful
         */
        status_t (*get_spi)(ipsec_sa_mgr_t *this, host_t *src, host_t *dst,
-                                               u_int8_t protocol, u_int32_t reqid, u_int32_t *spi);
+                                               u_int8_t protocol, u_int32_t *spi);
 
        /**
         * Add a new SA