Import upstream release 5.2.1

3 files changed, 43 insertions, 17 deletions

diff --git a/src/libimcv/plugins/imc_test/Makefile.in b/src/libimcv/plugins/imc_test/Makefile.in
index 1702574f9..3e1d0232f 100644
--- a/src/libimcv/plugins/imc_test/Makefile.in
+++ b/src/libimcv/plugins/imc_test/Makefile.in
@@ -230,6 +230,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GEM = @GEM@
 GENHTML = @GENHTML@
 GPERF = @GPERF@
 GPRBUILD = @GPRBUILD@
@@ -290,6 +291,7 @@ PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 RTLIB = @RTLIB@
 RUBY = @RUBY@
+RUBYGEMDIR = @RUBYGEMDIR@
 RUBYINCLUDE = @RUBYINCLUDE@
 RUBYLIB = @RUBYLIB@
 SED = @SED@
@@ -355,6 +357,8 @@ ipsecdir = @ipsecdir@
 ipsecgroup = @ipsecgroup@
 ipseclibdir = @ipseclibdir@
 ipsecuser = @ipsecuser@
+json_CFLAGS = @json_CFLAGS@
+json_LIBS = @json_LIBS@
 libdir = @libdir@
 libexecdir = @libexecdir@
 linux_headers = @linux_headers@
@@ -402,6 +406,10 @@ strongswan_conf = @strongswan_conf@
 strongswan_options = @strongswan_options@
 swanctldir = @swanctldir@
 sysconfdir = @sysconfdir@
+systemd_daemon_CFLAGS = @systemd_daemon_CFLAGS@
+systemd_daemon_LIBS = @systemd_daemon_LIBS@
+systemd_journal_CFLAGS = @systemd_journal_CFLAGS@
+systemd_journal_LIBS = @systemd_journal_LIBS@
 systemdsystemunitdir = @systemdsystemunitdir@
 t_plugins = @t_plugins@
 target_alias = @target_alias@
diff --git a/src/libimcv/plugins/imc_test/imc_test.c b/src/libimcv/plugins/imc_test/imc_test.c
index ee982d93b..d38ace140 100644
--- a/src/libimcv/plugins/imc_test/imc_test.c
+++ b/src/libimcv/plugins/imc_test/imc_test.c
@@ -181,7 +181,7 @@ TNC_Result TNC_IMC_NotifyConnectionChange(TNC_IMCID imc_id,
 	}
 }
 
-static TNC_Result send_message(imc_state_t *state, imc_msg_t *out_msg)
+static void create_message(imc_state_t *state, imc_msg_t *out_msg)
 {
 	imc_test_state_t *test_state;
 	pa_tnc_attr_t *attr;
@@ -196,9 +196,6 @@ static TNC_Result send_message(imc_state_t *state, imc_msg_t *out_msg)
 	attr = ita_attr_command_create(test_state->get_command(test_state));
 	attr->set_noskip_flag(attr, TRUE);
 	out_msg->add_attribute(out_msg, attr);
-
-	/* send PA-TNC message with the excl flag set */
-	return out_msg->send(out_msg, TRUE);
 }
 
 /**
@@ -224,10 +221,11 @@ TNC_Result TNC_IMC_BeginHandshake(TNC_IMCID imc_id,
 		return TNC_RESULT_FATAL;
 	}
 
-	/* send PA message for primary IMC ID */
+	/* send PA message for primary IMC ID with the EXCL flag set */
 	out_msg = imc_msg_create(imc_test, state, connection_id, imc_id,
 							 TNC_IMVID_ANY, msg_types[0]);
-	result = send_message(state, out_msg);
+	create_message(state, out_msg);
+	result = out_msg->send(out_msg, TRUE);
 	out_msg->destroy(out_msg);
 
 	/* Exit if there are no additional IMC IDs */
@@ -253,7 +251,8 @@ TNC_Result TNC_IMC_BeginHandshake(TNC_IMCID imc_id,
 		additional_id = (TNC_UInt32)pointer;
 		out_msg = imc_msg_create(imc_test, state, connection_id, additional_id,
 								 TNC_IMVID_ANY, msg_types[0]);
-		result = send_message(state, out_msg);
+		create_message(state, out_msg);
+		result = out_msg->send(out_msg, TRUE);
 		out_msg->destroy(out_msg);
 	}
 	enumerator->destroy(enumerator);
