drill with source address fixes + lint hapinez

diff --git a/drill/chasetrace.c b/drill/chasetrace.c
index 0a37ff3017e6fc557410dbae64b6d954b1de859a..370f627673e24258c9e8d96469f218929b3956a4 100644 (file)
--- a/drill/chasetrace.c
+++ b/drill/chasetrace.c
@@ -74,6 +74,8 @@ do_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                        ldns_resolver_usevc(local_res));
        ldns_resolver_set_random(res, 
                        ldns_resolver_random(local_res));
+       ldns_resolver_set_source(res,
+                       ldns_resolver_source(local_res));
        ldns_resolver_set_recursive(res, false);
 
        /* setup the root nameserver in the new resolver */

diff --git a/drill/drill.c b/drill/drill.c
index f7893996d99599695d47849efe4d52cb6a68aa0a..e54615789c12a6801ccaa6e76f66390331b58ec5 100644 (file)
--- a/drill/drill.c
+++ b/drill/drill.c
@@ -524,6 +524,7 @@ main(int argc, char *argv[])
                        ldns_resolver_set_ip6(cmdline_res, qfamily);
                        ldns_resolver_set_fallback(cmdline_res, qfallback);
                        ldns_resolver_set_usevc(cmdline_res, qusevc);
+                       ldns_resolver_set_source(cmdline_res, src_rdf);
 
                        cmdline_dname = ldns_dname_new_frm_str(serv);
 
@@ -554,9 +555,7 @@ main(int argc, char *argv[])
        }
        /* set the resolver options */
        ldns_resolver_set_port(res, qport);
-       if(src_rdf) {
-               ldns_resolver_set_source(res, src_rdf);
-       }
+       ldns_resolver_set_source(res, src_rdf);
        if (verbosity >= 5) {
                ldns_resolver_set_debug(res, true);
        } else {

diff --git a/drill/securetrace.c b/drill/securetrace.c
index 9d61ec0900e4577dd33d6902aa425bb11d6a7141..408ec13659e9d558343899096e89b8f1c9474249 100644 (file)
--- a/drill/securetrace.c
+++ b/drill/securetrace.c
@@ -220,6 +220,8 @@ do_secure_trace(ldns_resolver *local_res, ldns_rdf *name, ldns_rr_type t,
                        ldns_resolver_usevc(local_res));
        ldns_resolver_set_random(res,
                        ldns_resolver_random(local_res));
+       ldns_resolver_set_source(res,
+                       ldns_resolver_source(local_res));
        ldns_resolver_set_recursive(local_res, true);
 
        ldns_resolver_set_recursive(res, false);

diff --git a/examples/ldns-dane.c b/examples/ldns-dane.c
index 4c60584828253c9ba4912d412d5e57b7e08cd377..ee14fae6ac0eb60b52342d2074952d18bb863797 100644 (file)
--- a/examples/ldns-dane.c
+++ b/examples/ldns-dane.c
@@ -1344,9 +1344,9 @@ main(int argc, char* const* argv)
                                                "a numeric value\n");
                                exit(EXIT_FAILURE);
                        }
-                       timeout.tv_sec  = (int) timeout_d;
-                       timeout.tv_usec = 
-                               (int) ((timeout_d - timeout.tv_sec) * 1000000);
+                       timeout.tv_sec  = (long) timeout_d;
+                       timeout.tv_usec = (long) 
+                               ((timeout_d - timeout.tv_sec) * 1000000);
                        timeout_p = &timeout;
                        break;
                case 'u':