#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define VERBOSE_ARM GNUNET_NO
static void
end_badly ()
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
GNUNET_break (0);
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
struct GNUNET_MessageHeader *hdr;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting message to peer (%p) - %u!\n", cls, size);
+ "Transmitting message to peer (%p) - %u!\n", cls, sizeof (struct GNUNET_MessageHeader));
GNUNET_assert (size >= 256);
GNUNET_assert (ok == 4);
OKPP;
+
if (buf != NULL)
{
hdr = buf;
{
GNUNET_SCHEDULER_cancel (sched, die_task);
die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT_TRANSMIT,
+ TIMEOUT_TRANSMIT,
&end_badly, NULL);
GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
if (GNUNET_CONFIGURATION_have_value (p->cfg,
"transport-https", "KEY_FILE"))
GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1);
- else
+ if (key_file_p1==NULL)
GNUNET_asprintf(&key_file_p1,"https.key");
if (0 == stat (key_file_p1, &sbuf ))
{
}
if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1);
- else
+ if (cert_file_p1==NULL)
GNUNET_asprintf(&cert_file_p1,"https.cert");
if (0 == stat (cert_file_p1, &sbuf ))
{
if (GNUNET_CONFIGURATION_have_value (p->cfg,
"transport-https", "KEY_FILE"))
GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2);
- else
+ if (key_file_p2==NULL)
GNUNET_asprintf(&key_file_p2,"https.key");
if (0 == stat (key_file_p2, &sbuf ))
{
}
if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2);
- else
+ if (cert_file_p2==NULL)
GNUNET_asprintf(&cert_file_p2,"https.cert");
if (0 == stat (cert_file_p2, &sbuf ))
{
OKPP;
sched = s;
die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TIMEOUT,
+ TIMEOUT,
&end_badly, NULL);
if (is_udp)
}
-static int
+static int
check_gnunet_nat_server()
{
struct stat statbuf;
return GNUNET_SYSERR;
}
GNUNET_free (p);
- if ( (0 != (statbuf.st_mode & S_ISUID)) &&
- (statbuf.st_uid == 0) )
+ if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+ (statbuf.st_uid == 0) )
return GNUNET_YES;
return GNUNET_NO;
}
else if (strstr(argv[0], "https") != NULL)
{
is_https = GNUNET_YES;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTPS!!!!");
}
else if (strstr(argv[0], "http") != NULL)
{