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 gnunet.org:gnunet
[oweals/gnunet.git]
/
src
/
gns
/
plugin_gnsrecord_gns.c
diff --git
a/src/gns/plugin_gnsrecord_gns.c
b/src/gns/plugin_gnsrecord_gns.c
index 6adad0f3480ab4a24e7442009db1dbd5a757d4d8..ebba0db47c6218e7ad7d4066006a4df9e37dc42e 100644
(file)
--- a/
src/gns/plugin_gnsrecord_gns.c
+++ b/
src/gns/plugin_gnsrecord_gns.c
@@
-2,20
+2,20
@@
This file is part of GNUnet
Copyright (C) 2013, 2014, 2016 GNUnet e.V.
This file is part of GNUnet
Copyright (C) 2013, 2014, 2016 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,
+ o
r (at your o
ption) 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
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
*/
/**
@@
-102,9
+102,9
@@
gns_value_to_string (void *cls,
('\0' != cdata[data_size - 1]) )
return NULL; /* malformed */
/* need to memcpy for alignment */
('\0' != cdata[data_size - 1]) )
return NULL; /* malformed */
/* need to memcpy for alignment */
- memcpy (&vpn,
- data,
- sizeof (vpn));
+
GNUNET_
memcpy (&vpn,
+
data,
+
sizeof (vpn));
GNUNET_asprintf (&vpn_str,
"%u %s %s",
(unsigned int) ntohs (vpn.proto),
GNUNET_asprintf (&vpn_str,
"%u %s %s",
(unsigned int) ntohs (vpn.proto),
@@
-122,9
+122,9
@@
gns_value_to_string (void *cls,
cdata = data;
if (data_size < sizeof (struct GNUNET_GNSRECORD_BoxRecord))
return NULL; /* malformed */
cdata = data;
if (data_size < sizeof (struct GNUNET_GNSRECORD_BoxRecord))
return NULL; /* malformed */
- memcpy (&box,
- data,
- sizeof (box));
+
GNUNET_
memcpy (&box,
+
data,
+
sizeof (box));
rt = ntohl (box.record_type);
ival = GNUNET_GNSRECORD_value_to_string (rt,
&cdata[sizeof (box)],
rt = ntohl (box.record_type);
ival = GNUNET_GNSRECORD_value_to_string (rt,
&cdata[sizeof (box)],
@@
-173,7
+173,9
@@
gns_string_to_value (void *cls,
case GNUNET_GNSRECORD_TYPE_PKEY:
if (GNUNET_OK !=
case GNUNET_GNSRECORD_TYPE_PKEY:
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey))
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (s,
+ strlen (s),
+ &pkey))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Unable to parse PKEY record `%s'\n"),
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Unable to parse PKEY record `%s'\n"),
@@
-181,7
+183,9
@@
gns_string_to_value (void *cls,
return GNUNET_SYSERR;
}
*data = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
return GNUNET_SYSERR;
}
*data = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
- GNUNET_memcpy (*data, &pkey, sizeof (pkey));
+ GNUNET_memcpy (*data,
+ &pkey,
+ sizeof (pkey));
*data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
return GNUNET_OK;
*data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
return GNUNET_OK;
@@
-234,7
+238,9
@@
gns_string_to_value (void *cls,
GNUNET_free (cpy);
*data_size = off;
*data = GNUNET_malloc (off);
GNUNET_free (cpy);
*data_size = off;
*data = GNUNET_malloc (off);
- GNUNET_memcpy (*data, nsbuf, off);
+ GNUNET_memcpy (*data,
+ nsbuf,
+ off);
return GNUNET_OK;
}
case GNUNET_GNSRECORD_TYPE_VPN:
return GNUNET_OK;
}
case GNUNET_GNSRECORD_TYPE_VPN: