[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33578 - gnunet/src/dns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33578 - gnunet/src/dns |
Date: |
Sat, 7 Jun 2014 13:36:06 +0200 |
Author: grothoff
Date: 2014-06-07 13:36:06 +0200 (Sat, 07 Jun 2014)
New Revision: 33578
Added:
gnunet/src/dns/test_hexcoder.c
Modified:
gnunet/src/dns/Makefile.am
gnunet/src/dns/dnsparser.c
Log:
-testcase and bugfix for hexcoder
Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am 2014-06-07 00:33:55 UTC (rev 33577)
+++ gnunet/src/dns/Makefile.am 2014-06-07 11:36:06 UTC (rev 33578)
@@ -37,13 +37,16 @@
gnunet-dns-monitor gnunet-dns-redirector
plugin_LTLIBRARIES = \
- libgnunet_plugin_block_dns.la
+ libgnunet_plugin_block_dns.la
if LINUX
check_SCRIPTS = \
test_gnunet_dns.sh
endif
+check_PROGRAMS = \
+ test_hexcoder
+
gnunet_helper_dns_SOURCES = \
gnunet-helper-dns.c
@@ -71,7 +74,7 @@
libgnunetdns.la
gnunet_service_dns_SOURCES = \
- gnunet-service-dns.c
+ gnunet-service-dns.c
gnunet_service_dns_LDADD = \
$(top_builddir)/src/dns/libgnunetdnsstub.la \
$(top_builddir)/src/tun/libgnunettun.la \
@@ -82,7 +85,7 @@
libgnunetdnsstub.la
libgnunetdnsparser_la_SOURCES = \
- dnsparser.c
+ dnsparser.c
libgnunetdnsparser_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB) \
-lidn
@@ -91,7 +94,7 @@
-version-info 1:0:1
libgnunetdnsstub_la_SOURCES = \
- dnsstub.c
+ dnsstub.c
libgnunetdnsstub_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la $(XLIB)
libgnunetdnsstub_la_LDFLAGS = \
@@ -120,4 +123,15 @@
endif
EXTRA_DIST = \
- $(check_SCRIPTS)
+ $(check_SCRIPTS)
+
+
+test_hexcoder_SOURCES = \
+ test_hexcoder.c
+test_hexcoder_LDADD = \
+ libgnunetdnsparser.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_hexcoder_DEPENDENCIES = \
+ libgnunetdnsparser.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
Modified: gnunet/src/dns/dnsparser.c
===================================================================
--- gnunet/src/dns/dnsparser.c 2014-06-07 00:33:55 UTC (rev 33577)
+++ gnunet/src/dns/dnsparser.c 2014-06-07 11:36:06 UTC (rev 33578)
@@ -1249,7 +1249,7 @@
ret = GNUNET_malloc (data_size * 2 + 1);
for (off = 0; off < data_size; off++)
sprintf (&ret[off * 2],
- "%x",
+ "%02x",
idata[off]);
return ret;
}
Added: gnunet/src/dns/test_hexcoder.c
===================================================================
--- gnunet/src/dns/test_hexcoder.c (rev 0)
+++ gnunet/src/dns/test_hexcoder.c 2014-06-07 11:36:06 UTC (rev 33578)
@@ -0,0 +1,56 @@
+/*
+ This file is part of GNUnet.
+ (C) 2014 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+*/
+/**
+ * @author Christian Grothoff
+ * @file dns/test_hexcoder.c
+ * @brief test for #GNUNET_DNSPARSER_hex_to_bin() and
+ * #GNUNET_DNSPARSER_bin_to_hex()
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_dnsparser_lib.h"
+
+#define TESTSTRING "Hello World!"
+
+
+int
+main (int argc,
+ char *argv[])
+{
+ char buf[strlen (TESTSTRING) + 1];
+ char *ret;
+
+ GNUNET_log_setup ("test-hexcoder", "WARNING", NULL);
+ ret = GNUNET_DNSPARSER_bin_to_hex (TESTSTRING,
+ strlen (TESTSTRING) + 1);
+ GNUNET_assert (NULL != ret);
+ GNUNET_assert (sizeof (buf) ==
+ GNUNET_DNSPARSER_hex_to_bin (ret,
+ buf));
+ GNUNET_assert (0 == memcmp (TESTSTRING,
+ buf,
+ sizeof (buf)));
+ GNUNET_free (ret);
+ return 0;
+}
+
+
+/* end of test_hexcoder.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33578 - gnunet/src/dns,
gnunet <=