projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://gnunet.org/gnunet
[oweals/gnunet.git]
/
src
/
dv
/
dv.h
diff --git
a/src/dv/dv.h
b/src/dv/dv.h
index cfa09409ef969e48856d26971d85777d22ee44f5..844cfb5e1cfb5c72724b649cb27562ae476671fc 100644
(file)
--- a/
src/dv/dv.h
+++ b/
src/dv/dv.h
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013 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
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
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-37,7
+37,7
@@
GNUNET_NETWORK_STRUCT_BEGIN
struct GNUNET_DV_ConnectMessage
{
/**
struct GNUNET_DV_ConnectMessage
{
/**
- * Type:
GNUNET_MESSAGE_TYPE_TRANSPORT
_DV_CONNECT
+ * Type:
#GNUNET_MESSAGE_TYPE
_DV_CONNECT
*/
struct GNUNET_MessageHeader header;
*/
struct GNUNET_MessageHeader header;
@@
-51,6
+51,11
@@
struct GNUNET_DV_ConnectMessage
*/
struct GNUNET_PeerIdentity peer;
*/
struct GNUNET_PeerIdentity peer;
+ /**
+ * The network the peer is in
+ */
+ uint32_t network GNUNET_PACKED;
+
};
};
@@
-64,14
+69,14
@@
struct GNUNET_DV_ConnectMessage
struct GNUNET_DV_DisconnectMessage
{
/**
struct GNUNET_DV_DisconnectMessage
{
/**
- * Type:
GNUNET_MESSAGE_TYPE_TRANSPORT
_DV_DISCONNECT
+ * Type:
#GNUNET_MESSAGE_TYPE
_DV_DISCONNECT
*/
struct GNUNET_MessageHeader header;
/**
*/
struct GNUNET_MessageHeader header;
/**
- *
The distance to the peer that we used to have
+ *
Always zero.
*/
*/
- uint32_t
distance
GNUNET_PACKED;
+ uint32_t
reserved
GNUNET_PACKED;
/**
* The peer that is no longer available.
/**
* The peer that is no longer available.
@@
-91,7
+96,7
@@
struct GNUNET_DV_DisconnectMessage
struct GNUNET_DV_ReceivedMessage
{
/**
struct GNUNET_DV_ReceivedMessage
{
/**
- * Type:
GNUNET_MESSAGE_TYPE_TRANSPORT
_DV_RECV
+ * Type:
#GNUNET_MESSAGE_TYPE
_DV_RECV
*/
struct GNUNET_MessageHeader header;
*/
struct GNUNET_MessageHeader header;
@@
-116,14
+121,14
@@
struct GNUNET_DV_ReceivedMessage
struct GNUNET_DV_SendMessage
{
/**
struct GNUNET_DV_SendMessage
{
/**
- * Type: GNUNET_MESSAGE_TYPE_DV_SEND
+ * Type:
#
GNUNET_MESSAGE_TYPE_DV_SEND
*/
struct GNUNET_MessageHeader header;
/**
*/
struct GNUNET_MessageHeader header;
/**
- *
Unique ID for this message, for confirm callback
.
+ *
Reserved for alignment. 0
.
*/
*/
- uint32_t
ui
d GNUNET_PACKED;
+ uint32_t
reserve
d GNUNET_PACKED;
/**
* The (actual) target of the message
/**
* The (actual) target of the message
@@
-134,27
+139,34
@@
struct GNUNET_DV_SendMessage
/**
/**
- * Message from service to DV plugin, saying that
a
- *
SEND request was handled.
+ * Message from service to DV plugin, saying that
our
+ *
distance to another peer changed.
*/
*/
-struct GNUNET_DV_
Ack
Message
+struct GNUNET_DV_
DistanceUpdate
Message
{
/**
{
/**
- * Type:
GNUNET_MESSAGE_TYPE_DV_SEND_ACK
- */
+ * Type:
#GNUNET_MESSAGE_TYPE_DV_DISTANCE_CHANGED.
+ */
struct GNUNET_MessageHeader header;
/**
struct GNUNET_MessageHeader header;
/**
- * Wh
ich message is being acknowledged
?
+ * Wh
at is the new distance
?
*/
*/
- uint32_t
uid
GNUNET_PACKED;
+ uint32_t
distance
GNUNET_PACKED;
/**
/**
- * The
(actual) target of the message
+ * The
peer for which the distance changed.
*/
*/
- struct GNUNET_PeerIdentity target;
+ struct GNUNET_PeerIdentity peer;
+
+ /**
+ * The network the peer is in
+ */
+ uint32_t network GNUNET_PACKED;
};
};
+
+
GNUNET_NETWORK_STRUCT_END
#endif
GNUNET_NETWORK_STRUCT_END
#endif