projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into credentials
[oweals/gnunet.git]
/
src
/
gns
/
gns.h
diff --git
a/src/gns/gns.h
b/src/gns/gns.h
index 24f543f71e8685ecc65cc20709c17e5f39332c14..d77bf53c6aed09e31e73034859826f4145e5d96c 100644
(file)
--- a/
src/gns/gns.h
+++ b/
src/gns/gns.h
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
This file is part of GNUnet
- (C) 2012-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012-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.
*/
/**
* @file gns/gns.h
*/
/**
* @file gns/gns.h
@@
-48,7
+48,7
@@
GNUNET_NETWORK_STRUCT_BEGIN
/**
* Message from client to GNS service to lookup records.
*/
/**
* Message from client to GNS service to lookup records.
*/
-struct
GNUNET_GNS_Client
LookupMessage
+struct LookupMessage
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP
@@
-63,36
+63,32
@@
struct GNUNET_GNS_ClientLookupMessage
/**
* Zone that is to be used for lookup
*/
/**
* Zone that is to be used for lookup
*/
- struct GNUNET_CRYPTO_Ec
cPublicSign
Key zone;
+ struct GNUNET_CRYPTO_Ec
dsaPublic
Key zone;
/**
/**
- * Only check cached results
+ * Local options for where to look for results
+ * (an `enum GNUNET_GNS_LocalOptions` in NBO).
*/
*/
- int16_t o
nly_cached
GNUNET_PACKED;
+ int16_t o
ptions
GNUNET_PACKED;
/**
/**
- *
Is a shorten key attached?
+ *
Always 0.
*/
*/
- int16_t
have_key
GNUNET_PACKED;
+ int16_t
reserved
GNUNET_PACKED;
/**
* the type of record to look up
*/
int32_t type GNUNET_PACKED;
/**
* the type of record to look up
*/
int32_t type GNUNET_PACKED;
-
- /**
- * The key for shorten, if @e have_key is set
- */
- struct GNUNET_CRYPTO_EccPrivateKey shorten_key;
- /* Followed by the name to look up */
+ /* Followed by the
zero-terminated
name to look up */
};
/**
* Message from GNS service to client: new results.
*/
};
/**
* Message from GNS service to client: new results.
*/
-struct
GNUNET_GNS_Client
LookupResultMessage
+struct LookupResultMessage
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT
@@
-106,10
+102,10
@@
struct GNUNET_GNS_ClientLookupResultMessage
/**
* The number of records contained in response
/**
* The number of records contained in response
- */
+ */
uint32_t rd_count GNUNET_PACKED;
uint32_t rd_count GNUNET_PACKED;
- /* followed by rd_count GNUNET_
NAMESTORE_Record
Data structs*/
+ /* followed by rd_count GNUNET_
GNSRECORD_
Data structs*/
};
};