Add new QoS implementation

Code formatting

5 files changed, 330 insertions, 292 deletions

diff --git a/Samples/C#/IPSec/ipsec_lib/IPSecCtx.cxx b/Samples/C#/IPSec/ipsec_lib/IPSecCtx.cxx
index db6bf63..13c4cf5 100755
--- a/Samples/C#/IPSec/ipsec_lib/IPSecCtx.cxx
+++ b/Samples/C#/IPSec/ipsec_lib/IPSecCtx.cxx
@@ -25,70 +25,69 @@ bool IPSecCtx::sInitialized = false;
 extern "C" const tipsec_plugin_def_t *plugin_win_ipsec_vista_plugin_def_t;
 
 IPSecCtx::IPSecCtx(tipsec_ipproto_t ipproto,
-		bool use_ipv6,
-		tipsec_mode_t mode,
-		tipsec_ealg_t ealg,
-		tipsec_alg_t alg,
-		tipsec_proto_t protocol)
-: m_pCtx(NULL)
+                   bool use_ipv6,
+                   tipsec_mode_t mode,
+                   tipsec_ealg_t ealg,
+                   tipsec_alg_t alg,
+                   tipsec_proto_t protocol)
+    : m_pCtx(NULL)
 {
-	tipsec_ctx_t* pCtx = NULL;
-	if (!IPSecCtx::sInitialized)
-	{
-		assert (tipsec_plugin_register_static(plugin_win_ipsec_vista_plugin_def_t) == 0);
-		IPSecCtx::sInitialized = true;
-	}
-	assert (tipsec_ctx_create(ipproto, use_ipv6, mode, ealg, alg, protocol, &m_pCtx) == 0 && m_pCtx != NULL);
+    tipsec_ctx_t* pCtx = NULL;
+    if (!IPSecCtx::sInitialized) {
+        assert (tipsec_plugin_register_static(plugin_win_ipsec_vista_plugin_def_t) == 0);
+        IPSecCtx::sInitialized = true;
+    }
+    assert (tipsec_ctx_create(ipproto, use_ipv6, mode, ealg, alg, protocol, &m_pCtx) == 0 && m_pCtx != NULL);
 }
 
 IPSecCtx::~IPSecCtx()
 {
-	TSK_OBJECT_SAFE_FREE(m_pCtx);
+    TSK_OBJECT_SAFE_FREE(m_pCtx);
 }
 
 tipsec_error_t IPSecCtx::start()
 {
-	return tipsec_ctx_start(m_pCtx);
+    return tipsec_ctx_start(m_pCtx);
 }
 
 tipsec_error_t IPSecCtx::setLocal(const char* addr_local, const char* addr_remote, tipsec_port_t port_uc, tipsec_port_t port_us)
 {
-	return tipsec_ctx_set_local(m_pCtx, addr_local, addr_remote, port_uc, port_us);
+    return tipsec_ctx_set_local(m_pCtx, addr_local, addr_remote, port_uc, port_us);
 }
 
 tipsec_error_t IPSecCtx::setKeys(const tipsec_key_t* ik, const tipsec_key_t* ck)
 {
-	return tipsec_ctx_set_keys(m_pCtx, ik, ck);
+    return tipsec_ctx_set_keys(m_pCtx, ik, ck);
 }
 
 tipsec_error_t IPSecCtx::setRemote(tipsec_spi_t spi_pc, tipsec_spi_t spi_ps, tipsec_port_t port_pc, tipsec_port_t port_ps, tipsec_lifetime_t lifetime)
 {
-	return tipsec_ctx_set_remote(m_pCtx, spi_pc, spi_ps, port_pc, port_ps, lifetime);
+    return tipsec_ctx_set_remote(m_pCtx, spi_pc, spi_ps, port_pc, port_ps, lifetime);
 }
 
 tipsec_error_t IPSecCtx::stop()
 {
-	return tipsec_ctx_stop(m_pCtx);
+    return tipsec_ctx_stop(m_pCtx);
 }
 
 tipsec_spi_t IPSecCtx::getSpiUC()
 {
-	return m_pCtx->spi_uc;
+    return m_pCtx->spi_uc;
 }
 
 tipsec_spi_t IPSecCtx::getSpiUS()
 {
-	return m_pCtx->spi_us;
+    return m_pCtx->spi_us;
 }
 
 tipsec_spi_t IPSecCtx::getSpiPC()
 {
-	return m_pCtx->spi_pc;
+    return m_pCtx->spi_pc;
 }
 
 tipsec_spi_t IPSecCtx::getSpiPS()
 {
-	return m_pCtx->spi_ps;
+    return m_pCtx->spi_ps;
 }
 
 
