{
struct PeerContext *me = cls;
+ GNUNET_assert (message != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Exchanging HELLO of size %d with peer (%s)!\n",
(int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message),
GNUNET_i2s (&me->id));
- GNUNET_assert (message != NULL);
GNUNET_assert (GNUNET_OK ==
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
message, &me->id));
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome);
- GNUNET_DISK_directory_remove (p->servicehome);
+ if (NULL != p->servicehome)
+ GNUNET_DISK_directory_remove (p->servicehome);
#if START_ARM
p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
#endif
- if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
- GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome);
if (is_https)
{
GNUNET_free(cert_file_p2);
}
- if ((p1.servicehome != NULL) && (p2.servicehome != NULL))
- {
+ if (p1.servicehome != NULL)
+ {
GNUNET_DISK_directory_remove (p1.servicehome);
- GNUNET_DISK_directory_remove (p2.servicehome);
GNUNET_free(p1.servicehome);
- GNUNET_free(p2.servicehome);
- }
+ }
+ if (p2.servicehome != NULL)
+ {
+ GNUNET_DISK_directory_remove (p2.servicehome);
+ GNUNET_free(p2.servicehome);
+ }
return ok;
}
if (strstr(argv[0], "tcp_nat") != NULL)
{
is_tcp_nat = GNUNET_YES;
-#ifdef MINGW
- return 0;
-#endif
if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server"))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
else if (strstr(argv[0], "udp_nat") != NULL)
{
is_udp_nat = GNUNET_YES;
-#ifdef MINGW
- return 0;
-#endif
if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server"))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
else if (strstr(argv[0], "https") != NULL)
{
is_https = GNUNET_YES;
-#ifdef MINGW
- return 0;
-#endif
}
else if (strstr(argv[0], "http") != NULL)
{