X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Ftest_nat_mini.c;h=bb0fa07a0ee2aa35762ccc935ecfbcad38b6bf54;hb=d72d8e05401ace44b57432463f136bcfe55cee03;hp=c503a837ab03af8884040f8a661c515d6b8ad772;hpb=dc7bd3da0953c2614edd915c27ca40b7f1cfd249;p=oweals%2Fgnunet.git diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index c503a837a..bb0fa07a0 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009, 2011 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2011 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -42,13 +42,24 @@ * believes to be valid for the transport. */ static void -addr_callback (void *cls, int add_remove, const struct sockaddr *addr, - socklen_t addrlen) +addr_callback (void *cls, int add_remove, + const struct sockaddr *addr, + socklen_t addrlen, + enum GNUNET_NAT_StatusCode ret) { - fprintf (stderr, "Address changed: %s `%s' (%u bytes)\n", - add_remove == GNUNET_YES ? "added" : "removed", GNUNET_a2s (addr, - addrlen), + if (GNUNET_NAT_ERROR_SUCCESS == ret) + { + fprintf (stderr, + "Address changed: %s `%s' (%u bytes)\n", + add_remove == GNUNET_YES + ? "added" : "removed", + GNUNET_a2s (addr, + addrlen), (unsigned int) addrlen); + } + else + ; + //TODO: proper error handling! } @@ -76,7 +87,8 @@ run (void *cls, char *const *args, const char *cfgfile, struct GNUNET_NAT_MiniHandle *mini; GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Requesting NAT redirection for port %u...\n", PORT); + "Requesting NAT redirection for port %u...\n", + PORT); mini = GNUNET_NAT_mini_map_start (PORT, GNUNET_YES /* tcp */ , &addr_callback, NULL); if (NULL == mini)