aboutsummaryrefslogtreecommitdiff
path: root/src/dns
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-09-06 15:51:03 +0000
committerChristian Grothoff <christian@grothoff.org>2012-09-06 15:51:03 +0000
commit760d2d696450ef550abf99e16f4092b8050a9f4c (patch)
tree11bbd0fadd1d141522e1a75643ae16a22225876e /src/dns
parenta554cb06209115aa0da3b997a3c6818877c4d093 (diff)
downloadgnunet-760d2d696450ef550abf99e16f4092b8050a9f4c.tar.gz
gnunet-760d2d696450ef550abf99e16f4092b8050a9f4c.zip
fix use uninit
Diffstat (limited to 'src/dns')
-rw-r--r--src/dns/dnsstub.c32
-rw-r--r--src/dns/gnunet-service-dns.c1
2 files changed, 21 insertions, 12 deletions
diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c
index 273160e8a..154d59326 100644
--- a/src/dns/dnsstub.c
+++ b/src/dns/dnsstub.c
@@ -280,11 +280,15 @@ GNUNET_DNSSTUB_resolve (struct GNUNET_DNSSTUB_Context *ctx,
280 GNUNET_assert (NULL != ret); 280 GNUNET_assert (NULL != ret);
281 rs->rc = rc; 281 rs->rc = rc;
282 rs->rc_cls = rc_cls; 282 rs->rc_cls = rc_cls;
283 GNUNET_NETWORK_socket_sendto (ret, 283 if (GNUNET_SYSERR ==
284 request, 284 GNUNET_NETWORK_socket_sendto (ret,
285 request_len, 285 request,
286 sa, 286 request_len,
287 sa_len); 287 sa,
288 sa_len))
289 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
290 _("Failed to send DNS request to %s\n"),
291 GNUNET_a2s (sa, sa_len));
288 return rs; 292 return rs;
289} 293}
290 294
@@ -309,7 +313,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
309 int af; 313 int af;
310 struct sockaddr_in v4; 314 struct sockaddr_in v4;
311 struct sockaddr_in6 v6; 315 struct sockaddr_in6 v6;
312 struct sockaddr *so; 316 struct sockaddr *sa;
313 socklen_t salen; 317 socklen_t salen;
314 struct GNUNET_NETWORK_Handle *dnsout; 318 struct GNUNET_NETWORK_Handle *dnsout;
315 struct GNUNET_DNSSTUB_RequestSocket *rs; 319 struct GNUNET_DNSSTUB_RequestSocket *rs;
@@ -324,7 +328,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
324#if HAVE_SOCKADDR_IN_SIN_LEN 328#if HAVE_SOCKADDR_IN_SIN_LEN
325 v4.sin_len = (u_char) salen; 329 v4.sin_len = (u_char) salen;
326#endif 330#endif
327 so = (struct sockaddr *) &v4; 331 sa = (struct sockaddr *) &v4;
328 af = AF_INET; 332 af = AF_INET;
329 } 333 }
330 else if (1 == inet_pton (AF_INET6, ctx->dns_exit, &v6.sin6_addr)) 334 else if (1 == inet_pton (AF_INET6, ctx->dns_exit, &v6.sin6_addr))
@@ -335,7 +339,7 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
335#if HAVE_SOCKADDR_IN_SIN_LEN 339#if HAVE_SOCKADDR_IN_SIN_LEN
336 v6.sin6_len = (u_char) salen; 340 v6.sin6_len = (u_char) salen;
337#endif 341#endif
338 so = (struct sockaddr *) &v6; 342 sa = (struct sockaddr *) &v6;
339 af = AF_INET6; 343 af = AF_INET6;
340 } 344 }
341 else 345 else
@@ -357,14 +361,18 @@ GNUNET_DNSSTUB_resolve2 (struct GNUNET_DNSSTUB_Context *ctx,
357 return NULL; 361 return NULL;
358 } 362 }
359 memcpy (&rs->addr, 363 memcpy (&rs->addr,
360 so, 364 sa,
361 salen); 365 salen);
362 rs->addrlen = salen; 366 rs->addrlen = salen;
363 rs->rc = rc; 367 rs->rc = rc;
364 rs->rc_cls = rc_cls; 368 rs->rc_cls = rc_cls;
365 GNUNET_NETWORK_socket_sendto (dnsout, 369 if (GNUNET_SYSERR ==
366 request, 370 GNUNET_NETWORK_socket_sendto (dnsout,
367 request_len, so, salen); 371 request,
372 request_len, sa, salen))
373 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
374 _("Failed to send DNS request to %s\n"),
375 GNUNET_a2s (sa, salen));
368 rs->timeout = GNUNET_TIME_relative_to_absolute (REQUEST_TIMEOUT); 376 rs->timeout = GNUNET_TIME_relative_to_absolute (REQUEST_TIMEOUT);
369 377
370 return rs; 378 return rs;
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 8fa30b335..b6d5a1967 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1252,6 +1252,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
1252 nc = GNUNET_SERVER_notification_context_create (server, 1); 1252 nc = GNUNET_SERVER_notification_context_create (server, 1);
1253 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task, 1253 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
1254 cls); 1254 cls);
1255 dns_exit = NULL;
1255 if ( (GNUNET_YES == 1256 if ( (GNUNET_YES ==
1256 GNUNET_CONFIGURATION_get_value_yesno (cfg_, "dns", "PROVIDE_EXIT")) && 1257 GNUNET_CONFIGURATION_get_value_yesno (cfg_, "dns", "PROVIDE_EXIT")) &&
1257 ( (GNUNET_OK != 1258 ( (GNUNET_OK !=