commit 7141b7243358344e865c4ce2c9692872fc9006cb
parent 1a7d4c9c0cd885169153a64e2b1132b0ddec7501
Author: ng0 <ng0@n0.is>
Date: Tue, 16 Jan 2018 13:12:59 +0000
Merge branch 'master' of gnunet.org:gnunet
Diffstat:
6 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/contrib/ssh-keys b/contrib/ssh-keys
@@ -18,3 +18,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4/0jIkaaWtGolhWJPijpaPA1QHeQNlaZTc3wlCr/P
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4UL53uXZCis1C9VNWJjVXTtyRHVmzFmg3vajTXrRF6LBYpEtDRA3OCtzCsj88AlL2VEtIiBWBqZrntE0TKDia1Czru3sM1ieKCra1F1GlSj4Yk+7VaRSS1hGwMBUb0zyaiIHjizGH45+zL5TXeAiGbeiF/iiRJJG/qQ+txTXVg51QLuMv9W5wKs9Dz+o+vbbUwVaauJo/TmhVz1VFjqhQBOt9N/CtaTe84B1716/d/YTZLH1bmjxMja+a6aCyABaPM5JcMNYEZT2UMCP5fTyJRUpfNlimpdRkcxaA5/K8AKTW7R35cQpLrngnnOChUB+KT6683omDr2edXGqkWNsZ grothoff@firefly
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvbeMnZGlujN9IsLxUSTuHBUESoN6ZTXmEFi/GkBKp9RQ7xZAS84JDcV0GFddiCfTHGQL04mkeYXkof5d9NkMWjtTvQ9QFtUgGOqI3PbGCGW83vSwJHsqVbfbv5uqFCODjpTx4/WiJNkEpN/HgE2eIYFcm+Dcpo1vTgC26LjdMfqUaAGv/OTmKWmaMqyOzc4MXuUiBQT83oTfn2zSWDEOJG67yULqg5jMzaXqzPbhsaokBIPehks0bJR/q7OWNwDQJyM1oTKeRIh0ZmC0qYwGu/vlc3rYW4cp//ErAXG5iPfCXXUySUc0DTFHazzkNzUStuUwugznxuUCgbvg2tu5WEnrh/PpzIMuvNaUk2ZSDq00hHDrpVJyKKCih2d1cGV+qs9XFjDoD6Ch2NiSdPnG7fSsTxVw1SB7/APuMqfXWrQDfT5ee5xOKGzKOxQckGihQi39kmqf4WjNESOw4tmhNFZOee9dpC7ESYSpG/3zK8WG6FDln1nU6rHGjVgaSK6HwZUOsneS2fntiQZR2olzEY9+ybL1vh1fk6pkhS78X/PiwS3cSiu4q7JWJ4tUiB0T/cHAFBaODDKHXmEaGefLrPBWLLFRdjbnepWo1d0k1z/NLVovXDCGlF4IOBKqcImIffods/jTpH0hjU/vBjIQHH3Ii0J6vtGJw9whcNAGQfw== t3sserakt@posteo.de
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDRzeeUMJKn/9lY8FJIuU6HuQpWZozerTtbgsoGUNW0n0P/RsPYMQjweURDlJyKQisSZt+xRzRorSr0j9P016L8N13wGR9wtJwoJOi8DpwqEMxleYwPAZOu1zsA1Qty3ftNu6c3xB2wnlSPC0oZ2RYBOlxvIGtSGoNcDY43MKmsJ+IPsNpKOOS3x1J+xE7jOnQ0LHvxt4b54Sdr0uruTbHupwBbzBIxMFzS9hzEN6gL5cYp2fggZM8Qt707UlzIUuNzsU50qM6A8UJ+0Kun1GhKhK2J7T4Dok7M6m8ZtaKGexMfZwCl4luXlP/r1Kn48kXx/EtoQ/OcR23ymxZ95X+X8TB0ZdYcj17M7B+kk7OFz/2SVdJqYDqnMIOmXtAEdUsmSAmI7YxWyYOutRnEIkzQvHfW0h3D2pSA6EApR5huLOi40N5Ga3XLSBJC1yC8+qdiNE/t+5nGGxdlLvJ7VuzkwTEKQs33LNUdS4qKVBcIppZ7yUMjqJ5VzFk6xwEqGPCYcEWzYpNmzBiE/EFvwVSNV15Rknyieq7RB/gY/DNKX7yuC7lRZdEgGG6xu7l34c1ZhtIFhUGCnEtYsx5kJQFGMMP7bi/LNVnm+M7YZGp+uKgsnmWzrYw+YORzLwqBncs6N1tvwOG9DRKJ00S3JqSEDJ5FH/VDIUlWWbIgNwtAIQ== lurchi
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1WzIhCxeYQzjAHvwkSN7oQ3hhakwLzrTC6fXqnGUn71sQQKe4Rb2lmcUqVepnuKx2wEw3GLev89rVBSXwneiiVHwOEPNqFJXKHV5AsQbLYBvt9qlkK0Wff71Ptc9xB+M1qDVluA/4ieLDOemXYvkcK/6fqimyIdBMSlXSs2PKQkpjkAvE3qh0c41HKlagq7Y4rHV/chs1XPWCWX19ZO2EnZoVx6KeZHouc/FoE/lC7X1FudJxSKf5ZIcy3CIiYTQsL//hb6DT/mCgssCL+NtTDDXNsYiuIlj8Oi+nCpW/GkisIeyTZpbPiokDP+r0V3T8jcMbbGCVN6Um33lG2/LR amatus@atom
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
@@ -204,6 +204,7 @@ EXTRA_DIST = \
test_dht_multipeer.conf \
test_dht_2dtorus.conf \
test_dht_line.conf \
+ test_dht_tools.conf \
test_dht_tools.py.in \
test_dht_multipeer_topology.dat
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
@@ -100,8 +100,8 @@ extract_varsize_blob (void *cls,
idst = GNUNET_malloc (len);
*((void **) dst) = idst;
GNUNET_memcpy (idst,
- res,
- len);
+ res,
+ len);
return GNUNET_OK;
}
@@ -165,7 +165,7 @@ extract_fixed_blob (void *cls,
{
GNUNET_break (0);
return GNUNET_SYSERR;
- }
+ }
/* if a field is null, continue but
* remember that we now return a different result */
@@ -182,8 +182,8 @@ extract_fixed_blob (void *cls,
fnum);
GNUNET_assert (NULL != res);
GNUNET_memcpy (dst,
- res,
- len);
+ res,
+ len);
return GNUNET_OK;
}
@@ -580,7 +580,7 @@ extract_uint16 (void *cls,
if (PQgetisnull (result,
row,
fnum))
- {
+ {
GNUNET_break (0);
return GNUNET_SYSERR;
}
@@ -590,6 +590,14 @@ extract_uint16 (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
+ if (sizeof (uint16_t) !=
+ PQgetlength (result,
+ row,
+ fnum))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
res = (uint16_t *) PQgetvalue (result,
row,
fnum);
@@ -663,6 +671,14 @@ extract_uint32 (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
+ if (sizeof (uint32_t) !=
+ PQgetlength (result,
+ row,
+ fnum))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
res = (uint32_t *) PQgetvalue (result,
row,
fnum);
@@ -736,6 +752,14 @@ extract_uint64 (void *cls,
GNUNET_break (0);
return GNUNET_SYSERR;
}
+ if (sizeof (uint64_t) !=
+ PQgetlength (result,
+ row,
+ fnum))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
res = (uint64_t *) PQgetvalue (result,
row,
fnum);
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c
@@ -818,7 +818,6 @@ GNUNET_PSYC_transmit_cancel (struct GNUNET_PSYC_TransmitHandle *tmit)
/* FIXME */
struct GNUNET_MessageHeader msg;
- msg.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_DATA);
msg.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL);
msg.size = htons (sizeof (msg));
transmit_queue_insert (tmit, &msg, GNUNET_YES);
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
@@ -1296,7 +1296,7 @@ manage_service_wrapper (unsigned int i, unsigned int j,
enum PEER_ONLINE_DELTA delta,
double prob_go_on_off)
{
- struct OpListEntry *entry;
+ struct OpListEntry *entry = NULL;
uint32_t prob;
/* make sure that management operation is not already scheduled */
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
@@ -135,18 +135,6 @@ struct GNUNET_SCHEDULER_Task
unsigned int fds_len;
/**
- * if this task is related to multiple FDs this array contains
- * all FdInfo structs that were marked as ready by calling
- * #GNUNET_SCHEDULER_task_ready
- */
- struct GNUNET_SCHEDULER_FdInfo *ready_fds;
-
- /**
- * Size of the @e ready_fds array
- */
- unsigned int ready_fds_len;
-
- /**
* Do we own the network and file handles referenced by the FdInfo
* structs in the fds array. This will only be GNUNET_YES if the
* task was created by the #GNUNET_SCHEDULER_add_select function.
@@ -347,11 +335,6 @@ static struct GNUNET_SCHEDULER_Task *ready_tail[GNUNET_SCHEDULER_PRIORITY_COUNT]
static unsigned int ready_count;
/**
- * How many tasks have we run so far?
- */
-static unsigned long long tasks_run;
-
-/**
* Priority of the task running right now. Only
* valid while a task is running.
*/
@@ -561,10 +544,6 @@ destroy_task (struct GNUNET_SCHEDULER_Task *t)
{
GNUNET_array_grow (t->fds, t->fds_len, 0);
}
- if (t->ready_fds_len > 0)
- {
- GNUNET_array_grow (t->ready_fds, t->ready_fds_len, 0);
- }
#if EXECINFO
GNUNET_free (t->backtrace_strings);
#endif
@@ -2020,7 +1999,6 @@ GNUNET_SCHEDULER_run_from_driver (struct GNUNET_SCHEDULER_Handle *sh)
active_task = NULL;
dump_backtrace (pos);
destroy_task (pos);
- tasks_run++;
}
shutdown_if_no_lifeness ();
if (0 == ready_count)