diff --git a/Samples/C#/IPSec/ipsec_lib/IPSecCtx.h b/Samples/C#/IPSec/ipsec_lib/IPSecCtx.h
index 0e7d0ef..7aebc35 100755
--- a/Samples/C#/IPSec/ipsec_lib/IPSecCtx.h
+++ b/Samples/C#/IPSec/ipsec_lib/IPSecCtx.h
@@ -24,27 +24,27 @@
 class IPSecCtx
 {
 public:
-	IPSecCtx(tipsec_ipproto_t ipproto,
-		bool use_ipv6,
-		tipsec_mode_t mode,
-		tipsec_ealg_t ealg,
-		tipsec_alg_t alg,
-		tipsec_proto_t protocol);
-	virtual ~IPSecCtx();
-	tipsec_error_t start();
-	tipsec_error_t setLocal(const char* addr_local, const char* addr_remote, tipsec_port_t port_uc, tipsec_port_t port_us);
-	tipsec_error_t setKeys(const tipsec_key_t* ik, const tipsec_key_t* ck);
-	tipsec_error_t setRemote(tipsec_spi_t spi_pc, tipsec_spi_t spi_ps, tipsec_port_t port_pc, tipsec_port_t port_ps, tipsec_lifetime_t lifetime);
-	tipsec_error_t stop();
+    IPSecCtx(tipsec_ipproto_t ipproto,
+             bool use_ipv6,
+             tipsec_mode_t mode,
+             tipsec_ealg_t ealg,
+             tipsec_alg_t alg,
+             tipsec_proto_t protocol);
+    virtual ~IPSecCtx();
+    tipsec_error_t start();
+    tipsec_error_t setLocal(const char* addr_local, const char* addr_remote, tipsec_port_t port_uc, tipsec_port_t port_us);
+    tipsec_error_t setKeys(const tipsec_key_t* ik, const tipsec_key_t* ck);
+    tipsec_error_t setRemote(tipsec_spi_t spi_pc, tipsec_spi_t spi_ps, tipsec_port_t port_pc, tipsec_port_t port_ps, tipsec_lifetime_t lifetime);
+    tipsec_error_t stop();
 
-	tipsec_spi_t getSpiUC();
-	tipsec_spi_t getSpiUS();
-	tipsec_spi_t getSpiPC();
-	tipsec_spi_t getSpiPS();
+    tipsec_spi_t getSpiUC();
+    tipsec_spi_t getSpiUS();
+    tipsec_spi_t getSpiPC();
+    tipsec_spi_t getSpiPS();
 
 private:
-	static bool sInitialized;
-	tipsec_ctx_t* m_pCtx;
+    static bool sInitialized;
+    tipsec_ctx_t* m_pCtx;
 };
 
 #endif /* IPSEC_CTX_H */
diff --git a/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.cxx b/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.cxx
index 336643d..0e443a3 100755
--- a/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.cxx
+++ b/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.cxx
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
  * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGCSHARP
