[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21129 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21129 - gnunet/src/transport |
Date: |
Tue, 24 Apr 2012 14:41:20 +0200 |
Author: wachs
Date: 2012-04-24 14:41:20 +0200 (Tue, 24 Apr 2012)
New Revision: 21129
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_clients.c
gnunet/src/transport/gnunet-service-transport_hello.c
Log:
- assertions and checks for mantis 2283
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2012-04-24 12:21:29 UTC
(rev 21128)
+++ gnunet/src/transport/gnunet-service-transport.c 2012-04-24 12:41:20 UTC
(rev 21129)
@@ -575,7 +575,7 @@
const struct GNUNET_CONFIGURATION_Handle *c)
{
char *keyfile;
-
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded tmp;
/* setup globals */
GST_cfg = c;
if (GNUNET_OK !=
@@ -599,9 +599,15 @@
}
GST_stats = GNUNET_STATISTICS_create ("transport", c);
GST_peerinfo = GNUNET_PEERINFO_connect (c);
+ memset (&GST_my_public_key, '\0', sizeof (GST_my_public_key));
+ memset (&tmp, '\0', sizeof (tmp));
GNUNET_CRYPTO_rsa_key_get_public (GST_my_private_key, &GST_my_public_key);
GNUNET_CRYPTO_hash (&GST_my_public_key, sizeof (GST_my_public_key),
&GST_my_identity.hashPubKey);
+
+ GNUNET_assert (NULL != GST_my_private_key);
+ GNUNET_assert (0 != memcmp (&GST_my_public_key, &tmp, sizeof
(GST_my_public_key)));
+
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
if (GST_peerinfo == NULL)
@@ -614,6 +620,7 @@
/* start subsystems */
GST_hello_start (&process_hello_update, NULL);
+ GNUNET_assert (NULL != GST_hello_get());
GST_blacklist_start (server);
GST_ats =
GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL);
Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c 2012-04-24
12:21:29 UTC (rev 21128)
+++ gnunet/src/transport/gnunet-service-transport_clients.c 2012-04-24
12:41:20 UTC (rev 21129)
@@ -339,6 +339,12 @@
struct ClientMessageQueueEntry *q;
uint16_t msize;
+ if (msg == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
if ((tc->message_count >= MAX_PENDING) && (GNUNET_YES == may_drop))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
Modified: gnunet/src/transport/gnunet-service-transport_hello.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_hello.c 2012-04-24
12:21:29 UTC (rev 21128)
+++ gnunet/src/transport/gnunet-service-transport_hello.c 2012-04-24
12:41:20 UTC (rev 21129)
@@ -162,13 +162,17 @@
gc.expiration =
GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION);
+
GNUNET_free (our_hello);
our_hello = GNUNET_HELLO_create (&GST_my_public_key, &address_generator,
&gc);
+ GNUNET_assert (NULL != our_hello);
+
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Refreshed my `%s', new size is %d\n", "HELLO",
GNUNET_HELLO_size (our_hello));
#endif
+
GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# refreshed my HELLO"),
1,
GNUNET_NO);
if (NULL != hello_cb)
@@ -206,6 +210,7 @@
hello_cb = cb;
hello_cb_cls = cb_cls;
our_hello = GNUNET_HELLO_create (&GST_my_public_key, NULL, NULL);
+ GNUNET_assert (NULL != our_hello);
refresh_hello ();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21129 - gnunet/src/transport,
gnunet <=