Maintained by: NLnet Labs

[Unbound-users] Code cleanup

W.C.A. Wijngaards
Wed May 28 10:29:22 CEST 2014


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Dag-Erling,

Thank you for this large cleanup patch.  It makes a lot of fixes
around the code and that is very nice.  I like the union approach to
the sockaddr_in confusion, that code tends to freak out compilers.
The header-file issues with declarations for worker.h are an artifact
of the test setup and the callback-check(fptr whitelist), sorry about
that.

unbound-control-setup in the Makefile did not support out-of-directory
builds.  sldns_bgetc your notes and commit are different, the commit
is it.

Best regards,
   Wouter


Index: Makefile.in
===================================================================
- --- Makefile.in	(revision 3136)
+++ Makefile.in	(working copy)
@@ -19,7 +19,6 @@
 staticexe=@staticexe@
 EXEEXT=@EXEEXT@
 configfile=@ub_conf_file@
- -UNBOUND_RUN_DIR=@UNBOUND_RUN_DIR@
 CHECKLOCK_SRC=testcode/checklocks.c
 CHECKLOCK_OBJ=@CHECKLOCK_OBJ@
 WITH_PYTHONMODULE=@WITH_PYTHONMODULE@
@@ -348,8 +347,8 @@
 unbound.h:	$(srcdir)/libunbound/unbound.h
 	sed -e 's/@''UNBOUND_VERSION_MAJOR@/$(UNBOUND_VERSION_MAJOR)/' -e
's/@''UNBOUND_VERSION_MINOR@/$(UNBOUND_VERSION_MINOR)/' -e
's/@''UNBOUND_VERSION_MICRO@/$(UNBOUND_VERSION_MICRO)/' <
$(srcdir)/libunbound/unbound.h > $@

- -unbound-control-setup:	$(srcdir)/smallapp/unbound-control-setup.sh
- -	sed -e 's:^DESTDIR=.*$$:DESTDIR=$(UNBOUND_RUN_DIR):' <
$(srcdir)/smallapp/unbound-control-setup.sh > $@
+unbound-control-setup:	smallapp/unbound-control-setup.sh
+	cp smallapp/unbound-control-setup.sh $@
 	-chmod +x $@




On 05/28/2014 01:38 AM, Dag-Erling Smørgrav wrote:
> [previous message with large patch is stuck in moderator queue]
> 
> I missed one: the prototype for libworker_event_done_cb() needs to
> be moved from libunbound/libworker.h to libunbound/worker.h.
> 
> Index: libunbound/libworker.h 
> ===================================================================
>
> 
- --- libunbound/libworker.h	(revision 266744)
> +++ libunbound/libworker.h	(working copy) @@ -136,10 +136,6 @@ /**
> cleanup the cache to remove all rrset IDs from it, arg is libworker
> */ void libworker_alloc_cleanup(void* arg);
> 
> -/** mesh callback with event results */ -void
> libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer*
> buf, -	enum sec_status s, char* why_bogus); - /** * fill result
> from parsed message, on error fills servfail * @param res: is clear
> at start, filled in at end. Index: libunbound/worker.h 
> ===================================================================
>
> 
- --- libunbound/worker.h	(revision 266744)
> +++ libunbound/worker.h	(working copy) @@ -91,6 +91,10 @@ void
> libworker_bg_done_cb(void* arg, int rcode, sldns_buffer* buf, enum
> sec_status s, char* why_bogus);
> 
> +/** mesh callback with event results */ +void
> libworker_event_done_cb(void* arg, int rcode, struct sldns_buffer*
> buf, +	enum sec_status s, char* why_bogus); + /** * Worker signal
> handler function. User argument is the worker itself. * @param sig:
> signal number.
> 
> DES
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJThZ5iAAoJEJ9vHC1+BF+N/WkP/ifQtRpr9x0wH3bLlbr7tAUn
MQG1sHegnmRMHWSc5HMuBNq+BOJ0Am8YO2IUBpB2WgC7VqMYZ8srJ/9vIN7tOx1I
v0ExxfdMR9a3bGgVKTdYNxBSoQz1TnofAeTd9InS9nFFTcZa6z14/m4MJqqU8xkw
63uw7SJ6gzMXV03KLI/qSETOkCMYdjWAVowAdrsxQc3xPBhT7H7mtscBtRJ2Va+W
1EFwA4QG/loiqic+ZI7FcU9FBs3K47iC/juzTTt3TKCFjCrJ6LV+76lg8w1ZG7F/
98SgDPIdets9QXpiLX6aBPzv7+8lyNVv+hGfK7V11P0lG2rh27OtY0qKbn7jezF2
lmFrsCvxjb2qyQlgn3SkaANSlKPzKcd9PLgHt/3e0N01U3+8yyNY1xQHBMUdlhrk
U9qY+YuV+YiD4G6fuax3/XrCNlwiZzRxxUmauQHgkObzgPMx/OfdsE64sVBfaJsZ
zMA9crPi3KGacnqU891LWJqKgjBSnpTLmWWjCyFfkD9BTI16+Yii6YgNzBcm4sT7
zehuWm4MChfbYtw75IOWczaOKMiF/nv7A2UiNhIXKWdGWyY1kfPMLigPPWy8MUJ6
ep+QtCkIbQMSmZ5+MIdKxImTXceNXosicC8i1c9YMm/3woy0eKIHoyek77lm6//G
4O3mbaI3sLiKVygNVoTH
=7HVY
-----END PGP SIGNATURE-----