Merge branch 'master' of git+ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / transport / gnunet-transport.c

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 8624b09b42a2a3b2db06bc9e82322abe6aa955c4..c3c1afc38b7f0630e87c169b1526e17c0a1b5c98 100644 (file)
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -2,20 +2,20 @@
  This file is part of GNUnet.
  Copyright (C) 2011-2014, 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 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.
+ 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/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 
 /**
@@ -491,7 +491,7 @@ operation_timeout (void *cls)
     }
     FPRINTF (stdout,
              "%s",
-             _("Failed to list connections, timeout occured\n"));
+             _("Failed to list connections, timeout occurred\n"));
     GNUNET_SCHEDULER_shutdown ();
     ret = 1;
     return;
@@ -1428,49 +1428,49 @@ main (int argc,
 {
   int res;
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_SET_ONE ('a',
+    GNUNET_GETOPT_option_flag ('a',
                                   "all",
                                   gettext_noop ("print information for all peers (instead of only connected peers)"),
                                   &iterate_all),
-    GNUNET_GETOPT_OPTION_SET_ONE ('b',
+    GNUNET_GETOPT_option_flag ('b',
                                   "benchmark",
                                   gettext_noop ("measure how fast we are receiving data from all peers (until CTRL-C)"),
                                   &benchmark_receive),
-    GNUNET_GETOPT_OPTION_SET_ONE ('D',
+    GNUNET_GETOPT_option_flag ('D',
                                   "disconnect",
                                   gettext_noop ("disconnect from a peer"),
                                   &do_disconnect),
-    GNUNET_GETOPT_OPTION_SET_ONE ('i',
+    GNUNET_GETOPT_option_flag ('i',
                                   "information",
                                   gettext_noop ("provide information about all current connections (once)"),
                                   &iterate_connections),
-    GNUNET_GETOPT_OPTION_SET_ONE ('m',
+    GNUNET_GETOPT_option_flag ('m',
                                   "monitor",
                                   gettext_noop ("provide information about all current connections (continuously)"),
                                   &monitor_connections),
-    GNUNET_GETOPT_OPTION_SET_ONE ('e',
+    GNUNET_GETOPT_option_flag ('e',
                                   "events",
                                   gettext_noop ("provide information about all connects and disconnect events (continuously)"),
                                   &monitor_connects),
-    GNUNET_GETOPT_OPTION_SET_ONE ('n',
+    GNUNET_GETOPT_option_flag ('n',
                                   "numeric",
                                   gettext_noop ("do not resolve hostnames"),
                                   &numeric),
-    GNUNET_GETOPT_OPTION_SET_BASE32_AUTO ('p',
+    GNUNET_GETOPT_option_base32_auto ('p',
                                           "peer",
                                           "PEER",
                                           gettext_noop ("peer identity"),
                                           &pid),
-    GNUNET_GETOPT_OPTION_SET_ONE ('P',
+    GNUNET_GETOPT_option_flag ('P',
                                   "plugins",
                                   gettext_noop ("monitor plugin sessions"),
                                   &monitor_plugins),
-    GNUNET_GETOPT_OPTION_SET_ONE ('s',
+    GNUNET_GETOPT_option_flag ('s',
                                   "send",
                                   gettext_noop
       ("send data for benchmarking to the other peer (until CTRL-C)"),
                                   &benchmark_send),
-    GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
+    GNUNET_GETOPT_option_verbose (&verbosity),
     GNUNET_GETOPT_OPTION_END
   };