denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Willi
2015-02-19 15:42:22 +01:00
parent 970378c557
commit 3e779ff555
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
+1 -1
View File
@@ -50,7 +50,7 @@ METHOD(kernel_ipsec_t, get_spi, status_t,
private_kernel_android_ipsec_t *this, host_t *src, host_t *dst, private_kernel_android_ipsec_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 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, METHOD(kernel_ipsec_t, get_cpi, status_t,
src/libcharon/plugins/kernel_libipsec/kernel_libipsec_ipsec.c
+1 -1
View File
@@ -238,7 +238,7 @@ METHOD(kernel_ipsec_t, get_spi, status_t,
private_kernel_libipsec_ipsec_t *this, host_t *src, host_t *dst, private_kernel_libipsec_ipsec_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 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, METHOD(kernel_ipsec_t, get_cpi, status_t,
src/libipsec/ipsec_sa_mgr.c
+3 -5
View File
@@ -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, 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, 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; u_int32_t spi_new;
DBG2(DBG_ESP, "allocating SPI for reqid {%u}", reqid);
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
if (!this->rng) if (!this->rng)
{ {
@@ -420,7 +418,7 @@ METHOD(ipsec_sa_mgr_t, get_spi, status_t,
(u_int8_t*)&spi_new)) (u_int8_t*)&spi_new))
{ {
this->mutex->unlock(this->mutex); 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; return FAILED;
} }
/* make sure the SPI is valid (not in range 0-255) */ /* 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; *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; return SUCCESS;
} }
src/libipsec/ipsec_sa_mgr.h
+1 -2
View File
@@ -45,12 +45,11 @@ struct ipsec_sa_mgr_t {
* @param src source address of the SA * @param src source address of the SA
* @param dst destination address of the SA * @param dst destination address of the SA
* @param protocol protocol of the SA (only ESP supported) * @param protocol protocol of the SA (only ESP supported)
* @param reqid reqid for the SA
* @param spi the allocated SPI * @param spi the allocated SPI
* @return SUCCESS of operation successful * @return SUCCESS of operation successful
*/ */
status_t (*get_spi)(ipsec_sa_mgr_t *this, host_t *src, host_t *dst, 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 * Add a new SA