Imported Upstream version 5.3.0

5 files changed, 40 insertions, 16 deletions

diff --git a/src/libtnccs/tnc/imc/imc.h b/src/libtnccs/tnc/imc/imc.h
index 3ff7d5194..6d13f6bc5 100644
--- a/src/libtnccs/tnc/imc/imc.h
+++ b/src/libtnccs/tnc/imc/imc.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc imc
- * @ingroup tnc
+ * @ingroup libtnccs
  *
  * @defgroup imct imc
  * @{ @ingroup imc
diff --git a/src/libtnccs/tnc/imv/imv.h b/src/libtnccs/tnc/imv/imv.h
index 3716532d6..fbc26a1e7 100644
--- a/src/libtnccs/tnc/imv/imv.h
+++ b/src/libtnccs/tnc/imv/imv.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imv imv
- * @ingroup tnc
+ * @ingroup libtnccs
  *
  * @defgroup imvt imv
  * @{ @ingroup imv
diff --git a/src/libtnccs/tnc/tnc.h b/src/libtnccs/tnc/tnc.h
index e5a4a2959..7bf8c84b7 100644
--- a/src/libtnccs/tnc/tnc.h
+++ b/src/libtnccs/tnc/tnc.h
@@ -14,9 +14,12 @@
  */
 
 /**
- * @defgroup tnc tnc
+ * @defgroup libtnccs libtnccs
  *
- * @addtogroup tnc
+ * @defgroup tplugins plugins
+ * @ingroup libtnccs
+ *
+ * @addtogroup libtnccs
  * @{
  */
 
diff --git a/src/libtnccs/tnc/tnccs/tnccs.h b/src/libtnccs/tnc/tnccs/tnccs.h
index eefd5565d..8ff295bcc 100644
--- a/src/libtnccs/tnc/tnccs/tnccs.h
+++ b/src/libtnccs/tnc/tnccs/tnccs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 Andreas Steffen
+ * Copyright (C) 2010-2015 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup tnccs tnccs
- * @ingroup tnc
+ * @ingroup libtnccs
  *
  * @defgroup tnccst tnccs
  * @{ @ingroup tnccs
@@ -87,6 +87,20 @@ struct tnccs_t {
 	tls_t tls;
 
 	/**
+	 * Get server IP address
+	 *
+	 * @return				Server IP address
+	 */
+	host_t* (*get_server_ip)(tnccs_t *this);
+
+	/**
+	 * Get peer IP address
+	 *
+	 * @return				Peer IP address
+	 */
+	host_t* (*get_peer_ip)(tnccs_t *this);
+
+	/**
 	 * Get underlying TNC IF-T transport protocol
 	 *
 	 * @return				TNC IF-T transport protocol
@@ -135,15 +149,19 @@ struct tnccs_t {
  * Constructor definition for a pluggable TNCCS protocol implementation.
  *
  * @param is_server		TRUE if TNC Server, FALSE if TNC Client
- * @param server		Server identity
- * @param peer			Client identity
+ * @param server_id		Server identity
+ * @param peer_id		Client identity
+ * @param server_ip		Server IP address
+ * @param peer_ip		Client IP address
  * @param transport		Underlying TNC IF-T transport protocol used
  * @param cb			Callback function if TNC Server, NULL if TNC Client
  * @return				implementation of the tnccs_t interface
  */
 typedef tnccs_t *(*tnccs_constructor_t)(bool is_server,
-										identification_t *server,
-										identification_t *peer,
+										identification_t *server_id,
+										identification_t *peer_id,
+										host_t *server_ip,
+										host_t *peer_ip,
 										tnc_ift_type_t transport,
 										tnccs_cb_t cb);
 
diff --git a/src/libtnccs/tnc/tnccs/tnccs_manager.h b/src/libtnccs/tnc/tnccs/tnccs_manager.h
index 791336ee1..b5c85f3c0 100644
--- a/src/libtnccs/tnc/tnccs/tnccs_manager.h
+++ b/src/libtnccs/tnc/tnccs/tnccs_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 Andreas Steffen
+ * Copyright (C) 2010-2015 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -56,16 +56,19 @@ struct tnccs_manager_t {
 	 *
 	 * @param type		  type of the TNCCS protocol
 	 * @param is_server	  TRUE if TNC Server, FALSE if TNC Client
-	 * @param server	  Server identity
-	 * @param peer		  Client identity
+	 * @param server_id	  Server identity
+	 * @param peer_id	  Client identity
+	 * @param server_ip	  Server IP address
+	 * @param peer_ip	  Client IP address
 	 * @param transport	  Underlying TNC IF-T transport protocol used
 	 * @param cb		  Callback function if TNC Server, NULL if TNC Client
 	 * @return			  TNCCS protocol instance, NULL if no constructor found
 	 */
 	tnccs_t* (*create_instance)(tnccs_manager_t *this, tnccs_type_t type,
-								bool is_server, identification_t *server,
-								identification_t *peer,
-								tnc_ift_type_t transport, tnccs_cb_t cb);
+								bool is_server, identification_t *server_id,
+								identification_t *peer_id, host_t *server_ip,
+								host_t *peer_ip, tnc_ift_type_t transport,
+								tnccs_cb_t cb);
 
 	/**
 	 * Create a TNCCS connection and assign a unique connection ID as well a