From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 10 Jan 2011 04:08:48 +0000 (+0100)
Subject: correct numbering of batches
X-Git-Tag: 4.5.1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21d96f44f7ac989b958b9bc7d289a9cd99723933;p=thirdparty%2Fstrongswan.git

correct numbering of batches
---

diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c
index 375f2cce29..a10aa26580 100644
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.c
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c
@@ -179,7 +179,7 @@ static void handle_message(private_tnccs_11_t *this, tnccs_msg_t *msg)
 
 			err_msg = (tnccs_error_msg_t*)msg;
 			error_msg = err_msg->get_message(err_msg, &error_type);
-			DBG1(DBG_TNC, "received TNCCS-Error '%N': %s",
+			DBG1(DBG_TNC, "received '%N' TNCCS-Error: %s",
 				 tnccs_error_type_names, error_type, error_msg);
 
 			/* we assume that all errors are fatal */
@@ -241,8 +241,9 @@ METHOD(tls_t, process, status_t,
 		{
 			DBG1(DBG_TNC, "cancelling TNCCS batch");
 			this->batch->destroy(this->batch);
+			this->batch_id--;
 		 }
-		this->batch = tnccs_batch_create(this->is_server, this->batch_id);
+		this->batch = tnccs_batch_create(this->is_server, ++this->batch_id);
 
 		/* add error messages to outbound batch */
 		enumerator = batch->create_error_enumerator(batch);