aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2007-03-20 08:13:54 +0000
committerMartin Willi <martin@strongswan.org>2007-03-20 08:13:54 +0000
commit755bdcc274b064a0811985d3ec4112570515d422 (patch)
tree2ea2f8af4733685cc1ab8c2d73167cf62d5abaa3 /src
parentf9a73bee9cb601f0524bad69959b6c1ae6f260de (diff)
downloadstrongswan-755bdcc274b064a0811985d3ec4112570515d422.tar.bz2
strongswan-755bdcc274b064a0811985d3ec4112570515d422.tar.xz
adjusted loglevels
Diffstat (limited to 'src')
-rw-r--r--src/charon/sa/tasks/ike_natd.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/charon/sa/tasks/ike_natd.c b/src/charon/sa/tasks/ike_natd.c
index 8e36b2e85..9b8369355 100644
--- a/src/charon/sa/tasks/ike_natd.c
+++ b/src/charon/sa/tasks/ike_natd.c
@@ -101,7 +101,6 @@ static chunk_t generate_natd_hash(private_ike_natd_t *this,
port_chunk.ptr = (void*)&port;
port_chunk.len = sizeof(port);
addr_chunk = host->get_address(host);
- DBG2(DBG_IKE, "using SPI %J", ike_sa_id);
/* natd_hash = SHA1( spi_i | spi_r | address | port ) */
natd_chunk = chunk_cat("cccc", spi_i_chunk, spi_r_chunk, addr_chunk, port_chunk);
@@ -152,8 +151,8 @@ static void process_payloads(private_ike_natd_t *this, message_t *message)
dst_hash = generate_natd_hash(this, ike_sa_id, me);
src_hash = generate_natd_hash(this, ike_sa_id, other);
- DBG2(DBG_IKE, "precalculated src_hash %B", &src_hash);
- DBG2(DBG_IKE, "precalculated dst_hash %B", &dst_hash);
+ DBG3(DBG_IKE, "precalculated src_hash %B", &src_hash);
+ DBG3(DBG_IKE, "precalculated dst_hash %B", &dst_hash);
iterator = message->get_payload_iterator(message);
while (iterator->iterate(iterator, (void**)&payload))
@@ -171,7 +170,7 @@ static void process_payloads(private_ike_natd_t *this, message_t *message)
if (!this->dst_matched)
{
hash = notify->get_notification_data(notify);
- DBG2(DBG_IKE, "received dst_hash %B", &hash);
+ DBG3(DBG_IKE, "received dst_hash %B", &hash);
if (chunk_equals(hash, dst_hash))
{
this->dst_matched = TRUE;
@@ -185,7 +184,7 @@ static void process_payloads(private_ike_natd_t *this, message_t *message)
if (!this->src_matched)
{
hash = notify->get_notification_data(notify);
- DBG2(DBG_IKE, "received src_hash %B", &hash);
+ DBG3(DBG_IKE, "received src_hash %B", &hash);
if (chunk_equals(hash, src_hash))
{
this->src_matched = TRUE;
@@ -278,15 +277,9 @@ static status_t build_r(private_ike_natd_t *this, message_t *message)
{
notify_payload_t *notify;
host_t *me, *other;
- iterator_t *iterator;
- u_int count;
- /* when only one payload is in the message, an error occured.
- * TODO: find a better hack */
- iterator = message->get_payload_iterator(message);
- count = iterator->get_count(iterator);
- iterator->destroy(iterator);
- if (count < 3)
+ /* only add notifies on successfull responses. */
+ if (message->get_payload(message, SECURITY_ASSOCIATION))
{
return NEED_MORE;
}