-missing commit

diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index f28879df7ce3cef6e092464f921094be844f1e04..945f3ca5926945a71520df4cff9f879892ab1445 100644 (file)
--- 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 db7eb2148c65c0d95a9140cd2927f4a2cc5206a8..ad3438538d19f40d5e59906b411997343dacc9f2 100644 (file)
--- 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
 
 };