Merge branch 'license/spdx'

[oweals/gnunet.git] / src / ats / gnunet-service-ats_connectivity.h

diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h
index e677c054d6f468debb001700cf569b5987afd5da..891a923dbc90e2d35eb27a136d6864e4d7372610 100644 (file)
--- a/src/ats/gnunet-service-ats_connectivity.h
+++ b/src/ats/gnunet-service-ats_connectivity.h
@@ -1,69 +1,67 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-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.
+     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., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file ats/gnunet-service-ats_connectivity.h
  * @brief ats service, interaction with 'connecivity' API
  * @author Matthias Wachs
  * @author Christian Grothoff
- *
- * TODO: will need API to query connectivity requests!
  */
 #ifndef GNUNET_SERVICE_ATS_CONNECTIVITY_H
 #define GNUNET_SERVICE_ATS_CONNECTIVITY_H
 
+#include "ats.h"
+
 
 /**
  * Is the given peer in the list of peers for which we
  * have an address request?
  *
+ * @param cls unused, NULL
  * @param peer peer to query for
  * @return #GNUNET_YES if so, #GNUNET_NO if not
  */
-int
-GAS_connectivity_has_peer (const struct GNUNET_PeerIdentity *peer);
+unsigned int
+GAS_connectivity_has_peer (void *cls,
+                           const struct GNUNET_PeerIdentity *peer);
 
 
 /**
  * Handle 'request address' messages from clients.
  *
- * @param cls unused, NULL
  * @param client client that sent the request
- * @param message the request message
+ * @param msg the request message
  */
 void
-GAS_handle_request_address (void *cls,
-                            struct GNUNET_SERVER_Client *client,
-                            const struct GNUNET_MessageHeader *message);
+GAS_handle_request_address (struct GNUNET_SERVICE_Client *client,
+                            const struct RequestAddressMessage *msg);
 
 
 /**
  * Cancel 'request address' messages from clients.
  *
- * @param cls unused, NULL
  * @param client client that sent the request
- * @param message the request message
+ * @param msg the request message
  */
 void
-GAS_handle_request_address_cancel (void *cls,
-                                   struct GNUNET_SERVER_Client *client,
-                                   const struct GNUNET_MessageHeader *message);
+GAS_handle_request_address_cancel (struct GNUNET_SERVICE_Client *client,
+                                   const struct RequestAddressMessage *msg);
 
 
 /**
@@ -73,7 +71,7 @@ GAS_handle_request_address_cancel (void *cls,
  * @param client handle of the (now dead) client
  */
 void
-GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client);
+GAS_connectivity_remove_client (struct GNUNET_SERVICE_Client *client);
 
 
 /**