From 6403d1908d0a1833ade6959a30cf1334f6ce97fe Mon Sep 17 00:00:00 2001
From: Einar Gunnarsson <EG185040@corp.ncr.com>
Date: Wed, 17 Feb 2016 17:42:04 +0100
Subject: [PATCH 1/2] add missing TINS_API to PDU classes. Extend/fix ICMPv6
 enum values and unify naming

---
 include/tins/icmpv6.h     | 12 +++++++++---
 include/tins/mpls.h       |  3 ++-
 include/tins/pdu_cacher.h |  2 +-
 include/tins/udp.h        |  2 +-
 src/ip_address.cpp        |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/tins/icmpv6.h b/include/tins/icmpv6.h
index 228bd83..914d852 100644
--- a/include/tins/icmpv6.h
+++ b/include/tins/icmpv6.h
@@ -80,14 +80,20 @@ public:
         NEIGHBOUR_SOLICIT = 135,
         NEIGHBOUR_ADVERT = 136,
         REDIRECT = 137,
-        ROUTER_RENUMBER = 137,
+        ROUTER_RENUMBER = 138,
         NI_QUERY = 139,
         NI_REPLY = 140,
         MLD2_REPORT = 143,
         DHAAD_REQUEST = 144,
         DHAAD_REPLY = 145,
-        MOBILE_PREFIX_SOL = 146,
-        MOBILE_PREFIX_ADV = 147
+        MOBILE_PREFIX_SOLICIT = 146,
+        MOBILE_PREFIX_ADVERT = 147,
+        CERT_PATH_SOLICIT = 148,
+        CERT_PATH_ADVERT = 149,
+        MULTICAST_ROUTER_ADVERT = 151,
+        MULTICAST_ROUTER_SOLICIT = 152,
+        MULTICAST_ROUTER_TERMINATE = 153,
+        RPL_CONTROL_MSG = 155
     };
     
     /**
diff --git a/include/tins/mpls.h b/include/tins/mpls.h
index 36a3fa3..9da8419 100644
--- a/include/tins/mpls.h
+++ b/include/tins/mpls.h
@@ -40,9 +40,10 @@ namespace Tins {
 class ICMPExtension;
 
 /**
+ * \class MPLS
  * \brief Represents an MPLS PDU
  */
-class MPLS : public PDU {
+class TINS_API MPLS : public PDU {
 public:
     /**
      * \brief This PDU's flag.
diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index ebab9b1..714ef98 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -53,7 +53,7 @@ namespace Tins {
  * etc.
  */
 template <typename T>
-class PDUCacher : public PDU {
+class TINS_API PDUCacher : public PDU {
 public:
     /**
      * The cached PDU type.
diff --git a/include/tins/udp.h b/include/tins/udp.h
index 9badf83..5217751 100644
--- a/include/tins/udp.h
+++ b/include/tins/udp.h
@@ -60,7 +60,7 @@ namespace Tins {
  *
  * \sa RawPDU
  */
-class UDP : public PDU {
+class TINS_API UDP : public PDU {
 public:
     /**
      * \brief This PDU's flag.
diff --git a/src/ip_address.cpp b/src/ip_address.cpp
index 8177376..d876914 100644
--- a/src/ip_address.cpp
+++ b/src/ip_address.cpp
@@ -109,7 +109,7 @@ ostream& operator<<(ostream& output, const IPv4Address& addr) {
         }
         mask -= 8;
     }
-    return output;;
+    return output;
 }
 
 bool IPv4Address::is_private() const {

From f88d94cbaa73d6eb4246fbcd2e7e173666253486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Einar=20J=C3=B3n?= <tolvupostur@gmail.com>
Date: Wed, 17 Feb 2016 19:16:15 +0100
Subject: [PATCH 2/2] Remove TINS_API from template PDU class

---
 include/tins/pdu_cacher.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tins/pdu_cacher.h b/include/tins/pdu_cacher.h
index 714ef98..ebab9b1 100644
--- a/include/tins/pdu_cacher.h
+++ b/include/tins/pdu_cacher.h
@@ -53,7 +53,7 @@ namespace Tins {
  * etc.
  */
 template <typename T>
-class TINS_API PDUCacher : public PDU {
+class PDUCacher : public PDU {
 public:
     /**
      * The cached PDU type.