Merge branch 'master' of gnunet.org:gnunet

4 files changed, 37 insertions, 23 deletions

diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index ac3d11216..b8326657d 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      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/>.
 
@@ -369,7 +369,7 @@ GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel,
 
 /**
  * Internal details about a channel.
- */ 
+ */
 struct GNUNET_CADET_ChannelInternals
 {
   /**
@@ -431,7 +431,7 @@ GNUNET_CADET_get_channel_cancel (struct GNUNET_CADET_ChannelMonitor *cm);
 
 /**
  * Information we return per peer.
- */ 
+ */
 struct GNUNET_CADET_PeerListEntry
 {
   /**
@@ -446,7 +446,7 @@ struct GNUNET_CADET_PeerListEntry
 
   /**
    * Number of disjoint known paths to @e peer.
-   */ 
+   */
   unsigned int n_paths;
 
   /**
@@ -504,7 +504,7 @@ GNUNET_CADET_list_peers_cancel (struct GNUNET_CADET_PeersLister *pl);
 
 /**
  * Detailed information we return per peer.
- */ 
+ */
 struct GNUNET_CADET_PeerPathDetail
 {
   /**
@@ -513,6 +513,11 @@ struct GNUNET_CADET_PeerPathDetail
   struct GNUNET_PeerIdentity peer;
 
   /**
+   * Offset of the target peer on the @e path.
+   */
+  unsigned int target_offset;
+
+  /**
    * Number of entries on the @e path.
    */
   unsigned int path_length;
@@ -583,7 +588,7 @@ struct GNUNET_CADET_TunnelDetails
 
   /**
    * How many channels use the tunnel.
-   */ 
+   */
   uint32_t channels;
 
   /**
@@ -597,8 +602,8 @@ struct GNUNET_CADET_TunnelDetails
   uint16_t estate;
 
   /**
-   * What is our connectivity state? 
-   */ 
+   * What is our connectivity state?
+   */
   uint16_t cstate;
 };
 
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index c2256fd0a..fcd422701 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -526,7 +526,7 @@ GNUNET_HELLO_extract_address (const void *raw,
  *
  * @param address a peer's address
  * @return NULL if the address is mal-formed, otherwise the prefix
- */ 
+ */
 char *
 GNUNET_HELLO_address_to_prefix (const char *address);
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 793430184..29db8372f 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -3106,40 +3106,47 @@ extern "C"
 /**
  * Type of a fragment of a CORE message created by transport to adjust
  * message length to a queue's MTU.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_FRAGMENT 1214
 
-/** 
+/**
  * Acknowledgement generated for a fragment.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_FRAGMENT_ACK 1215
 
-/** 
+/**
  * Wrapper around non-fragmented CORE message used to measure RTT
  * and ensure reliability.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX 1216
 
-/** 
+/**
  * Confirmation for a #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_BOX.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK 1217
 
-/** 
+/**
  * Message sent for topology discovery at transport level.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_DV_LEARN 1218
 
-/** 
+/**
  * Source-routed transport message based DV information gathered.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_DV_BOX 1219
 
 /**
  * Transport signalling incoming backchannel message to a communicator.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL_INCOMING 1220
 
+/**
+ * We learned a possible network address of another peer. Transport
+ * should consider verifying it, and if successful, remembering it
+ * in the Peerstore.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_CONSIDER_VERIFY 1221
+
 
 /**
  * Message sent to indicate to the transport that a monitor
@@ -3230,7 +3237,7 @@ extern "C"
 
 /**
  * TCP communicator end of stream.
- */ 
+ */
 #define GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_FINISH 1452
 
 /**
diff --git a/src/include/gnunet_transport_address_service.h b/src/include/gnunet_transport_address_service.h
index 86d0a423e..9f0717d00 100644
--- a/src/include/gnunet_transport_address_service.h
+++ b/src/include/gnunet_transport_address_service.h
@@ -90,11 +90,13 @@ GNUNET_TRANSPORT_address_disconnect (struct GNUNET_TRANSPORT_AddressHandle *ch);
  * lost.
  *
  * @param ch communicator handle
+ * @param pid peer the address is for
  * @param raw raw address data
  * @param raw_size number of bytes in @a raw
  */
 void
-GNUNET_TRANSPORT_address_try (struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
+GNUNET_TRANSPORT_address_try (struct GNUNET_TRANSPORT_AddressHandle *ch,
+                              const struct GNUNET_PeerIdentity *pid,
                               const void *raw,
                               const size_t raw_size);