From db04a1bc8f53fe981fdcb84d32622b790fcf4ed0 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 16 Nov 2005 16:04:53 +0000 Subject: [PATCH] - spi_t is a u_int64_t now --- Source/charon/ike_sa_manager.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Source/charon/ike_sa_manager.c b/Source/charon/ike_sa_manager.c index 47da146bf..8e88282e4 100644 --- a/Source/charon/ike_sa_manager.c +++ b/Source/charon/ike_sa_manager.c @@ -295,15 +295,11 @@ static status_t delete_entry(private_ike_sa_manager_t *this, ike_sa_entry_t *ent */ static status_t get_next_spi(private_ike_sa_manager_t *this, spi_t *spi) { - this->next_spi.low ++; - if (this->next_spi.low == 0) { - /* overflow of lower int in spi */ - this->next_spi.high ++; - if (this->next_spi.high == 0) { - /* our software ran so incredible stable, we have no more - * SPIs to give away :-/. */ - return OUT_OF_RES; - } + this->next_spi++; + if (this->next_spi == 0) { + /* our software ran so incredible stable, we have no more + * SPIs to give away :-/. */ + return OUT_OF_RES; } *spi = this->next_spi; return SUCCESS; @@ -715,8 +711,7 @@ ike_sa_manager_t *ike_sa_manager_create() pthread_mutex_init(&(this->mutex), NULL); - this->next_spi.low = 1; - this->next_spi.high = 0; + this->next_spi = 0; return (ike_sa_manager_t*)this; }