@@ -267,13 +266,17 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
 	enumerator_t *enumerator;
 	pa_tnc_attr_t *attr;
 	pen_type_t attr_type;
-	TNC_Result result;
+	TNC_Result result = TNC_RESULT_SUCCESS;
 	bool fatal_error = FALSE;
 
+	/* generate an outgoing PA-TNC message - we might need it */
+	out_msg = imc_msg_create_as_reply(in_msg);
+
 	/* parse received PA-TNC message and handle local and remote errors */
-	result = in_msg->receive(in_msg, &fatal_error);
+	result = in_msg->receive(in_msg, out_msg, &fatal_error);
 	if (result != TNC_RESULT_SUCCESS)
 	{
+		out_msg->destroy(out_msg);
 		return result;
 	}
 
@@ -308,16 +311,17 @@ static TNC_Result receive_message(imc_state_t *state, imc_msg_t *in_msg)
 
 	if (fatal_error)
 	{
-		return TNC_RESULT_FATAL;
+		result = TNC_RESULT_FATAL;
 	}
-
-	/* if no assessment result is known then repeat the measurement */
-	if (state->get_result(state, in_msg->get_dst_id(in_msg), NULL))
+	else
 	{
-		return TNC_RESULT_SUCCESS;
+		/* if no assessment result is known then repeat the measurement */
+		if (!state->get_result(state, in_msg->get_dst_id(in_msg), NULL))
+		{
+			create_message(state, out_msg);
+		}
+		result = out_msg->send(out_msg, TRUE);
 	}
-	out_msg = imc_msg_create_as_reply(in_msg);
- 	result = send_message(state, out_msg);
 	out_msg->destroy(out_msg);
 
 	return result;
diff --git a/src/libimcv/plugins/imc_test/imc_test_state.c b/src/libimcv/plugins/imc_test/imc_test_state.c
index e7beca0aa..d3f6805ad 100644
--- a/src/libimcv/plugins/imc_test/imc_test_state.c
+++ b/src/libimcv/plugins/imc_test/imc_test_state.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Andreas Steffen
+ * Copyright (C) 2011-2014 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -64,6 +64,11 @@ struct private_imc_test_state_t {
 	u_int32_t max_msg_len;
 
 	/**
+	 * PA-TNC attribute segmentation contracts associated with TNCCS connection
+	 */
+	seg_contract_manager_t *contracts;
+
+	/**
 	 * Command to transmit to IMV
 	 */
 	char *command;
@@ -130,6 +135,12 @@ METHOD(imc_state_t, get_max_msg_len, u_int32_t,
 	return this->max_msg_len;
 }
 
+METHOD(imc_state_t, get_contracts, seg_contract_manager_t*,
+	private_imc_test_state_t *this)
+{
+	return this->contracts;
+}
+
 METHOD(imc_state_t, change_state, void,
 	private_imc_test_state_t *this, TNC_ConnectionState new_state)
 {
@@ -195,6 +206,7 @@ METHOD(imc_state_t, destroy, void,
 	private_imc_test_state_t *this)
 {
 	this->results->destroy_function(this->results, free);
+	this->contracts->destroy(this->contracts);
 	free(this->command);
 	free(this);
 }
@@ -261,6 +273,7 @@ imc_state_t *imc_test_state_create(TNC_ConnectionID connection_id,
 				.set_flags = _set_flags,
 				.set_max_msg_len = _set_max_msg_len,
 				.get_max_msg_len = _get_max_msg_len,
+				.get_contracts = _get_contracts,
 				.change_state = _change_state,
 				.set_result = _set_result,
 				.get_result = _get_result,
@@ -275,6 +288,7 @@ imc_state_t *imc_test_state_create(TNC_ConnectionID connection_id,
 		.state = TNC_CONNECTION_STATE_CREATE,
 		.results = linked_list_create(),
 		.connection_id = connection_id,
+		.contracts = seg_contract_manager_create(),
 		.command = strdup(command),
 		.dummy_size = dummy_size,
 		.first_handshake = TRUE,