X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-service-transport_plugins.c;h=c6c5e04442e4bf2c6360c398bc48ff6910c32b56;hb=5268a6fed72de00832cf075f480c03fe86952bb6;hp=cbfa50afd2e18712eb8314b2fde7b0f123e878cb;hpb=1c323bd4cbb388a9e7515a1f733a3062bf093aee;p=oweals%2Fgnunet.git diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c index cbfa50afd..c6c5e0444 100644 --- a/src/transport/gnunet-service-transport_plugins.c +++ b/src/transport/gnunet-service-transport_plugins.c @@ -1,21 +1,21 @@ /* This file is part of GNUnet. - Copyright (C) 2010-2014 Christian Grothoff (and other contributing authors) + Copyright (C) 2010-2014 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 . - 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. + SPDX-License-Identifier: AGPL3.0-or-later */ /** @@ -106,7 +106,7 @@ plugin_env_update_distance (void *cls, * @param addrlen length of the @a addr * @return type of the network @a addr belongs to */ -static enum GNUNET_ATS_Network_Type +static enum GNUNET_NetworkType plugin_env_address_to_type (void *cls, const struct sockaddr *addr, size_t addrlen) @@ -114,9 +114,9 @@ plugin_env_address_to_type (void *cls, if (NULL == GST_is) { GNUNET_break(0); - return GNUNET_ATS_NET_UNSPECIFIED; + return GNUNET_NT_UNSPECIFIED; } - return GNUNET_ATS_scanner_address_get_type (GST_is, + return GNUNET_NT_scanner_get_type (GST_is, addr, addrlen); } @@ -409,17 +409,26 @@ GST_plugins_a2s (const struct GNUNET_HELLO_Address *address) return TRANSPORT_SESSION_INBOUND_STRING; /* Addresse with length 0 are inbound, address->address itself may be NULL */ api = GST_plugins_printer_find (address->transport_name); if (NULL == api) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Failed to find transport plugin `%s'\n", + address->transport_name); return ""; + } if (0 == address->address_length) { - GNUNET_snprintf (unable_to_show, sizeof (unable_to_show), + GNUNET_snprintf (unable_to_show, + sizeof (unable_to_show), "", (unsigned int) address->address_length, address->transport_name); return unable_to_show; } - return (NULL != (s = api->address_to_string (NULL, address->address, - address->address_length)) ? s : ""); + return (NULL != (s = api->address_to_string (NULL, + address->address, + address->address_length)) + ? s + : ""); } @@ -440,7 +449,8 @@ GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb, GNUNET_break (0); else pos->api->setup_monitor (pos->api->cls, - cb, cb_cls); + cb, + cb_cls); }