NAMESTORE/JSON: fix parsing exp and flags

[oweals/gnunet.git] / src / nat-auto / nat-auto.h

diff --git a/src/nat-auto/nat-auto.h b/src/nat-auto/nat-auto.h
index 150dc32c24e44b63880d4adbd6f7487502d3b724..76d877dd3cba48863b8fb1feb6dc2460dba879c2 100644 (file)
--- a/src/nat-auto/nat-auto.h
+++ b/src/nat-auto/nat-auto.h
@@ -2,20 +2,20 @@
      This file is part of GNUnet.
      Copyright (C) 2011, 2016, 2017 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -36,7 +36,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * Request to test NAT traversal, sent to the gnunet-nat-server
  * (not the service!).
  */
-struct GNUNET_NAT_TestMessage
+struct GNUNET_NAT_AUTO_TestMessage
 {
   /**
    * Header with type #GNUNET_MESSAGE_TYPE_NAT_TEST
@@ -69,7 +69,7 @@ struct GNUNET_NAT_TestMessage
 /**
  * Client requesting automatic configuration.
  */
-struct GNUNET_NAT_AutoconfigRequestMessage
+struct GNUNET_NAT_AUTO_AutoconfigRequestMessage
 {
   /**
    * Header with type #GNUNET_MESSAGE_TYPE_NAT_REQUEST_AUTO_CFG
@@ -84,7 +84,7 @@ struct GNUNET_NAT_AutoconfigRequestMessage
 /**
  * Service responding with proposed configuration.
  */
-struct GNUNET_NAT_AutoconfigResultMessage
+struct GNUNET_NAT_AUTO_AutoconfigResultMessage
 {
   /**
    * Header with type #GNUNET_MESSAGE_TYPE_NAT_AUTO_CFG_RESULT