From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 25 Oct 2016 14:30:12 +0000 (+0000)
Subject: -missing commit
X-Git-Tag: initial-import-from-subversion-38251~54
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da627cbf2b7bc36c48e8a1181282d96948cc5c39;p=oweals%2Fgnunet.git

-missing commit
---

diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index f28879df7..945f3ca59 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -140,7 +140,7 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
 int
 GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
 				  const char *mem,
-				  const size_t size,
+				  size_t size,
 				  int allow_inline);
 
 
diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h
index db7eb2148..ad3438538 100644
--- a/src/include/gnunet_nat_service.h
+++ b/src/include/gnunet_nat_service.h
@@ -442,9 +442,14 @@ enum GNUNET_NAT_Type
   GNUNET_NAT_TYPE_STUN_PUNCHED_NAT,
 
   /**
-   * WE can traverse using UPNP
+   * We can traverse using UPNP
    */
-  GNUNET_NAT_TYPE_UPNP_NAT
+  GNUNET_NAT_TYPE_UPNP_NAT,
+
+  /**
+   * We know nothing about the NAT.
+   */
+  GNUNET_NAT_TYPE_UNKNOWN
 
 };