[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24394 - gnunet/src/dns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24394 - gnunet/src/dns |
Date: |
Thu, 18 Oct 2012 11:42:34 +0200 |
Author: grothoff
Date: 2012-10-18 11:42:34 +0200 (Thu, 18 Oct 2012)
New Revision: 24394
Modified:
gnunet/src/dns/dnsstub.c
gnunet/src/dns/test_gnunet_dns.sh
Log:
-misc bugfixes
Modified: gnunet/src/dns/dnsstub.c
===================================================================
--- gnunet/src/dns/dnsstub.c 2012-10-18 08:10:58 UTC (rev 24393)
+++ gnunet/src/dns/dnsstub.c 2012-10-18 09:42:34 UTC (rev 24394)
@@ -279,6 +279,10 @@
else
ret = rs->dnsout6;
GNUNET_assert (NULL != ret);
+ memcpy (&rs->addr,
+ sa,
+ sa_len);
+ rs->addrlen = sa_len;
rs->rc = rc;
rs->rc_cls = rc_cls;
if (GNUNET_SYSERR ==
@@ -290,6 +294,10 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to send DNS request to %s\n"),
GNUNET_a2s (sa, sa_len));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sent DNS request to %s\n"),
+ GNUNET_a2s (sa, sa_len));
return rs;
}
@@ -409,7 +417,9 @@
/* port the code above? */
len = UINT16_MAX;
#endif
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving %d byte DNS reply\n",
+ len);
{
unsigned char buf[len] GNUNET_ALIGN;
@@ -437,7 +447,11 @@
&addr,
addrlen)) ||
(0 == GNUNET_TIME_absolute_get_remaining (rs->timeout).rel_value) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Request timeout or invalid sender address; ignoring
reply\n");
return GNUNET_NO;
+ }
if (NULL != rs->rc)
rs->rc (rs->rc_cls,
rs,
Modified: gnunet/src/dns/test_gnunet_dns.sh
===================================================================
--- gnunet/src/dns/test_gnunet_dns.sh 2012-10-18 08:10:58 UTC (rev 24393)
+++ gnunet/src/dns/test_gnunet_dns.sh 2012-10-18 09:42:34 UTC (rev 24394)
@@ -10,9 +10,15 @@
gnunet-service-dns -c dns.conf &
gnunet-dns-redirector -c dns.conf -4 127.0.0.1 &
sleep 1
-LO=`nslookup gnunet.org | grep Address | tail -n1`
+# need to run 'nslookup' as 'nobody', as gnunet-service-dns runs as root
+# and thus 'root' is excepted from DNS interception!
+LO=`sudo -u nobody nslookup gnunet.org | grep Address | tail -n1`
if [ "$LO" != "Address: 127.0.0.1" ]
then
- echo "Fail: $LO"
+ echo "Fail: got address $LO, wanted 127.0.0.1"
+ ret=1
+else
+ ret=0
fi
kill `jobs -p`
+exit $ret
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24394 - gnunet/src/dns,
gnunet <=