@@ -14,24 +14,43 @@
 
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
-template<typename T> class SwigValueWrapper {
-  struct SwigMovePointer {
-    T *ptr;
-    SwigMovePointer(T *p) : ptr(p) { }
-    ~SwigMovePointer() { delete ptr; }
-    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-  } pointer;
-  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
-  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
+template<typename T> class SwigValueWrapper
+{
+    struct SwigMovePointer {
+        T *ptr;
+        SwigMovePointer(T *p) : ptr(p) { }
+        ~SwigMovePointer() {
+            delete ptr;
+        }
+        SwigMovePointer& operator=(SwigMovePointer& rhs) {
+            T* oldptr = ptr;
+            ptr = 0;
+            delete oldptr;
+            ptr = rhs.ptr;
+            rhs.ptr = 0;
+            return *this;
+        }
+    } pointer;
+    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+    SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-  SwigValueWrapper() : pointer(0) { }
-  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
-  operator T&() const { return *pointer.ptr; }
-  T *operator&() { return pointer.ptr; }
+    SwigValueWrapper() : pointer(0) { }
+    SwigValueWrapper& operator=(const T& t) {
+        SwigMovePointer tmp(new T(t));
+        pointer = tmp;
+        return *this;
+    }
+    operator T&() const {
+        return *pointer.ptr;
+    }
+    T *operator&() {
+        return pointer.ptr;
+    }
 };
 
-template <typename T> T SwigValueInit() {
-  return T();
+template <typename T> T SwigValueInit()
+{
+    return T();
 }
 #endif
 
@@ -66,28 +85,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -130,7 +149,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -150,116 +169,120 @@ template <typename T> T SwigValueInit() {
 #include <stdio.h>
 
 
-/* Support for throwing C# exceptions from C/C++. There are two types: 
+/* Support for throwing C# exceptions from C/C++. There are two types:
  * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */
 typedef enum {
-  SWIG_CSharpApplicationException,
-  SWIG_CSharpArithmeticException,
-  SWIG_CSharpDivideByZeroException,
-  SWIG_CSharpIndexOutOfRangeException,
-  SWIG_CSharpInvalidCastException,
-  SWIG_CSharpInvalidOperationException,
-  SWIG_CSharpIOException,
-  SWIG_CSharpNullReferenceException,
-  SWIG_CSharpOutOfMemoryException,
-  SWIG_CSharpOverflowException,
-  SWIG_CSharpSystemException
+    SWIG_CSharpApplicationException,
+    SWIG_CSharpArithmeticException,
+    SWIG_CSharpDivideByZeroException,
+    SWIG_CSharpIndexOutOfRangeException,
+    SWIG_CSharpInvalidCastException,
+    SWIG_CSharpInvalidOperationException,
+    SWIG_CSharpIOException,
+    SWIG_CSharpNullReferenceException,
+    SWIG_CSharpOutOfMemoryException,
+    SWIG_CSharpOverflowException,
+    SWIG_CSharpSystemException
 } SWIG_CSharpExceptionCodes;
 
 typedef enum {
-  SWIG_CSharpArgumentException,
-  SWIG_CSharpArgumentNullException,
-  SWIG_CSharpArgumentOutOfRangeException
+    SWIG_CSharpArgumentException,
+    SWIG_CSharpArgumentNullException,
+    SWIG_CSharpArgumentOutOfRangeException
 } SWIG_CSharpExceptionArgumentCodes;
 
 typedef void (SWIGSTDCALL* SWIG_CSharpExceptionCallback_t)(const char *);
 typedef void (SWIGSTDCALL* SWIG_CSharpExceptionArgumentCallback_t)(const char *, const char *);
 
 typedef struct {
-  SWIG_CSharpExceptionCodes code;
-  SWIG_CSharpExceptionCallback_t callback;
+    SWIG_CSharpExceptionCodes code;
+    SWIG_CSharpExceptionCallback_t callback;
 } SWIG_CSharpException_t;
 
 typedef struct {
-  SWIG_CSharpExceptionArgumentCodes code;
-  SWIG_CSharpExceptionArgumentCallback_t callback;
+    SWIG_CSharpExceptionArgumentCodes code;
+    SWIG_CSharpExceptionArgumentCallback_t callback;
 } SWIG_CSharpExceptionArgument_t;
 
 static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
-  { SWIG_CSharpApplicationException, NULL },
-  { SWIG_CSharpArithmeticException, NULL },
-  { SWIG_CSharpDivideByZeroException, NULL },
-  { SWIG_CSharpIndexOutOfRangeException, NULL },
-  { SWIG_CSharpInvalidCastException, NULL },
-  { SWIG_CSharpInvalidOperationException, NULL },
-  { SWIG_CSharpIOException, NULL },
-  { SWIG_CSharpNullReferenceException, NULL },
-  { SWIG_CSharpOutOfMemoryException, NULL },
-  { SWIG_CSharpOverflowException, NULL },
-  { SWIG_CSharpSystemException, NULL }
+    { SWIG_CSharpApplicationException, NULL },
+    { SWIG_CSharpArithmeticException, NULL },
+    { SWIG_CSharpDivideByZeroException, NULL },
+    { SWIG_CSharpIndexOutOfRangeException, NULL },
+    { SWIG_CSharpInvalidCastException, NULL },
+    { SWIG_CSharpInvalidOperationException, NULL },
+    { SWIG_CSharpIOException, NULL },
+    { SWIG_CSharpNullReferenceException, NULL },
+    { SWIG_CSharpOutOfMemoryException, NULL },
+    { SWIG_CSharpOverflowException, NULL },
+    { SWIG_CSharpSystemException, NULL }
 };
 
 static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
-  { SWIG_CSharpArgumentException, NULL },
-  { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL }
+    { SWIG_CSharpArgumentException, NULL },
+    { SWIG_CSharpArgumentNullException, NULL },
+    { SWIG_CSharpArgumentOutOfRangeException, NULL }
 };
 
-static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
-  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
-    callback = SWIG_csharp_exceptions[code].callback;
-  }
-  callback(msg);
+static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg)
+{
+    SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
+    if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
+        callback = SWIG_csharp_exceptions[code].callback;
+    }
+    callback(msg);
 }
 
