diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-13 12:39:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-13 12:39:09 +0000 |
commit | 9ff68546aa6e7226e37e9231b3961ae72eb0cbb2 (patch) | |
tree | e389457d5da2b28e452fb12c0233d46d1fd8b219 /src/transport/gnunet-service-transport.c | |
parent | e803ed2a69a7a925d51c50334e79223284c00f5f (diff) | |
download | gnunet-9ff68546aa6e7226e37e9231b3961ae72eb0cbb2.tar.gz gnunet-9ff68546aa6e7226e37e9231b3961ae72eb0cbb2.zip |
-code cleanup, fixing #3207: timeout can be NULL in reschedule_session_timeout if we are 'in destroy', in which case we should simply do nothing
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 6b62c17fe..5ab1e59f1 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -421,7 +421,7 @@ plugin_env_address_to_type (void *cls, | |||
421 | 421 | ||
422 | ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); | 422 | ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); |
423 | ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED); | 423 | ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED); |
424 | if (GST_ats == NULL) | 424 | if (NULL == GST_ats) |
425 | { | 425 | { |
426 | GNUNET_break (0); | 426 | GNUNET_break (0); |
427 | return ats; | 427 | return ats; |
@@ -437,7 +437,7 @@ plugin_env_address_to_type (void *cls, | |||
437 | GNUNET_break (0); | 437 | GNUNET_break (0); |
438 | return ats; | 438 | return ats; |
439 | } | 439 | } |
440 | return GNUNET_ATS_address_get_type(GST_ats, addr, addrlen); | 440 | return GNUNET_ATS_address_get_type (GST_ats, addr, addrlen); |
441 | } | 441 | } |
442 | 442 | ||
443 | 443 | ||
@@ -473,11 +473,12 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address, | |||
473 | return; | 473 | return; |
474 | 474 | ||
475 | net = papi->get_network (NULL, (void *) session); | 475 | net = papi->get_network (NULL, (void *) session); |
476 | if (GNUNET_ATS_NET_UNSPECIFIED == net) | 476 | if (GNUNET_ATS_NET_UNSPECIFIED != net) |
477 | { | 477 | { |
478 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 478 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
479 | _("Could not obtain a valid network for `%s' %s\n"), | 479 | _("Could not obtain a valid network for `%s' %s\n"), |
480 | GNUNET_i2s (&address->peer), GST_plugins_a2s (address)); | 480 | GNUNET_i2s (&address->peer), |
481 | GST_plugins_a2s (address)); | ||
481 | GNUNET_break (0); | 482 | GNUNET_break (0); |
482 | } | 483 | } |
483 | ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); | 484 | ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); |