[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8956 - in gnunet/src: core datastore fs peerinfo transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8956 - in gnunet/src: core datastore fs peerinfo transport util |
|
Date: |
Mon, 7 Sep 2009 05:58:04 -0600 |
Author: grothoff
Date: 2009-09-07 05:58:04 -0600 (Mon, 07 Sep 2009)
New Revision: 8956
Modified:
gnunet/src/core/core_api.c
gnunet/src/core/gnunet-service-core.c
gnunet/src/datastore/gnunet-service-datastore.c
gnunet/src/fs/fs_directory.c
gnunet/src/fs/fs_download.c
gnunet/src/fs/fs_search.c
gnunet/src/fs/fs_unindex.c
gnunet/src/fs/fs_uri.c
gnunet/src/peerinfo/gnunet-service-peerinfo.c
gnunet/src/peerinfo/peerinfo_api.c
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/util/configuration.c
gnunet/src/util/crypto_hash.c
gnunet/src/util/crypto_rsa.c
gnunet/src/util/disk.c
gnunet/src/util/getopt_helpers.c
gnunet/src/util/os_installation.c
gnunet/src/util/os_network.c
gnunet/src/util/test_crypto_aes_weak.c
gnunet/src/util/test_os_load.c
gnunet/src/util/test_scheduler.c
Log:
fixes
Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/core/core_api.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -272,11 +272,9 @@
timeout_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_CORE_TransmitHandle *th = cls;
- struct GNUNET_CORE_Handle *h;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmission request timed out.\n");
- h = th->ch;
th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_assert (0 == th->get_message (th->get_message_cls, 0, NULL));
GNUNET_CORE_notify_transmit_ready_cancel (th);
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2009-09-06 21:03:16 UTC (rev
8955)
+++ gnunet/src/core/gnunet-service-core.c 2009-09-07 11:58:04 UTC (rev
8956)
@@ -2918,7 +2918,6 @@
account for possibility of new neighbours joining any time
AND to convert to double... */
pref_rel = n->current_preference / (1.0 + preference_sum);
- share = 0;
distributable = 0;
if (bandwidth_target_out > neighbour_count * MIN_BPM_PER_PEER)
distributable = bandwidth_target_out - neighbour_count * MIN_BPM_PER_PEER;
Modified: gnunet/src/datastore/gnunet-service-datastore.c
===================================================================
--- gnunet/src/datastore/gnunet-service-datastore.c 2009-09-06 21:03:16 UTC
(rev 8955)
+++ gnunet/src/datastore/gnunet-service-datastore.c 2009-09-07 11:58:04 UTC
(rev 8956)
@@ -748,7 +748,6 @@
return;
}
prev = pos;
- pos = next;
}
GNUNET_break (0);
transmit_status (client, GNUNET_SYSERR, gettext_noop ("Could not find
matching reservation"));
Modified: gnunet/src/fs/fs_directory.c
===================================================================
--- gnunet/src/fs/fs_directory.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/fs/fs_directory.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -335,7 +335,8 @@
fsize = 0; /* not given */
if (fsize > MAX_INLINE_SIZE)
fsize = 0; /* too large */
- if (NULL != memchr (data, 0, fsize))
+ if ( (NULL == data) ||
+ (NULL != memchr (data, 0, fsize)) )
fsize = 0; /* must not have 0's in data! */
uris = GNUNET_FS_uri_to_string (uri);
slen = strlen (uris) + 1;
@@ -524,12 +525,11 @@
sizes[i] = pos->len;
pos = pos->next;
}
+ block_align (size,
+ bld->count,
+ sizes,
+ perm);
}
- block_align (size,
- bld->count,
- sizes,
- perm);
-
/* compute final size with alignment */
for (i = 0; i < bld->count; i++)
{
@@ -563,9 +563,12 @@
sizes[i]);
GNUNET_free (bes[i]);
}
- GNUNET_free (sizes);
- GNUNET_free (perm);
- GNUNET_free (bes);
+ if (bld->count > 0)
+ {
+ GNUNET_free (sizes);
+ GNUNET_free (perm);
+ GNUNET_free (bes);
+ }
GNUNET_assert (off == size);
GNUNET_CONTAINER_meta_data_destroy (bld->meta);
GNUNET_free (bld);
Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/fs/fs_download.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -669,8 +669,8 @@
return NULL;
// FIXME: add support for "loc" URIs!
GNUNET_assert (GNUNET_FS_uri_test_chk (uri));
- if ( (dc->offset + dc->length < dc->offset) ||
- (dc->offset + dc->length > uri->data.chk.file_length) )
+ if ( (offset + length < offset) ||
+ (offset + length > uri->data.chk.file_length) )
{
GNUNET_break (0);
return NULL;
Modified: gnunet/src/fs/fs_search.c
===================================================================
--- gnunet/src/fs/fs_search.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/fs/fs_search.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -766,9 +766,9 @@
_("Too many keywords specified for a single search."));
return NULL;
}
- client = GNUNET_CLIENT_connect (sc->h->sched,
+ client = GNUNET_CLIENT_connect (h->sched,
"fs",
- sc->h->cfg);
+ h->cfg);
if (NULL == client)
return NULL;
sc = GNUNET_malloc (sizeof(struct GNUNET_FS_SearchContext));
Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/fs/fs_unindex.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -223,8 +223,8 @@
}
GNUNET_DATASTORE_remove (uc->dsh,
query,
- block_size,
- block,
+ size,
+ data,
&process_cont,
uc,
GNUNET_CONSTANTS_SERVICE_TIMEOUT);
Modified: gnunet/src/fs/fs_uri.c
===================================================================
--- gnunet/src/fs/fs_uri.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/fs/fs_uri.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -492,7 +492,6 @@
bits = 0;
hbits = 0;
len = 0;
- pos = 0;
for (pos = 0; pos < size; pos++)
{
while (hbits < 8)
Modified: gnunet/src/peerinfo/gnunet-service-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-service-peerinfo.c 2009-09-06 21:03:16 UTC
(rev 8955)
+++ gnunet/src/peerinfo/gnunet-service-peerinfo.c 2009-09-07 11:58:04 UTC
(rev 8956)
@@ -206,11 +206,24 @@
{
size = GNUNET_DISK_fn_read (fn, buffer, sizeof (buffer));
hello = (const struct GNUNET_HELLO_Message *) buffer;
- now = GNUNET_TIME_absolute_get ();
- hello_clean = GNUNET_HELLO_iterate_addresses (hello,
- GNUNET_YES,
- &discard_expired, &now);
- entry->hello = hello_clean;
+ if ( (size < sizeof (struct GNUNET_MessageHeader)) ||
+ (size != ntohs((((const struct GNUNET_MessageHeader*)
hello)->size))) ||
+ (size != GNUNET_HELLO_size (hello)) )
+ {
+ GNUNET_break (0);
+ if (0 != UNLINK (fn))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ fn);
+ }
+ else
+ {
+ now = GNUNET_TIME_absolute_get ();
+ hello_clean = GNUNET_HELLO_iterate_addresses (hello,
+ GNUNET_YES,
+ &discard_expired, &now);
+ entry->hello = hello_clean;
+ }
}
GNUNET_free (fn);
entry->next = hosts;
Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/peerinfo/peerinfo_api.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -262,8 +262,8 @@
struct GNUNET_CLIENT_Connection *client;
struct ListAllPeersMessage *lapm;
struct ListPeerMessage *lpm;
- size_t hs;
struct InfoContext *ihc;
+ size_t hs;
client = GNUNET_CLIENT_connect (sched, "peerinfo", cfg);
if (client == NULL)
@@ -279,7 +279,6 @@
ihc->callback = callback;
ihc->callback_cls = callback_cls;
ihc->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- hs = 0;
if (peer == NULL)
{
lapm = (struct ListAllPeersMessage *) &ihc[1];
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2009-09-06 21:03:16 UTC
(rev 8955)
+++ gnunet/src/transport/gnunet-service-transport.c 2009-09-07 11:58:04 UTC
(rev 8956)
@@ -2178,7 +2178,8 @@
}
GNUNET_free (im);
}
- GNUNET_assert (NULL != service_context->neighbour);
+ GNUNET_assert ( (service_context == NULL) ||
+ (NULL != service_context->neighbour) );
return service_context;
}
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2009-09-06 21:03:16 UTC (rev
8955)
+++ gnunet/src/transport/plugin_transport_tcp.c 2009-09-07 11:58:04 UTC (rev
8956)
@@ -1340,7 +1340,6 @@
else
{
/* got more than acceptable */
- total_remaining = 0;
session->last_received -= total_allowed;
delta = 0;
}
Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/configuration.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -807,13 +807,11 @@
char *end;
char *match;
char old;
- int ret;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &list))
return GNUNET_NO;
match = escape_name (value);
- ret = 0;
pos = list;
while (1)
{
Modified: gnunet/src/util/crypto_hash.c
===================================================================
--- gnunet/src/util/crypto_hash.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/crypto_hash.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -214,10 +214,6 @@
state[5] += f;
state[6] += g;
state[7] += h;
-
- /* erase our data */
- a = b = c = d = e = f = g = h = t1 = t2 = 0;
- memset (W, 0, 80 * sizeof (unsigned long long));
}
static void
@@ -281,13 +277,13 @@
static unsigned char padding[128] = { 0x80, };
unsigned int t;
- unsigned long long t2;
unsigned char bits[128];
- unsigned int index, pad_len;
+ unsigned int index;
+ unsigned int pad_len;
+ unsigned long long t2;
int i, j;
- index = pad_len = t = i = j = 0;
- t2 = 0;
+ t = i = j = 0;
/* Save number of bits */
t = sctx->count[0];
Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/crypto_rsa.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -602,7 +602,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Could not aquire lock on file `%s' due to process
%u: %s...\n"),
- filename, fl.l_pid, STRERROR (errno));
+ filename, fl.l_pid, STRERROR (ec));
}
memset (&fl, 0, sizeof (struct flock));
fl.l_type = F_WRLCK;
@@ -624,7 +624,6 @@
fl.l_type = F_UNLCK;
fl.l_whence = SEEK_SET;
fl.l_len = sizeof (struct RsaPrivateKeyBinaryEncoded);
- cnt = 0;
if (0 != fcntl (fd, F_SETLK, &fl))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
"fcntl", filename);
@@ -659,7 +658,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Could not aquire lock on file `%s' due to process
%u: %s...\n"),
- filename, fl.l_pid, STRERROR (errno));
+ filename, fl.l_pid, STRERROR (ec));
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("This may be ok if someone is currently generating
a hostkey.\n"));
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/disk.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -1038,7 +1038,6 @@
#ifndef MINGW
mode = 0;
- oflags = 0;
if (GNUNET_DISK_OPEN_READWRITE == (flags & GNUNET_DISK_OPEN_READWRITE))
oflags = O_RDWR; /* note: O_RDWR is NOT always O_RDONLY | O_WRONLY */
else if (flags & GNUNET_DISK_OPEN_READ)
Modified: gnunet/src/util/getopt_helpers.c
===================================================================
--- gnunet/src/util/getopt_helpers.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/getopt_helpers.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -50,11 +50,11 @@
const char *value)
{
const char *about = scls;
- int slen;
- int i;
+ size_t slen;
+ unsigned int i;
int j;
- int ml;
- int p;
+ size_t ml;
+ size_t p;
char *scp;
const char *trans;
const struct GNUNET_GETOPT_CommandLineOption *opt;
@@ -62,7 +62,6 @@
printf ("%s\n%s\n", ctx->binaryOptions, gettext (about));
printf (_
("Arguments mandatory for long options are also mandatory for short
options.\n"));
- slen = 0;
i = 0;
opt = ctx->allOptions;
while (opt[i].description != NULL)
Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/os_installation.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -213,14 +213,12 @@
char *end;
char *buf;
const char *p;
- size_t size;
p = getenv ("PATH");
if (p == NULL)
return NULL;
path = GNUNET_strdup (p); /* because we write on it */
buf = GNUNET_malloc (strlen (path) + 20);
- size = strlen (path);
pos = path;
while (NULL != (end = strchr (pos, ':')))
Modified: gnunet/src/util/os_network.c
===================================================================
--- gnunet/src/util/os_network.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/os_network.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -163,13 +163,11 @@
#elif HAVE_GETIFADDRS && HAVE_FREEIFADDRS
struct ifaddrs *ifa_first;
+ struct ifaddrs *ifa_ptr;
socklen_t alen;
if (getifaddrs (&ifa_first) == 0)
{
- struct ifaddrs *ifa_ptr;
-
- ifa_ptr = ifa_first;
for (ifa_ptr = ifa_first; ifa_ptr != NULL; ifa_ptr = ifa_ptr->ifa_next)
{
if (ifa_ptr->ifa_name != NULL &&
Modified: gnunet/src/util/test_crypto_aes_weak.c
===================================================================
--- gnunet/src/util/test_crypto_aes_weak.c 2009-09-06 21:03:16 UTC (rev
8955)
+++ gnunet/src/util/test_crypto_aes_weak.c 2009-09-07 11:58:04 UTC (rev
8956)
@@ -145,7 +145,6 @@
{
printf ("testweakkey: gcry_cipher_open failed on trial %d. %s\n",
number_of_runs, gcry_strerror (rc));
- rc = 0;
continue;
}
Modified: gnunet/src/util/test_os_load.c
===================================================================
--- gnunet/src/util/test_os_load.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/test_os_load.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -165,7 +165,7 @@
}
fprintf (stderr, "\n");
GNUNET_CONFIGURATION_destroy (cfg);
- return 0;
+ return ret;
}
int
Modified: gnunet/src/util/test_scheduler.c
===================================================================
--- gnunet/src/util/test_scheduler.c 2009-09-06 21:03:16 UTC (rev 8955)
+++ gnunet/src/util/test_scheduler.c 2009-09-07 11:58:04 UTC (rev 8956)
@@ -138,7 +138,6 @@
{
int *ok = cls;
GNUNET_SCHEDULER_TaskIdentifier t2;
- GNUNET_SCHEDULER_TaskIdentifier t3;
GNUNET_SCHEDULER_TaskIdentifier t4;
GNUNET_assert (1 == *ok);
@@ -154,12 +153,12 @@
GNUNET_NO,
GNUNET_SCHEDULER_PRIORITY_IDLE,
t2, &task4, cls);
- t3 = GNUNET_SCHEDULER_add_delayed (tc->sched,
- GNUNET_NO,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- t2,
- GNUNET_TIME_relative_get_zero (),
- &task3, cls);
+ GNUNET_SCHEDULER_add_delayed (tc->sched,
+ GNUNET_NO,
+ GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ t2,
+ GNUNET_TIME_relative_get_zero (),
+ &task3, cls);
/* t4 will go first: lower prio, but prereq! */
GNUNET_SCHEDULER_add_after (tc->sched,
GNUNET_NO,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8956 - in gnunet/src: core datastore fs peerinfo transport util,
gnunet <=