-static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
-  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
-  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
-    callback = SWIG_csharp_exceptions_argument[code].callback;
-  }
-  callback(msg, param_name);
+static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name)
+{
+    SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
+    if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
+        callback = SWIG_csharp_exceptions_argument[code].callback;
+    }
+    callback(msg, param_name);
 }
 
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 #endif
 SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_ipsec_lib(
-                                                SWIG_CSharpExceptionCallback_t applicationCallback,
-                                                SWIG_CSharpExceptionCallback_t arithmeticCallback,
-                                                SWIG_CSharpExceptionCallback_t divideByZeroCallback, 
-                                                SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback, 
-                                                SWIG_CSharpExceptionCallback_t invalidCastCallback,
-                                                SWIG_CSharpExceptionCallback_t invalidOperationCallback,
-                                                SWIG_CSharpExceptionCallback_t ioCallback,
-                                                SWIG_CSharpExceptionCallback_t nullReferenceCallback,
-                                                SWIG_CSharpExceptionCallback_t outOfMemoryCallback, 
-                                                SWIG_CSharpExceptionCallback_t overflowCallback, 
-                                                SWIG_CSharpExceptionCallback_t systemCallback) {
-  SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
-  SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
+    SWIG_CSharpExceptionCallback_t applicationCallback,
+    SWIG_CSharpExceptionCallback_t arithmeticCallback,
+    SWIG_CSharpExceptionCallback_t divideByZeroCallback,
+    SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback,
+    SWIG_CSharpExceptionCallback_t invalidCastCallback,
+    SWIG_CSharpExceptionCallback_t invalidOperationCallback,
+    SWIG_CSharpExceptionCallback_t ioCallback,
+    SWIG_CSharpExceptionCallback_t nullReferenceCallback,
+    SWIG_CSharpExceptionCallback_t outOfMemoryCallback,
+    SWIG_CSharpExceptionCallback_t overflowCallback,
+    SWIG_CSharpExceptionCallback_t systemCallback)
+{
+SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
+SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
+SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
+SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
+SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
+SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
+SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
+SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
+SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
+SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
+SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
 }
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 #endif
 SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_ipsec_lib(
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
-                                                SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback) {
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
-  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
+    SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
+    SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
+    SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback)
+{
+SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
+SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
+SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
 }
 
 
