listen_socket6 = NULL;
}
GNUNET_GNS_disconnect (gns);
- GNUNET_DNSSTUB_stop (dns_stub);
gns = NULL;
+ GNUNET_DNSSTUB_stop (dns_stub);
+ dns_stub = NULL;
}
GNUNET_a2s (addr, addr_len));
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "%d, %d, %d, %d\n",
- packet->flags.query_or_response,
- packet->num_answers,
- packet->num_authority_records,
- packet->num_additional_records);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received request with flags %u, #answers %d, #auth %d, #additional %d\n",
+ (unsigned int) packet->flags.query_or_response,
+ (int) packet->num_answers,
+ (int) packet->num_authority_records,
+ (int) packet->num_additional_records);
if ( (0 != packet->flags.query_or_response) ||
(0 != packet->num_answers) ||
(0 != packet->num_authority_records))
(0 == strcasecmp (dns_suffix,
&name[name_len - strlen (dns_suffix)])) )
{
- if (0 == strcasecmp (fcfs_suffix,
- &name[name_len - strlen (fcfs_suffix)]))
+ if ( (name_len > strlen (fcfs_suffix)) &&
+ (0 == strcasecmp (fcfs_suffix,
+ &name[name_len - strlen (fcfs_suffix)])) )
{
- name[name_len - strlen (dns_suffix) + 1] = '\0';
+ name[name_len - strlen (fcfs_suffix) + 1] = '\0';
strcat (name, GNUNET_GNS_TLD);
}
else
if (NULL == dns_suffix)
dns_suffix = DNS_SUFFIX;
-
if (NULL == fcfs_suffix)
fcfs_suffix = FCFS_SUFFIX;
-
- gns = GNUNET_GNS_connect (cfg);
-
- dns_stub = GNUNET_DNSSTUB_start (dns_ip);
-
- if (NULL == dns_stub)
- return;
-
- if (NULL == gns)
+ if (NULL == (gns = GNUNET_GNS_connect (cfg)))
return;
+ if (NULL == (dns_stub = GNUNET_DNSSTUB_start (dns_ip)))
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ return;
+ }
listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET,
SOCK_DGRAM,
IPPROTO_UDP);
}
if ( (NULL == listen_socket4) &&
(NULL == listen_socket6) )
- return;
+ {
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
+ GNUNET_DNSSTUB_stop (dns_stub);
+ dns_stub = NULL;
+ return;
+ }
if (NULL != listen_socket4)
t4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
listen_socket4,