From aa9a1721ccdf5a6787b59bfa38684db8cdedc7d8 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 18 Aug 2014 14:42:26 +0000 Subject: [PATCH] Fixup for dnstap. git-svn-id: file:///svn/unbound/trunk@3209 be551aaa-1e26-0410-a405-d3ace91eadb9 --- Makefile.in | 4 ++-- daemon/daemon.c | 2 +- dnstap/dnstap.c | 18 ++++++++++-------- dnstap/dnstap_config.h | 17 ----------------- testdata/01-doc.tpkg | Bin 902 -> 901 bytes 5 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 dnstap/dnstap_config.h diff --git a/Makefile.in b/Makefile.in index dec1a1d9a..7300b3e34 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,7 +72,7 @@ LINT=splint LINTFLAGS=+quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -Drlimit=rlimit64 -D__gnuc_va_list=va_list -formatcode #-Dglob64=glob -Dglobfree64=globfree # compat with openssl linux edition. -LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int" -DPQ_64BIT=uint64_t -DRC4_INT=unsigned -fixedformalarray -D"ENGINE=unsigned" -D"RSA=unsigned" -D"DSA=unsigned" -D"EVP_PKEY=unsigned" -D"EVP_MD=unsigned" -D"SSL=unsigned" -D"SSL_CTX=unsigned" -D"X509=unsigned" -D"RC4_KEY=unsigned" -D"EVP_MD_CTX=unsigned" -D"ECDSA_SIG=DSA_SIG" +LINTFLAGS+="-DBN_ULONG=unsigned long" -Dkrb5_int32=int "-Dkrb5_ui_4=unsigned int" -DPQ_64BIT=uint64_t -DRC4_INT=unsigned -fixedformalarray -D"ENGINE=unsigned" -D"RSA=unsigned" -D"DSA=unsigned" -D"EVP_PKEY=unsigned" -D"EVP_MD=unsigned" -D"SSL=unsigned" -D"SSL_CTX=unsigned" -D"X509=unsigned" -D"RC4_KEY=unsigned" -D"EVP_MD_CTX=unsigned" -D"ECDSA_SIG=DSA_SIG" -Dfstrm_res=int # compat with NetBSD LINTFLAGS+=@NETBSD_LINTFLAGS@ # compat with OpenBSD @@ -432,7 +432,7 @@ realclean: clean $(LINT) $(LINTFLAGS) -I. -I$(srcdir) $< touch $@ -util/configparser.lint util/configlexer.lint pythonmod/pythonmod.lint libunbound/python/libunbound_wrap.lint: +util/configparser.lint util/configlexer.lint pythonmod/pythonmod.lint libunbound/python/libunbound_wrap.lint dnstap/dnstap.pb-c.lint: # skip lint for generated code touch $@ diff --git a/daemon/daemon.c b/daemon/daemon.c index f05cdb198..f693a0285 100644 --- a/daemon/daemon.c +++ b/daemon/daemon.c @@ -404,7 +404,7 @@ daemon_create_workers(struct daemon* daemon) if(daemon->cfg->dnstap) { #ifdef USE_DNSTAP daemon->dtenv = dt_create(daemon->cfg->dnstap_socket_path, - daemon->num); + (unsigned int)daemon->num); if (!daemon->dtenv) fatal_exit("dt_create failed"); dt_apply_cfg(daemon->dtenv, daemon->cfg); diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c index 413bd3745..d999ffd50 100644 --- a/dnstap/dnstap.c +++ b/dnstap/dnstap.c @@ -173,7 +173,7 @@ dt_apply_identity(struct dt_env *env, struct config_file *cfg) } if (env->identity == NULL) fatal_exit("dt_apply_identity: strdup() failed"); - env->len_identity = strlen(env->identity); + env->len_identity = (unsigned int)strlen(env->identity); verbose(VERB_OPS, "dnstap identity field set to \"%s\"", env->identity); } @@ -190,7 +190,7 @@ dt_apply_version(struct dt_env *env, struct config_file *cfg) env->version = strdup(cfg->dnstap_version); if (env->version == NULL) fatal_exit("dt_apply_version: strdup() failed"); - env->len_version = strlen(env->version); + env->len_version = (unsigned int)strlen(env->version); verbose(VERB_OPS, "dnstap version field set to \"%s\"", env->version); } @@ -203,32 +203,32 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg) dt_apply_identity(env, cfg); dt_apply_version(env, cfg); - if ((env->log_resolver_query_messages = + if ((env->log_resolver_query_messages = (unsigned int) cfg->dnstap_log_resolver_query_messages)) { verbose(VERB_OPS, "dnstap Message/RESOLVER_QUERY enabled"); } - if ((env->log_resolver_response_messages = + if ((env->log_resolver_response_messages = (unsigned int) cfg->dnstap_log_resolver_response_messages)) { verbose(VERB_OPS, "dnstap Message/RESOLVER_RESPONSE enabled"); } - if ((env->log_client_query_messages = + if ((env->log_client_query_messages = (unsigned int) cfg->dnstap_log_client_query_messages)) { verbose(VERB_OPS, "dnstap Message/CLIENT_QUERY enabled"); } - if ((env->log_client_response_messages = + if ((env->log_client_response_messages = (unsigned int) cfg->dnstap_log_client_response_messages)) { verbose(VERB_OPS, "dnstap Message/CLIENT_RESPONSE enabled"); } - if ((env->log_forwarder_query_messages = + if ((env->log_forwarder_query_messages = (unsigned int) cfg->dnstap_log_forwarder_query_messages)) { verbose(VERB_OPS, "dnstap Message/FORWARDER_QUERY enabled"); } - if ((env->log_forwarder_response_messages = + if ((env->log_forwarder_response_messages = (unsigned int) cfg->dnstap_log_forwarder_response_messages)) { verbose(VERB_OPS, "dnstap Message/FORWARDER_RESPONSE enabled"); @@ -261,8 +261,10 @@ dt_fill_timeval(const struct timeval *tv, uint64_t *time_sec, protobuf_c_boolean *has_time_sec, uint32_t *time_nsec, protobuf_c_boolean *has_time_nsec) { +#ifndef S_SPLINT_S *time_sec = tv->tv_sec; *time_nsec = tv->tv_usec * 1000; +#endif *has_time_sec = 1; *has_time_nsec = 1; } diff --git a/dnstap/dnstap_config.h b/dnstap/dnstap_config.h deleted file mode 100644 index 58fb7e695..000000000 --- a/dnstap/dnstap_config.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef UNBOUND_DNSTAP_CONFIG_H -#define UNBOUND_DNSTAP_CONFIG_H - -/* - * Process this file (dnstap_config.h.in) with AC_CONFIG_FILES to generate - * dnstap_config.h. - * - * This file exists so that USE_DNSTAP can be used without including config.h. - */ - -#if 1 /* ENABLE_DNSTAP */ -# ifndef USE_DNSTAP -# define USE_DNSTAP 1 -# endif -#endif - -#endif /* UNBOUND_DNSTAP_CONFIG_H */ diff --git a/testdata/01-doc.tpkg b/testdata/01-doc.tpkg index af82a3e4181d85c621d0c507405b15b598cc6423..6502bdc14e255961cef546151d696e9b4d0f297e 100644 GIT binary patch literal 901 zc-jGl1A6=)iwFRFu<=s>1MOB>Z{s!)_N)0T26B)dfOYr;WNd)c$)aenMNll7hoVRr zX)LjpNP(1+_}_OZIf=d9G;omZf%1c4Qo}jO8GZwX(J)nsp9&rHz7#^jd^)vbG@pjM z;{$rpXgr^c$6+)Z^}=X0nvQ!g{bD=XL1SvJ0eW|;sZl?#_tN@*6ya0-AEqXG>llRD zWb$nN$8)NGIGxPq<7qUbdlJ!InDiig<9&P<|MU8P#|{3(ON^l_Kl=r>5lY4o`5`+) zlW0-ZtzemBvIf#=N|ZIXLblY{PR@8uE-o>JAGibm??Pv`yLf8n zb+yiXQuDVKzrpeGgQL%^Qdqzfu~6gmz9s!EY#JMf4Ri+lJaV*o(5a#C#hz zQDv#5Z*s;A)>o;z-()DSDqfT1;^*^sp52@8v5ZzrzDD+SlEM+Kzygjwoc?%jd)_y2 z0_CPq8H`SjBgSrc`YvQ*1)0VQh6vsz*OK<=wI6r8ALm*t-A%EZcAidx6mJ9B6h-TF z!6=`S^%Guq3aoFVL<|dqtUmy6yLV7)Z&z(4*yElTR3n*!4?{^^9lUS-oFZ46dM_Oz zF9fCKdEI13cdI!uppoFCw#NTnGXodkzjiJL~= zs79tiwW)I@gD1(=o#xenyXc&hDh=qapkDC=4@?Ceqvq91CZAlsl1TgM)w8mflR-@- zw{7LxvZj??FNoHxPYmuHde=Af6l#fZlwW%-K>{Lvkk@4q*v3cIrs)oA7tj&5AH#q+ z$@(2p`jNIyJNqr04M+eg~-KP delta 893 zc-jGd1A_d82ZjfKABzY83Hek_00Zq-ZEGVp5cXH=R}AZrzJT||_S&%K0;!Xuv|I`0 zXg-vZ$h%{&>RoA(c9ZzuceLvy_BFjDA(s}a2V>2S=0%#(BNRr%Or?G%bkO@+2nn+| zwqrDl!}dFxOxkgWUKGWnIGRl+B!|%`oJKu}zuJoS(3qNkYk=OZYHHMv$6X^Zx(94gSJQOrUE& z`;E3KluRJbC~Iz&Y@x9g&Uj5BE-{0jxC9tO6esixBUqe& zgc0$dec*zByo5xZK&E}T^cVgq4dPF^=3HlnEhxxZ>1_gRp~^~0N|UffnVn&UGBc!q zlzzmbO4x-)`csDNJ|g|^cH!6b!A_gI_o6^+eZh^vEMf1tC>rbYZ`b|5g1__MmhP2v ze4hWKcoIL{|KrKj@_#mU{C^V+U@#o+vj&F40ULmSQH@R!>KviuhAIO$RHhZt32t+g zAnI?7oz=*Ghv5o*Kk(~nv-Zi%-+BB2$H(`9o|vaBR8)9Wx9L|(gOJe5q!fHfDJ!C{ zkn3HlLx+Pb2UEe%wT<$sk`kOy{{?4;&^F6kv*^+ONeVb-* zL^CjdhocXtKcCw>?>jhwa$Bf1j82Xt#+E#L7c#MewZ;mD2;L>vlGf<8AGiA-=UOY> ziP(u~`Sn?N>2(FUC}s;6ZAl-HdB>)R|5!@?lz55U{49n{9#H(Lqzu;w}SNM_)} zP|~dq-uHe^nJZ0qFKr<&1eN8VZPPv5o$p|;6 zl@fNGLwVClo&M0NsYMZVo)y9XLLj4_Kvu=6litVbK)rL6CJyN-u05+HSMWB%CEilvJ6*&Y@#pKY;-ejP*O#^)b!W1Gy6l2RSz&)!{>ku8;nXt$m_nMsF8}ccO+PQo6^6 TlVJlH3tQnY8FSgZ04M+ecQ(