@@ -269,10 +292,11 @@ static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback = NULL;
 
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 #endif
-SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_ipsec_lib(SWIG_CSharpStringHelperCallback callback) {
-  SWIG_csharp_string_callback = callback;
+SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_ipsec_lib(SWIG_CSharpStringHelperCallback callback)
+{
+SWIG_csharp_string_callback = callback;
 }
 
 
@@ -283,7 +307,7 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_ipsec_lib(SWIG_CSharpStri
 /* -----------------------------------------------------------------------------
  * director.swg
  *
- * This file contains support for director classes so that C# proxy 
+ * This file contains support for director classes so that C# proxy
  * methods can be called from C++.
  * ----------------------------------------------------------------------------- */
 
@@ -294,34 +318,38 @@ SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_ipsec_lib(SWIG_CSharpStri
 #endif
 #include <string>
 
-namespace Swig {
-  /* Director base class - not currently used in C# directors */
-  class Director {
-  };
+namespace Swig
+{
+/* Director base class - not currently used in C# directors */
+class Director
+{
+};
 
-  /* Base class for director exceptions */
-  class DirectorException {
-  protected:
+/* Base class for director exceptions */
+class DirectorException
+{
+protected:
     std::string swig_msg;
 
-  public:
+public:
     DirectorException(const char* msg) : swig_msg(msg) {
     }
     DirectorException(const std::string &msg) : swig_msg(msg) {
     }
     const std::string& what() const {
-      return swig_msg;
+        return swig_msg;
     }
     virtual ~DirectorException() {
     }
-  };
+};
 
-  /* Pure virtual method exception */
-  class DirectorPureVirtualException : public Swig::DirectorException {
-  public:
+/* Pure virtual method exception */
+class DirectorPureVirtualException : public Swig::DirectorException
+{
+public:
     DirectorPureVirtualException(const char* msg) : DirectorException(std::string("Attempt to invoke pure virtual method ") + msg) {
     }
-  };
+};
 }
 
 #endif /* __cplusplus */
@@ -346,163 +374,174 @@ namespace Swig {
 extern "C" {
 #endif
 
-SWIGEXPORT void * SWIGSTDCALL CSharp_new_IPSecCtx(int jarg1, unsigned int jarg2, int jarg3, int jarg4, int jarg5, int jarg6) {
-  void * jresult ;
-  tipsec_ipproto_t arg1 ;
-  bool arg2 ;
-  tipsec_mode_t arg3 ;
-  tipsec_ealg_t arg4 ;
-  tipsec_alg_t arg5 ;
-  tipsec_proto_t arg6 ;
-  IPSecCtx *result = 0 ;
-  
-  arg1 = (tipsec_ipproto_t)jarg1; 
-  arg2 = jarg2 ? true : false; 
-  arg3 = (tipsec_mode_t)jarg3; 
-  arg4 = (tipsec_ealg_t)jarg4; 
-  arg5 = (tipsec_alg_t)jarg5; 
-  arg6 = (tipsec_proto_t)jarg6; 
-  result = (IPSecCtx *)new IPSecCtx(arg1,arg2,arg3,arg4,arg5,arg6);
-  jresult = (void *)result; 
-  return jresult;
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_IPSecCtx(int jarg1, unsigned int jarg2, int jarg3, int jarg4, int jarg5, int jarg6)
+{
+    void * jresult ;
+    tipsec_ipproto_t arg1 ;
+    bool arg2 ;
+    tipsec_mode_t arg3 ;
+    tipsec_ealg_t arg4 ;
+    tipsec_alg_t arg5 ;
+    tipsec_proto_t arg6 ;
+    IPSecCtx *result = 0 ;
+
+    arg1 = (tipsec_ipproto_t)jarg1;
+    arg2 = jarg2 ? true : false;
+    arg3 = (tipsec_mode_t)jarg3;
+    arg4 = (tipsec_ealg_t)jarg4;
+    arg5 = (tipsec_alg_t)jarg5;
+    arg6 = (tipsec_proto_t)jarg6;
+    result = (IPSecCtx *)new IPSecCtx(arg1,arg2,arg3,arg4,arg5,arg6);
+    jresult = (void *)result;
+    return jresult;
 }
 
 
-SWIGEXPORT void SWIGSTDCALL CSharp_delete_IPSecCtx(void * jarg1) {
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  delete arg1;
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_IPSecCtx(void * jarg1)
+{
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+
+    arg1 = (IPSecCtx *)jarg1;
+    delete arg1;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_start(void * jarg1) {
-  int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_error_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_error_t)(arg1)->start();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_start(void * jarg1)
+{
+    int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_error_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_error_t)(arg1)->start();
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setLocal(void * jarg1, char * jarg2, char * jarg3, unsigned short jarg4, unsigned short jarg5) {
-  int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  char *arg2 = (char *) 0 ;
-  char *arg3 = (char *) 0 ;
-  tipsec_port_t arg4 ;
-  tipsec_port_t arg5 ;
-  tipsec_error_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  arg2 = (char *)jarg2; 
-  arg3 = (char *)jarg3; 
-  arg4 = (tipsec_port_t)jarg4; 
-  arg5 = (tipsec_port_t)jarg5; 
-  result = (tipsec_error_t)(arg1)->setLocal((char const *)arg2,(char const *)arg3,arg4,arg5);
-  jresult = result; 
-  return jresult;
+SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setLocal(void * jarg1, char * jarg2, char * jarg3, unsigned short jarg4, unsigned short jarg5)
+{
+    int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    char *arg2 = (char *) 0 ;
+    char *arg3 = (char *) 0 ;
+    tipsec_port_t arg4 ;
+    tipsec_port_t arg5 ;
+    tipsec_error_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    arg2 = (char *)jarg2;
+    arg3 = (char *)jarg3;
+    arg4 = (tipsec_port_t)jarg4;
+    arg5 = (tipsec_port_t)jarg5;
+    result = (tipsec_error_t)(arg1)->setLocal((char const *)arg2,(char const *)arg3,arg4,arg5);
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setKeys(void * jarg1, void * jarg2, void * jarg3) {
-  int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_key_t *arg2 = (tipsec_key_t *) 0 ;
-  tipsec_key_t *arg3 = (tipsec_key_t *) 0 ;
-  tipsec_error_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  arg2 = jarg2; 
-  arg3 = jarg3; 
-  result = (tipsec_error_t)(arg1)->setKeys((tipsec_key_t const *)arg2,(tipsec_key_t const *)arg3);
-  jresult = result; 
-  return jresult;
+SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setKeys(void * jarg1, void * jarg2, void * jarg3)
+{
+    int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_key_t *arg2 = (tipsec_key_t *) 0 ;
+    tipsec_key_t *arg3 = (tipsec_key_t *) 0 ;
+    tipsec_error_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    arg2 = jarg2;
+    arg3 = jarg3;
+    result = (tipsec_error_t)(arg1)->setKeys((tipsec_key_t const *)arg2,(tipsec_key_t const *)arg3);
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setRemote(void * jarg1, unsigned int jarg2, unsigned int jarg3, unsigned short jarg4, unsigned short jarg5, unsigned long long jarg6) {
-  int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_spi_t arg2 ;
-  tipsec_spi_t arg3 ;
-  tipsec_port_t arg4 ;
-  tipsec_port_t arg5 ;
-  tipsec_lifetime_t arg6 ;
-  tipsec_error_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  arg2 = (tipsec_spi_t)jarg2; 
-  arg3 = (tipsec_spi_t)jarg3; 
-  arg4 = (tipsec_port_t)jarg4; 
-  arg5 = (tipsec_port_t)jarg5; 
-  arg6 = (tipsec_lifetime_t)jarg6; 
-  result = (tipsec_error_t)(arg1)->setRemote(arg2,arg3,arg4,arg5,arg6);
-  jresult = result; 
-  return jresult;
+SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_setRemote(void * jarg1, unsigned int jarg2, unsigned int jarg3, unsigned short jarg4, unsigned short jarg5, unsigned long long jarg6)
+{
+    int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_spi_t arg2 ;
+    tipsec_spi_t arg3 ;
+    tipsec_port_t arg4 ;
+    tipsec_port_t arg5 ;
+    tipsec_lifetime_t arg6 ;
+    tipsec_error_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    arg2 = (tipsec_spi_t)jarg2;
+    arg3 = (tipsec_spi_t)jarg3;
+    arg4 = (tipsec_port_t)jarg4;
+    arg5 = (tipsec_port_t)jarg5;
+    arg6 = (tipsec_lifetime_t)jarg6;
+    result = (tipsec_error_t)(arg1)->setRemote(arg2,arg3,arg4,arg5,arg6);
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_stop(void * jarg1) {
-  int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_error_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_error_t)(arg1)->stop();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT int SWIGSTDCALL CSharp_IPSecCtx_stop(void * jarg1)
+{
+    int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_error_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_error_t)(arg1)->stop();
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiUC(void * jarg1) {
-  unsigned int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_spi_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_spi_t)(arg1)->getSpiUC();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiUC(void * jarg1)
+{
+    unsigned int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_spi_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_spi_t)(arg1)->getSpiUC();
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiUS(void * jarg1) {
-  unsigned int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_spi_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_spi_t)(arg1)->getSpiUS();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiUS(void * jarg1)
+{
+    unsigned int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_spi_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_spi_t)(arg1)->getSpiUS();
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiPC(void * jarg1) {
-  unsigned int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_spi_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_spi_t)(arg1)->getSpiPC();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiPC(void * jarg1)
+{
+    unsigned int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_spi_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_spi_t)(arg1)->getSpiPC();
+    jresult = result;
+    return jresult;
 }
 
 
-SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiPS(void * jarg1) {
-  unsigned int jresult ;
-  IPSecCtx *arg1 = (IPSecCtx *) 0 ;
-  tipsec_spi_t result;
-  
-  arg1 = (IPSecCtx *)jarg1; 
-  result = (tipsec_spi_t)(arg1)->getSpiPS();
-  jresult = result; 
-  return jresult;
+SWIGEXPORT unsigned int SWIGSTDCALL CSharp_IPSecCtx_getSpiPS(void * jarg1)
+{
+    unsigned int jresult ;
+    IPSecCtx *arg1 = (IPSecCtx *) 0 ;
+    tipsec_spi_t result;
+
+    arg1 = (IPSecCtx *)jarg1;
+    result = (tipsec_spi_t)(arg1)->getSpiPS();
+    jresult = result;
+    return jresult;
 }
 
 
diff --git a/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.h b/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.h
index 49aa0fe..30b3b0e 100755
--- a/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.h
+++ b/Samples/C#/IPSec/ipsec_lib/ipsecWRAP.h
@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
  * Version 2.0.9
- * 
- * This file is not intended to be easily readable and contains a number of 
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #ifndef SWIG_ipsec_lib_WRAP_H_
diff --git a/Samples/C++/REGISTER/test/targetver.h b/Samples/C++/REGISTER/test/targetver.h
index 6fe8eb7..5697f1a 100755
--- a/Samples/C++/REGISTER/test/targetver.h
+++ b/Samples/C++/REGISTER/test/targetver.h
@@ -1,8 +1,8 @@
 #pragma once
 
 // The following macros define the minimum required platform.  The minimum required platform
-// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run 
-// your application.  The macros work by enabling all features available on platform versions up to and 
+// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run
+// your application.  The macros work by enabling all features available on platform versions up to and
 // including the version specified.
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.