X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Ftest_stun.c;h=630538162babc84421980957a2d0a7987c5f937b;hb=1eb0a7b0bcc365263e11ba03def10d51976ff32a;hp=5855addd7dfed00e4ae00528facecb5e55b60924;hpb=0ecd945a968543984a5757b938f5ff872c1c2da3;p=oweals%2Fgnunet.git diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c index 5855addd7..630538162 100644 --- a/src/nat/test_stun.c +++ b/src/nat/test_stun.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - Copyright (C) 2009, 2015 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2015 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. - - 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. + 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 . */ /** @@ -112,18 +110,18 @@ stop () * incoming connection. * * @param cls - * @param tc scheduler context */ static void -do_udp_read (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_udp_read (void *cls) { //struct GNUNET_NAT_Test *tst = cls; unsigned char reply_buf[1024]; ssize_t rlen; struct sockaddr_in answer; + const struct GNUNET_SCHEDULER_TaskContext *tc; ltask4 = NULL; + tc = GNUNET_SCHEDULER_get_task_context (); if ( (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) || (! GNUNET_NETWORK_fdset_isset (tc->read_ready, lsock4)) ) @@ -247,7 +245,7 @@ run (void *cls, } GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Service listens on port %u\n", - port); + (unsigned int) port); rh = GNUNET_NAT_stun_make_request (stun_server, stun_port, lsock4,