diff options
60 files changed, 62 insertions, 151 deletions
diff --git a/package/deps.mak b/package/deps.mak index 69302f6..54b0358 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -32,24 +32,24 @@ src/clients/s6dns_generic_filter_main.o src/clients/s6dns_generic_filter_main.lo src/clients/s6dns_namescanner.o src/clients/s6dns_namescanner.lo: src/clients/s6dns_namescanner.c src/include/s6-dns/s6dns-domain.h src/clients/s6dns-generic-filter.h src/libs6dns/s6dns_analyze_packet.o src/libs6dns/s6dns_analyze_packet.lo: src/libs6dns/s6dns_analyze_packet.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_qtype_parse.o src/libs6dns/s6dns_analyze_qtype_parse.lo: src/libs6dns/s6dns_analyze_qtype_parse.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-constants.h -src/libs6dns/s6dns_analyze_record.o src/libs6dns/s6dns_analyze_record.lo: src/libs6dns/s6dns_analyze_record.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_analyze_record_a.o src/libs6dns/s6dns_analyze_record_a.lo: src/libs6dns/s6dns_analyze_record_a.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_analyze_record_aaaa.o src/libs6dns/s6dns_analyze_record_aaaa.lo: src/libs6dns/s6dns_analyze_record_aaaa.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-message.h +src/libs6dns/s6dns_analyze_record.o src/libs6dns/s6dns_analyze_record.lo: src/libs6dns/s6dns_analyze_record.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-domain.h +src/libs6dns/s6dns_analyze_record_a.o src/libs6dns/s6dns_analyze_record_a.lo: src/libs6dns/s6dns_analyze_record_a.c src/include/s6-dns/s6dns-analyze.h +src/libs6dns/s6dns_analyze_record_aaaa.o src/libs6dns/s6dns_analyze_record_aaaa.lo: src/libs6dns/s6dns_analyze_record_aaaa.c src/include/s6-dns/s6dns-analyze.h src/libs6dns/s6dns_analyze_record_domain.o src/libs6dns/s6dns_analyze_record_domain.lo: src/libs6dns/s6dns_analyze_record_domain.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_record_hinfo.o src/libs6dns/s6dns_analyze_record_hinfo.lo: src/libs6dns/s6dns_analyze_record_hinfo.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_record_mx.o src/libs6dns/s6dns_analyze_record_mx.lo: src/libs6dns/s6dns_analyze_record_mx.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_record_soa.o src/libs6dns/s6dns_analyze_record_soa.lo: src/libs6dns/s6dns_analyze_record_soa.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_record_srv.o src/libs6dns/s6dns_analyze_record_srv.lo: src/libs6dns/s6dns_analyze_record_srv.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_analyze_record_strings.o src/libs6dns/s6dns_analyze_record_strings.lo: src/libs6dns/s6dns_analyze_record_strings.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_analyze_record_unknown.o src/libs6dns/s6dns_analyze_record_unknown.lo: src/libs6dns/s6dns_analyze_record_unknown.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-message.h +src/libs6dns/s6dns_analyze_record_unknown.o src/libs6dns/s6dns_analyze_record_unknown.lo: src/libs6dns/s6dns_analyze_record_unknown.c src/include/s6-dns/s6dns-analyze.h src/libs6dns/s6dns_analyze_rtypetable.o src/libs6dns/s6dns_analyze_rtypetable.lo: src/libs6dns/s6dns_analyze_rtypetable.c src/include/s6-dns/s6dns-analyze.h src/libs6dns/s6dns_constants_error.o src/libs6dns/s6dns_constants_error.lo: src/libs6dns/s6dns_constants_error.c src/include/s6-dns/s6dns-constants.h src/libs6dns/s6dns_constants_error_str.o src/libs6dns/s6dns_constants_error_str.lo: src/libs6dns/s6dns_constants_error_str.c src/include/s6-dns/s6dns-constants.h -src/libs6dns/s6dns_debug_dumpdt_post_recv.o src/libs6dns/s6dns_debug_dumpdt_post_recv.lo: src/libs6dns/s6dns_debug_dumpdt_post_recv.c src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-engine.h -src/libs6dns/s6dns_debug_dumpdt_post_send.o src/libs6dns/s6dns_debug_dumpdt_post_send.lo: src/libs6dns/s6dns_debug_dumpdt_post_send.c src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-engine.h -src/libs6dns/s6dns_debug_dumpdt_pre_send.o src/libs6dns/s6dns_debug_dumpdt_pre_send.lo: src/libs6dns/s6dns_debug_dumpdt_pre_send.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h -src/libs6dns/s6dns_debug_dumpdt_stderr.o src/libs6dns/s6dns_debug_dumpdt_stderr.lo: src/libs6dns/s6dns_debug_dumpdt_stderr.c src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-engine.h -src/libs6dns/s6dns_debug_dumpdt_stdout.o src/libs6dns/s6dns_debug_dumpdt_stdout.lo: src/libs6dns/s6dns_debug_dumpdt_stdout.c src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-engine.h +src/libs6dns/s6dns_debug_dumpdt_post_recv.o src/libs6dns/s6dns_debug_dumpdt_post_recv.lo: src/libs6dns/s6dns_debug_dumpdt_post_recv.c src/include/s6-dns/s6dns-debug.h +src/libs6dns/s6dns_debug_dumpdt_post_send.o src/libs6dns/s6dns_debug_dumpdt_post_send.lo: src/libs6dns/s6dns_debug_dumpdt_post_send.c src/include/s6-dns/s6dns-debug.h +src/libs6dns/s6dns_debug_dumpdt_pre_send.o src/libs6dns/s6dns_debug_dumpdt_pre_send.lo: src/libs6dns/s6dns_debug_dumpdt_pre_send.c src/include/s6-dns/s6dns-analyze.h src/include/s6-dns/s6dns-debug.h src/include/s6-dns/s6dns-ip46.h +src/libs6dns/s6dns_debug_dumpdt_stderr.o src/libs6dns/s6dns_debug_dumpdt_stderr.lo: src/libs6dns/s6dns_debug_dumpdt_stderr.c src/include/s6-dns/s6dns-debug.h +src/libs6dns/s6dns_debug_dumpdt_stdout.o src/libs6dns/s6dns_debug_dumpdt_stdout.lo: src/libs6dns/s6dns_debug_dumpdt_stdout.c src/include/s6-dns/s6dns-debug.h src/libs6dns/s6dns_debughook_zero.o src/libs6dns/s6dns_debughook_zero.lo: src/libs6dns/s6dns_debughook_zero.c src/include/s6-dns/s6dns-engine.h src/libs6dns/s6dns_domain_arpafromip4.o src/libs6dns/s6dns_domain_arpafromip4.lo: src/libs6dns/s6dns_domain_arpafromip4.c src/include/s6-dns/s6dns-domain.h src/libs6dns/s6dns_domain_arpafromip6.o src/libs6dns/s6dns_domain_arpafromip6.lo: src/libs6dns/s6dns_domain_arpafromip6.c src/include/s6-dns/s6dns-domain.h @@ -68,13 +68,13 @@ src/libs6dns/s6dns_engine_freen.o src/libs6dns/s6dns_engine_freen.lo: src/libs6d src/libs6dns/s6dns_engine_here.o src/libs6dns/s6dns_engine_here.lo: src/libs6dns/s6dns_engine_here.c src/include/s6-dns/s6dns-engine.h src/libs6dns/s6dns_engine_nextdeadline.o src/libs6dns/s6dns_engine_nextdeadline.lo: src/libs6dns/s6dns_engine_nextdeadline.c src/include/s6-dns/s6dns-engine.h src/libs6dns/s6dns_engine_zero.o src/libs6dns/s6dns_engine_zero.lo: src/libs6dns/s6dns_engine_zero.c src/include/s6-dns/s6dns-engine.h -src/libs6dns/s6dns_finish.o src/libs6dns/s6dns_finish.lo: src/libs6dns/s6dns_finish.c src/include/s6-dns/s6dns.h +src/libs6dns/s6dns_finish.o src/libs6dns/s6dns_finish.lo: src/libs6dns/s6dns_finish.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns.h src/libs6dns/s6dns_fmt_domainlist.o src/libs6dns/s6dns_fmt_domainlist.lo: src/libs6dns/s6dns_fmt_domainlist.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-fmt.h -src/libs6dns/s6dns_fmt_hinfo.o src/libs6dns/s6dns_fmt_hinfo.lo: src/libs6dns/s6dns_fmt_hinfo.c src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_fmt_mx.o src/libs6dns/s6dns_fmt_mx.lo: src/libs6dns/s6dns_fmt_mx.c src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_fmt_soa.o src/libs6dns/s6dns_fmt_soa.lo: src/libs6dns/s6dns_fmt_soa.c src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_fmt_srv.o src/libs6dns/s6dns_fmt_srv.lo: src/libs6dns/s6dns_fmt_srv.c src/include/s6-dns/s6dns-fmt.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_init.o src/libs6dns/s6dns_init.lo: src/libs6dns/s6dns_init.c src/include/s6-dns/s6dns.h +src/libs6dns/s6dns_fmt_hinfo.o src/libs6dns/s6dns_fmt_hinfo.lo: src/libs6dns/s6dns_fmt_hinfo.c src/include/s6-dns/s6dns-fmt.h +src/libs6dns/s6dns_fmt_mx.o src/libs6dns/s6dns_fmt_mx.lo: src/libs6dns/s6dns_fmt_mx.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-fmt.h +src/libs6dns/s6dns_fmt_soa.o src/libs6dns/s6dns_fmt_soa.lo: src/libs6dns/s6dns_fmt_soa.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-fmt.h +src/libs6dns/s6dns_fmt_srv.o src/libs6dns/s6dns_fmt_srv.lo: src/libs6dns/s6dns_fmt_srv.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-fmt.h +src/libs6dns/s6dns_init.o src/libs6dns/s6dns_init.lo: src/libs6dns/s6dns_init.c src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns.h src/libs6dns/s6dns_message_counts_next.o src/libs6dns/s6dns_message_counts_next.lo: src/libs6dns/s6dns_message_counts_next.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_counts_pack.o src/libs6dns/s6dns_message_counts_pack.lo: src/libs6dns/s6dns_message_counts_pack.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_counts_unpack.o src/libs6dns/s6dns_message_counts_unpack.lo: src/libs6dns/s6dns_message_counts_unpack.c src/include/s6-dns/s6dns-message.h @@ -82,10 +82,10 @@ src/libs6dns/s6dns_message_counts_zero.o src/libs6dns/s6dns_message_counts_zero. src/libs6dns/s6dns_message_get_domain.o src/libs6dns/s6dns_message_get_domain.lo: src/libs6dns/s6dns_message_get_domain.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns-message-internal.h src/libs6dns/s6dns_message_get_domain_internal.o src/libs6dns/s6dns_message_get_domain_internal.lo: src/libs6dns/s6dns_message_get_domain_internal.c src/libs6dns/s6dns-message-internal.h src/libs6dns/s6dns_message_get_hinfo.o src/libs6dns/s6dns_message_get_hinfo.lo: src/libs6dns/s6dns_message_get_hinfo.c src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_message_get_mx.o src/libs6dns/s6dns_message_get_mx.lo: src/libs6dns/s6dns_message_get_mx.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h +src/libs6dns/s6dns_message_get_mx.o src/libs6dns/s6dns_message_get_mx.lo: src/libs6dns/s6dns_message_get_mx.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_get_soa.o src/libs6dns/s6dns_message_get_soa.lo: src/libs6dns/s6dns_message_get_soa.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_get_srv.o src/libs6dns/s6dns_message_get_srv.lo: src/libs6dns/s6dns_message_get_srv.c src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_message_get_string.o src/libs6dns/s6dns_message_get_string.lo: src/libs6dns/s6dns_message_get_string.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns-message-internal.h +src/libs6dns/s6dns_message_get_string.o src/libs6dns/s6dns_message_get_string.lo: src/libs6dns/s6dns_message_get_string.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns-message-internal.h src/libs6dns/s6dns_message_get_string_internal.o src/libs6dns/s6dns_message_get_string_internal.lo: src/libs6dns/s6dns_message_get_string_internal.c src/libs6dns/s6dns-message-internal.h src/libs6dns/s6dns_message_get_strings.o src/libs6dns/s6dns_message_get_strings.lo: src/libs6dns/s6dns_message_get_strings.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns-message-internal.h src/libs6dns/s6dns_message_header_pack.o src/libs6dns/s6dns_message_header_pack.lo: src/libs6dns/s6dns_message_header_pack.c src/include/s6-dns/s6dns-message.h @@ -94,7 +94,7 @@ src/libs6dns/s6dns_message_header_zero.o src/libs6dns/s6dns_message_header_zero. src/libs6dns/s6dns_message_parse.o src/libs6dns/s6dns_message_parse.lo: src/libs6dns/s6dns_message_parse.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_parse_answer_a.o src/libs6dns/s6dns_message_parse_answer_a.lo: src/libs6dns/s6dns_message_parse_answer_a.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_parse_answer_aaaa.o src/libs6dns/s6dns_message_parse_answer_aaaa.lo: src/libs6dns/s6dns_message_parse_answer_aaaa.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h -src/libs6dns/s6dns_message_parse_answer_domain.o src/libs6dns/s6dns_message_parse_answer_domain.lo: src/libs6dns/s6dns_message_parse_answer_domain.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h +src/libs6dns/s6dns_message_parse_answer_domain.o src/libs6dns/s6dns_message_parse_answer_domain.lo: src/libs6dns/s6dns_message_parse_answer_domain.c src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_parse_answer_hinfo.o src/libs6dns/s6dns_message_parse_answer_hinfo.lo: src/libs6dns/s6dns_message_parse_answer_hinfo.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_parse_answer_mx.o src/libs6dns/s6dns_message_parse_answer_mx.lo: src/libs6dns/s6dns_message_parse_answer_mx.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/libs6dns/s6dns_message_parse_answer_soa.o src/libs6dns/s6dns_message_parse_answer_soa.lo: src/libs6dns/s6dns_message_parse_answer_soa.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h @@ -108,24 +108,24 @@ src/libs6dns/s6dns_rci_free.o src/libs6dns/s6dns_rci_free.lo: src/libs6dns/s6dns src/libs6dns/s6dns_rci_here.o src/libs6dns/s6dns_rci_here.lo: src/libs6dns/s6dns_rci_here.c src/include/s6-dns/s6dns-rci.h src/libs6dns/s6dns_rci_init.o src/libs6dns/s6dns_rci_init.lo: src/libs6dns/s6dns_rci_init.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-rci.h src/libs6dns/s6dns_rci_zero.o src/libs6dns/s6dns_rci_zero.lo: src/libs6dns/s6dns_rci_zero.c src/include/s6-dns/s6dns-rci.h -src/libs6dns/s6dns_resolve_core.o src/libs6dns/s6dns_resolve_core.lo: src/libs6dns/s6dns_resolve_core.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolve_dpag.o src/libs6dns/s6dns_resolve_dpag.lo: src/libs6dns/s6dns_resolve_dpag.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolve_mpag.o src/libs6dns/s6dns_resolve_mpag.lo: src/libs6dns/s6dns_resolve_mpag.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolve_name4.o src/libs6dns/s6dns_resolve_name4.lo: src/libs6dns/s6dns_resolve_name4.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolve_name6.o src/libs6dns/s6dns_resolve_name6.lo: src/libs6dns/s6dns_resolve_name6.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolve_parse.o src/libs6dns/s6dns_resolve_parse.lo: src/libs6dns/s6dns_resolve_parse.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_core.o src/libs6dns/s6dns_resolve_core.lo: src/libs6dns/s6dns_resolve_core.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_dpag.o src/libs6dns/s6dns_resolve_dpag.lo: src/libs6dns/s6dns_resolve_dpag.c src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_mpag.o src/libs6dns/s6dns_resolve_mpag.lo: src/libs6dns/s6dns_resolve_mpag.c src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_name4.o src/libs6dns/s6dns_resolve_name4.lo: src/libs6dns/s6dns_resolve_name4.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_name6.o src/libs6dns/s6dns_resolve_name6.lo: src/libs6dns/s6dns_resolve_name6.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolve_parse.o src/libs6dns/s6dns_resolve_parse.lo: src/libs6dns/s6dns_resolve_parse.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h src/libs6dns/s6dns_resolven_loop.o src/libs6dns/s6dns_resolven_loop.lo: src/libs6dns/s6dns_resolven_loop.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolven_parse.o src/libs6dns/s6dns_resolven_parse.lo: src/libs6dns/s6dns_resolven_parse.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolvenoq.o src/libs6dns/s6dns_resolvenoq.lo: src/libs6dns/s6dns_resolvenoq.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolvenoq_aaaaa.o src/libs6dns/s6dns_resolvenoq_aaaaa.lo: src/libs6dns/s6dns_resolvenoq_aaaaa.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-ip46.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolveq.o src/libs6dns/s6dns_resolveq.lo: src/libs6dns/s6dns_resolveq.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns-resolve.h -src/libs6dns/s6dns_resolveq_aaaaa.o src/libs6dns/s6dns_resolveq_aaaaa.lo: src/libs6dns/s6dns_resolveq_aaaaa.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-rci.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolven_parse.o src/libs6dns/s6dns_resolven_parse.lo: src/libs6dns/s6dns_resolven_parse.c src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolvenoq.o src/libs6dns/s6dns_resolvenoq.lo: src/libs6dns/s6dns_resolvenoq.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolvenoq_aaaaa.o src/libs6dns/s6dns_resolvenoq_aaaaa.lo: src/libs6dns/s6dns_resolvenoq_aaaaa.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolveq.o src/libs6dns/s6dns_resolveq.lo: src/libs6dns/s6dns_resolveq.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h +src/libs6dns/s6dns_resolveq_aaaaa.o src/libs6dns/s6dns_resolveq_aaaaa.lo: src/libs6dns/s6dns_resolveq_aaaaa.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-domain.h src/include/s6-dns/s6dns-engine.h src/include/s6-dns/s6dns-message.h src/include/s6-dns/s6dns-resolve.h src/skadns/skadns_cancel.o src/skadns/skadns_cancel.lo: src/skadns/skadns_cancel.c src/include/s6-dns/skadns.h src/skadns/skadns_end.o src/skadns/skadns_end.lo: src/skadns/skadns_end.c src/include/s6-dns/skadns.h src/skadns/skadns_packet.o src/skadns/skadns_packet.lo: src/skadns/skadns_packet.c src/include/s6-dns/skadns.h src/skadns/skadns_packetlen.o src/skadns/skadns_packetlen.lo: src/skadns/skadns_packetlen.c src/include/s6-dns/skadns.h src/skadns/skadns_release.o src/skadns/skadns_release.lo: src/skadns/skadns_release.c src/include/s6-dns/skadns.h -src/skadns/skadns_send.o src/skadns/skadns_send.lo: src/skadns/skadns_send.c src/include/s6-dns/s6dns-domain.h src/include/s6-dns/skadns.h +src/skadns/skadns_send.o src/skadns/skadns_send.lo: src/skadns/skadns_send.c src/include/s6-dns/skadns.h src/skadns/skadns_start.o src/skadns/skadns_start.lo: src/skadns/skadns_start.c src/include/s6-dns/skadns.h src/skadns/skadns_startf.o src/skadns/skadns_startf.lo: src/skadns/skadns_startf.c src/include/s6-dns/skadns.h src/skadns/skadns_update.o src/skadns/skadns_update.lo: src/skadns/skadns_update.c src/include/s6-dns/skadns.h diff --git a/src/libs6dns/s6dns_analyze_packet.c b/src/libs6dns/s6dns_analyze_packet.c index 57e7f95..facd498 100644 --- a/src/libs6dns/s6dns_analyze_packet.c +++ b/src/libs6dns/s6dns_analyze_packet.c @@ -5,7 +5,6 @@ #include <errno.h> #include <skalibs/error.h> #include <skalibs/types.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-constants.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> diff --git a/src/libs6dns/s6dns_analyze_qtype_parse.c b/src/libs6dns/s6dns_analyze_qtype_parse.c index 8ae86ad..4898bfd 100644 --- a/src/libs6dns/s6dns_analyze_qtype_parse.c +++ b/src/libs6dns/s6dns_analyze_qtype_parse.c @@ -1,8 +1,7 @@ /* ISC license. */ -#include <stdint.h> #include <strings.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-constants.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record.c b/src/libs6dns/s6dns_analyze_record.c index e2621f7..13d0fa8 100644 --- a/src/libs6dns/s6dns_analyze_record.c +++ b/src/libs6dns/s6dns_analyze_record.c @@ -2,10 +2,8 @@ #include <string.h> #include <stdint.h> -#include <skalibs/types.h> -#include <skalibs/genwrite.h> +#include <skalibs/uint32.h> #include <s6-dns/s6dns-domain.h> -#include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-analyze.h> static s6dns_analyze_rtypetable_t const *rtypelookup (uint16_t rtype) diff --git a/src/libs6dns/s6dns_analyze_record_a.c b/src/libs6dns/s6dns_analyze_record_a.c index 5e374cb..214c348 100644 --- a/src/libs6dns/s6dns_analyze_record_a.c +++ b/src/libs6dns/s6dns_analyze_record_a.c @@ -2,9 +2,7 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <skalibs/fmtscan.h> -#include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-analyze.h> int s6dns_analyze_record_a (genwrite_t *gp, s6dns_message_rr_t const *rr, char const *packet, unsigned int packetlen, unsigned int pos) diff --git a/src/libs6dns/s6dns_analyze_record_aaaa.c b/src/libs6dns/s6dns_analyze_record_aaaa.c index 495ba24..e28e8bc 100644 --- a/src/libs6dns/s6dns_analyze_record_aaaa.c +++ b/src/libs6dns/s6dns_analyze_record_aaaa.c @@ -2,9 +2,7 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <skalibs/fmtscan.h> -#include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-analyze.h> int s6dns_analyze_record_aaaa (genwrite_t *gp, s6dns_message_rr_t const *rr, char const *packet, unsigned int packetlen, unsigned int pos) diff --git a/src/libs6dns/s6dns_analyze_record_domain.c b/src/libs6dns/s6dns_analyze_record_domain.c index 9a4b209..ca77f1f 100644 --- a/src/libs6dns/s6dns_analyze_record_domain.c +++ b/src/libs6dns/s6dns_analyze_record_domain.c @@ -3,7 +3,6 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> diff --git a/src/libs6dns/s6dns_analyze_record_hinfo.c b/src/libs6dns/s6dns_analyze_record_hinfo.c index b294a06..d38c657 100644 --- a/src/libs6dns/s6dns_analyze_record_hinfo.c +++ b/src/libs6dns/s6dns_analyze_record_hinfo.c @@ -3,7 +3,6 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record_mx.c b/src/libs6dns/s6dns_analyze_record_mx.c index 442ef2d..7aeca5d 100644 --- a/src/libs6dns/s6dns_analyze_record_mx.c +++ b/src/libs6dns/s6dns_analyze_record_mx.c @@ -3,7 +3,6 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record_soa.c b/src/libs6dns/s6dns_analyze_record_soa.c index fa4dc3a..ed04ca8 100644 --- a/src/libs6dns/s6dns_analyze_record_soa.c +++ b/src/libs6dns/s6dns_analyze_record_soa.c @@ -3,7 +3,6 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record_srv.c b/src/libs6dns/s6dns_analyze_record_srv.c index a0f8c6a..024825b 100644 --- a/src/libs6dns/s6dns_analyze_record_srv.c +++ b/src/libs6dns/s6dns_analyze_record_srv.c @@ -3,7 +3,6 @@ #include <sys/types.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/genwrite.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record_strings.c b/src/libs6dns/s6dns_analyze_record_strings.c index a5df9e6..9baa42a 100644 --- a/src/libs6dns/s6dns_analyze_record_strings.c +++ b/src/libs6dns/s6dns_analyze_record_strings.c @@ -3,7 +3,6 @@ #include <errno.h> #include <skalibs/error.h> #include <skalibs/stralloc.h> -#include <skalibs/genwrite.h> #include <skalibs/skamisc.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-analyze.h> diff --git a/src/libs6dns/s6dns_analyze_record_unknown.c b/src/libs6dns/s6dns_analyze_record_unknown.c index 8e27dc4..b7a276d 100644 --- a/src/libs6dns/s6dns_analyze_record_unknown.c +++ b/src/libs6dns/s6dns_analyze_record_unknown.c @@ -1,10 +1,8 @@ /* ISC license. */ #include <stdint.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/fmtscan.h> -#include <skalibs/genwrite.h> -#include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-analyze.h> int s6dns_analyze_record_unknown (genwrite_t *gp, s6dns_message_rr_t const *rr, char const *packet, unsigned int packetlen, unsigned int pos) diff --git a/src/libs6dns/s6dns_debug_dumpdt_post_recv.c b/src/libs6dns/s6dns_debug_dumpdt_post_recv.c index 5680489..827fce8 100644 --- a/src/libs6dns/s6dns_debug_dumpdt_post_recv.c +++ b/src/libs6dns/s6dns_debug_dumpdt_post_recv.c @@ -1,7 +1,6 @@ /* ISC license */ #include <skalibs/genwrite.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-debug.h> int s6dns_debug_dumpdt_post_recv (s6dns_engine_t const *dt, void *data) diff --git a/src/libs6dns/s6dns_debug_dumpdt_post_send.c b/src/libs6dns/s6dns_debug_dumpdt_post_send.c index 27e4ff9..21692a0 100644 --- a/src/libs6dns/s6dns_debug_dumpdt_post_send.c +++ b/src/libs6dns/s6dns_debug_dumpdt_post_send.c @@ -2,10 +2,9 @@ #include <sys/types.h> #include <stdint.h> -#include <skalibs/types.h> -#include <skalibs/djbtime.h> +#include <skalibs/uint16.h> #include <skalibs/genwrite.h> -#include <s6-dns/s6dns-engine.h> +#include <skalibs/djbtime.h> #include <s6-dns/s6dns-debug.h> int s6dns_debug_dumpdt_post_send (s6dns_engine_t const *dt, void *data) diff --git a/src/libs6dns/s6dns_debug_dumpdt_pre_send.c b/src/libs6dns/s6dns_debug_dumpdt_pre_send.c index 6d42608..25c887a 100644 --- a/src/libs6dns/s6dns_debug_dumpdt_pre_send.c +++ b/src/libs6dns/s6dns_debug_dumpdt_pre_send.c @@ -8,15 +8,11 @@ #include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> -#include <skalibs/fmtscan.h> -#include <skalibs/tai.h> -#include <skalibs/djbtime.h> +#include <skalibs/uint16.h> #include <skalibs/genwrite.h> +#include <skalibs/djbtime.h> #include <skalibs/ip46.h> -#include <s6-dns/s6dns-constants.h> #include <s6-dns/s6dns-ip46.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-analyze.h> #include <s6-dns/s6dns-debug.h> diff --git a/src/libs6dns/s6dns_debug_dumpdt_stderr.c b/src/libs6dns/s6dns_debug_dumpdt_stderr.c index 46bdbea..321b525 100644 --- a/src/libs6dns/s6dns_debug_dumpdt_stderr.c +++ b/src/libs6dns/s6dns_debug_dumpdt_stderr.c @@ -1,7 +1,6 @@ /* ISC license */ #include <skalibs/genwrite.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-debug.h> s6dns_debughook_t const s6dns_debug_dumpdt_stderr = S6DNS_DEBUG_DUMPDT_INIT((void *)&genwrite_stderr) ; diff --git a/src/libs6dns/s6dns_debug_dumpdt_stdout.c b/src/libs6dns/s6dns_debug_dumpdt_stdout.c index 9862549..86b3f17 100644 --- a/src/libs6dns/s6dns_debug_dumpdt_stdout.c +++ b/src/libs6dns/s6dns_debug_dumpdt_stdout.c @@ -1,7 +1,6 @@ /* ISC license */ #include <skalibs/genwrite.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-debug.h> s6dns_debughook_t const s6dns_debug_dumpdt_stdout = S6DNS_DEBUG_DUMPDT_INIT((void *)&genwrite_stdout) ; diff --git a/src/libs6dns/s6dns_domain_fromstring_noqualify_encode.c b/src/libs6dns/s6dns_domain_fromstring_noqualify_encode.c index 96e9858..c33d3e8 100644 --- a/src/libs6dns/s6dns_domain_fromstring_noqualify_encode.c +++ b/src/libs6dns/s6dns_domain_fromstring_noqualify_encode.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <string.h> #include <s6-dns/s6dns-domain.h> int s6dns_domain_fromstring_noqualify_encode (s6dns_domain_t *d, char const *name, size_t len) diff --git a/src/libs6dns/s6dns_domain_fromstring_qualify_encode.c b/src/libs6dns/s6dns_domain_fromstring_qualify_encode.c index cb958f0..d57a521 100644 --- a/src/libs6dns/s6dns_domain_fromstring_qualify_encode.c +++ b/src/libs6dns/s6dns_domain_fromstring_qualify_encode.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <string.h> #include <s6-dns/s6dns-domain.h> unsigned int s6dns_domain_fromstring_qualify_encode (s6dns_domain_t *list, char const *name, size_t len, char const *rules, unsigned int rulesnum) diff --git a/src/libs6dns/s6dns_engine.c b/src/libs6dns/s6dns_engine.c index 8891e8e..06cb218 100644 --- a/src/libs6dns/s6dns_engine.c +++ b/src/libs6dns/s6dns_engine.c @@ -5,7 +5,7 @@ #include <strings.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/allreadwrite.h> #include <skalibs/error.h> #include <skalibs/tai.h> diff --git a/src/libs6dns/s6dns_finish.c b/src/libs6dns/s6dns_finish.c index 73be299..f786329 100644 --- a/src/libs6dns/s6dns_finish.c +++ b/src/libs6dns/s6dns_finish.c @@ -1,5 +1,7 @@ /* ISC license. */ +#include <s6-dns/s6dns-engine.h> +#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns.h> void s6dns_finish () diff --git a/src/libs6dns/s6dns_fmt_hinfo.c b/src/libs6dns/s6dns_fmt_hinfo.c index 78bf414..cabef8d 100644 --- a/src/libs6dns/s6dns_fmt_hinfo.c +++ b/src/libs6dns/s6dns_fmt_hinfo.c @@ -2,7 +2,6 @@ #include <string.h> #include <errno.h> -#include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-fmt.h> size_t s6dns_fmt_hinfo (char *s, size_t max, s6dns_message_rr_hinfo_t const *hinfo) diff --git a/src/libs6dns/s6dns_fmt_mx.c b/src/libs6dns/s6dns_fmt_mx.c index 938c478..d79ca72 100644 --- a/src/libs6dns/s6dns_fmt_mx.c +++ b/src/libs6dns/s6dns_fmt_mx.c @@ -1,8 +1,8 @@ /* ISC license. */ #include <string.h> -#include <skalibs/types.h> -#include <s6-dns/s6dns-message.h> +#include <skalibs/uint16.h> +#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-fmt.h> size_t s6dns_fmt_mx (char *s, size_t max, s6dns_message_rr_mx_t const *mx) diff --git a/src/libs6dns/s6dns_fmt_soa.c b/src/libs6dns/s6dns_fmt_soa.c index b9e0a42..845b83d 100644 --- a/src/libs6dns/s6dns_fmt_soa.c +++ b/src/libs6dns/s6dns_fmt_soa.c @@ -2,8 +2,8 @@ #include <string.h> #include <errno.h> -#include <skalibs/types.h> -#include <s6-dns/s6dns-message.h> +#include <skalibs/uint32.h> +#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-fmt.h> size_t s6dns_fmt_soa (char *s, size_t max, s6dns_message_rr_soa_t const *soa) diff --git a/src/libs6dns/s6dns_fmt_srv.c b/src/libs6dns/s6dns_fmt_srv.c index ee0d337..e562c69 100644 --- a/src/libs6dns/s6dns_fmt_srv.c +++ b/src/libs6dns/s6dns_fmt_srv.c @@ -2,8 +2,8 @@ #include <string.h> #include <errno.h> -#include <skalibs/types.h> -#include <s6-dns/s6dns-message.h> +#include <skalibs/uint16.h> +#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-fmt.h> size_t s6dns_fmt_srv (char *s, size_t max, s6dns_message_rr_srv_t const *srv) diff --git a/src/libs6dns/s6dns_init.c b/src/libs6dns/s6dns_init.c index 8e941bd..f3cab32 100644 --- a/src/libs6dns/s6dns_init.c +++ b/src/libs6dns/s6dns_init.c @@ -1,6 +1,7 @@ /* ISC license. */ #include <skalibs/random.h> +#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns.h> int s6dns_init (void) diff --git a/src/libs6dns/s6dns_message_counts_pack.c b/src/libs6dns/s6dns_message_counts_pack.c index 512e8ae..51c0a78 100644 --- a/src/libs6dns/s6dns_message_counts_pack.c +++ b/src/libs6dns/s6dns_message_counts_pack.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> void s6dns_message_counts_pack (char *s, s6dns_message_counts_t const *counts) diff --git a/src/libs6dns/s6dns_message_counts_unpack.c b/src/libs6dns/s6dns_message_counts_unpack.c index ad773ef..968e5eb 100644 --- a/src/libs6dns/s6dns_message_counts_unpack.c +++ b/src/libs6dns/s6dns_message_counts_unpack.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> void s6dns_message_counts_unpack (char const *s, s6dns_message_counts_t *counts) diff --git a/src/libs6dns/s6dns_message_get_mx.c b/src/libs6dns/s6dns_message_get_mx.c index 049999e..8fb8abb 100644 --- a/src/libs6dns/s6dns_message_get_mx.c +++ b/src/libs6dns/s6dns_message_get_mx.c @@ -2,8 +2,7 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> -#include <s6-dns/s6dns-domain.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> int s6dns_message_get_mx (s6dns_message_rr_mx_t *mx, char const *packet, unsigned int packetlen, unsigned int *pos) diff --git a/src/libs6dns/s6dns_message_get_soa.c b/src/libs6dns/s6dns_message_get_soa.c index 5ba1239..c766231 100644 --- a/src/libs6dns/s6dns_message_get_soa.c +++ b/src/libs6dns/s6dns_message_get_soa.c @@ -2,7 +2,7 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint32.h> #include <s6-dns/s6dns-message.h> int s6dns_message_get_soa (s6dns_message_rr_soa_t *soa, char const *packet, unsigned int packetlen, unsigned int *pos) diff --git a/src/libs6dns/s6dns_message_get_srv.c b/src/libs6dns/s6dns_message_get_srv.c index ff11b96..13ecf13 100644 --- a/src/libs6dns/s6dns_message_get_srv.c +++ b/src/libs6dns/s6dns_message_get_srv.c @@ -2,7 +2,7 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> int s6dns_message_get_srv (s6dns_message_rr_srv_t *srv, char const *packet, unsigned int packetlen, unsigned int *pos) diff --git a/src/libs6dns/s6dns_message_get_string.c b/src/libs6dns/s6dns_message_get_string.c index e00f071..6257623 100644 --- a/src/libs6dns/s6dns_message_get_string.c +++ b/src/libs6dns/s6dns_message_get_string.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include "s6dns-message-internal.h" diff --git a/src/libs6dns/s6dns_message_header_pack.c b/src/libs6dns/s6dns_message_header_pack.c index 57ce350..ff496fa 100644 --- a/src/libs6dns/s6dns_message_header_pack.c +++ b/src/libs6dns/s6dns_message_header_pack.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> void s6dns_message_header_pack (char *s, s6dns_message_header_t const *h) diff --git a/src/libs6dns/s6dns_message_header_unpack.c b/src/libs6dns/s6dns_message_header_unpack.c index 9d68bad..819b953 100644 --- a/src/libs6dns/s6dns_message_header_unpack.c +++ b/src/libs6dns/s6dns_message_header_unpack.c @@ -1,6 +1,6 @@ /* ISC license. */ -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <s6-dns/s6dns-message.h> void s6dns_message_header_unpack (char const *s, s6dns_message_header_t *h) diff --git a/src/libs6dns/s6dns_message_parse_answer_domain.c b/src/libs6dns/s6dns_message_parse_answer_domain.c index 3f25bd9..cb67178 100644 --- a/src/libs6dns/s6dns_message_parse_answer_domain.c +++ b/src/libs6dns/s6dns_message_parse_answer_domain.c @@ -3,7 +3,6 @@ #include <errno.h> #include <skalibs/error.h> #include <skalibs/genalloc.h> -#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> int s6dns_message_parse_answer_domain (s6dns_message_rr_t const *rr, char const *packet, unsigned int packetlen, unsigned int pos, unsigned int section, void *stuff) diff --git a/src/libs6dns/s6dns_message_parse_getrr.c b/src/libs6dns/s6dns_message_parse_getrr.c index 86e5e59..8db0c5d 100644 --- a/src/libs6dns/s6dns_message_parse_getrr.c +++ b/src/libs6dns/s6dns_message_parse_getrr.c @@ -2,7 +2,8 @@ #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> +#include <skalibs/uint32.h> #include <s6-dns/s6dns-message.h> int s6dns_message_parse_getrr (s6dns_message_rr_t_ref rr, char const *packet, unsigned int packetlen, unsigned int *pos) diff --git a/src/libs6dns/s6dns_message_parse_next.c b/src/libs6dns/s6dns_message_parse_next.c index a7bbce6..2aa8239 100644 --- a/src/libs6dns/s6dns_message_parse_next.c +++ b/src/libs6dns/s6dns_message_parse_next.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <errno.h> #include <s6-dns/s6dns-message.h> unsigned int s6dns_message_parse_next (s6dns_message_counts_t *counts, s6dns_message_rr_t const *rr, char const *packet, unsigned int packetlen, unsigned int *pos) diff --git a/src/libs6dns/s6dns_rci_here.c b/src/libs6dns/s6dns_rci_here.c index 2f08513..7bc8c0a 100644 --- a/src/libs6dns/s6dns_rci_here.c +++ b/src/libs6dns/s6dns_rci_here.c @@ -1,7 +1,5 @@ /* ISC license. */ -/* MT-unsafe */ - #include <s6-dns/s6dns-rci.h> s6dns_rci_t s6dns_rci_here = S6DNS_RCI_ZERO ; diff --git a/src/libs6dns/s6dns_rci_init.c b/src/libs6dns/s6dns_rci_init.c index 446e211..5257d2c 100644 --- a/src/libs6dns/s6dns_rci_init.c +++ b/src/libs6dns/s6dns_rci_init.c @@ -1,13 +1,11 @@ /* ISC license. */ -#include <sys/types.h> #include <string.h> #include <errno.h> #include <skalibs/error.h> #include <skalibs/bytestr.h> #include <skalibs/bitarray.h> #include <skalibs/fmtscan.h> -#include <skalibs/tai.h> #include <skalibs/djbunix.h> #include <skalibs/stralloc.h> #include <skalibs/ip46.h> diff --git a/src/libs6dns/s6dns_rci_zero.c b/src/libs6dns/s6dns_rci_zero.c index 384b42a..48f44ef 100644 --- a/src/libs6dns/s6dns_rci_zero.c +++ b/src/libs6dns/s6dns_rci_zero.c @@ -1,7 +1,5 @@ /* ISC license. */ -/* MT-unsafe */ - #include <s6-dns/s6dns-rci.h> s6dns_rci_t const s6dns_rci_zero = S6DNS_RCI_ZERO ; diff --git a/src/libs6dns/s6dns_resolve_core.c b/src/libs6dns/s6dns_resolve_core.c index c321869..1c59edb 100644 --- a/src/libs6dns/s6dns_resolve_core.c +++ b/src/libs6dns/s6dns_resolve_core.c @@ -1,11 +1,7 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> -#include <skalibs/tai.h> #include <s6-dns/s6dns-constants.h> -#include <s6-dns/s6dns-ip46.h> -#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-resolve.h> diff --git a/src/libs6dns/s6dns_resolve_dpag.c b/src/libs6dns/s6dns_resolve_dpag.c index 3eaa959..d77890d 100644 --- a/src/libs6dns/s6dns_resolve_dpag.c +++ b/src/libs6dns/s6dns_resolve_dpag.c @@ -1,11 +1,5 @@ /* ISC license. */ -#include <stdint.h> -#include <skalibs/tai.h> -#include <skalibs/genalloc.h> -#include <s6-dns/s6dns-message.h> -#include <s6-dns/s6dns-engine.h> -#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolve_dpag_r (genalloc *ds, char const *name, unsigned int len, uint16_t qtype, int qualif, s6dns_engine_t *dt, s6dns_rci_t const *rci, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolve_mpag.c b/src/libs6dns/s6dns_resolve_mpag.c index b9d64e3..98282f3 100644 --- a/src/libs6dns/s6dns_resolve_mpag.c +++ b/src/libs6dns/s6dns_resolve_mpag.c @@ -1,12 +1,5 @@ /* ISC license. */ -#include <stdint.h> -#include <skalibs/tai.h> -#include <skalibs/stralloc.h> -#include <skalibs/genalloc.h> -#include <s6-dns/s6dns-message.h> -#include <s6-dns/s6dns-engine.h> -#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolve_mpag_r (stralloc *sa, genalloc *offsets, char const *name, unsigned int len, uint16_t qtype, s6dns_message_rr_func_t_ref parsefunc, int qualif, s6dns_engine_t *dt, s6dns_rci_t const *rci, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolve_name4.c b/src/libs6dns/s6dns_resolve_name4.c index 4dc47ba..a7d9cae 100644 --- a/src/libs6dns/s6dns_resolve_name4.c +++ b/src/libs6dns/s6dns_resolve_name4.c @@ -1,11 +1,7 @@ /* ISC license. */ -#include <skalibs/tai.h> -#include <skalibs/genalloc.h> #include <s6-dns/s6dns-constants.h> -#include <s6-dns/s6dns-ip46.h> -#include <s6-dns/s6dns-message.h> -#include <s6-dns/s6dns-engine.h> +#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolve_name4_r (genalloc *list, char const *ip, s6dns_engine_t *dt, s6dns_ip46list_t const *servers, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolve_name6.c b/src/libs6dns/s6dns_resolve_name6.c index 39cbd43..6fd1ce5 100644 --- a/src/libs6dns/s6dns_resolve_name6.c +++ b/src/libs6dns/s6dns_resolve_name6.c @@ -1,12 +1,7 @@ /* ISC license. */ -#include <skalibs/tai.h> -#include <skalibs/genalloc.h> #include <s6-dns/s6dns-constants.h> -#include <s6-dns/s6dns-ip46.h> #include <s6-dns/s6dns-domain.h> -#include <s6-dns/s6dns-message.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolve_name6_r (genalloc *list, char const *ip, s6dns_engine_t *dt, s6dns_ip46list_t const *servers, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolve_parse.c b/src/libs6dns/s6dns_resolve_parse.c index 2abb237..b3ecaea 100644 --- a/src/libs6dns/s6dns_resolve_parse.c +++ b/src/libs6dns/s6dns_resolve_parse.c @@ -1,9 +1,5 @@ /* ISC license. */ -#include <stdint.h> -#include <skalibs/tai.h> -#include <s6-dns/s6dns-ip46.h> -#include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-resolve.h> diff --git a/src/libs6dns/s6dns_resolven_parse.c b/src/libs6dns/s6dns_resolven_parse.c index a53f605..d8b7435 100644 --- a/src/libs6dns/s6dns_resolven_parse.c +++ b/src/libs6dns/s6dns_resolven_parse.c @@ -1,9 +1,6 @@ /* ISC license. */ #include <errno.h> -#include <skalibs/tai.h> -#include <skalibs/iopause.h> -#include <s6-dns/s6dns-ip46.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-resolve.h> diff --git a/src/libs6dns/s6dns_resolvenoq.c b/src/libs6dns/s6dns_resolvenoq.c index 567eabd..f5fc56b 100644 --- a/src/libs6dns/s6dns_resolvenoq.c +++ b/src/libs6dns/s6dns_resolvenoq.c @@ -1,11 +1,6 @@ /* ISC license. */ -#include <stdint.h> -#include <skalibs/tai.h> -#include <s6-dns/s6dns-ip46.h> #include <s6-dns/s6dns-domain.h> -#include <s6-dns/s6dns-message.h> -#include <s6-dns/s6dns-engine.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolvenoq_r (char const *name, size_t len, uint16_t qtype, s6dns_message_rr_func_t_ref parsefunc, void *data, s6dns_engine_t *dt, s6dns_ip46list_t const *servers, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolvenoq_aaaaa.c b/src/libs6dns/s6dns_resolvenoq_aaaaa.c index 2123530..734d048 100644 --- a/src/libs6dns/s6dns_resolvenoq_aaaaa.c +++ b/src/libs6dns/s6dns_resolvenoq_aaaaa.c @@ -1,12 +1,9 @@ /* ISC license. */ -#include <sys/types.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> -#include <skalibs/tai.h> #include <skalibs/ip46.h> #include <s6-dns/s6dns-constants.h> -#include <s6-dns/s6dns-ip46.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-resolve.h> diff --git a/src/libs6dns/s6dns_resolveq.c b/src/libs6dns/s6dns_resolveq.c index ff774b8..a2933ee 100644 --- a/src/libs6dns/s6dns_resolveq.c +++ b/src/libs6dns/s6dns_resolveq.c @@ -1,13 +1,10 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/tai.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-engine.h> -#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolveq_r (char const *name, size_t len, uint16_t qtype, s6dns_message_rr_func_t_ref parsefunc, void *data, s6dns_rci_t const *rci, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/libs6dns/s6dns_resolveq_aaaaa.c b/src/libs6dns/s6dns_resolveq_aaaaa.c index 61872d7..5a0a358 100644 --- a/src/libs6dns/s6dns_resolveq_aaaaa.c +++ b/src/libs6dns/s6dns_resolveq_aaaaa.c @@ -1,16 +1,14 @@ /* ISC license. */ -#include <sys/types.h> #include <errno.h> #include <skalibs/error.h> #include <skalibs/stralloc.h> #include <skalibs/genalloc.h> -#include <skalibs/tai.h> #include <skalibs/ip46.h> +#include <s6-dns/s6dns-constants.h> #include <s6-dns/s6dns-domain.h> #include <s6-dns/s6dns-message.h> #include <s6-dns/s6dns-engine.h> -#include <s6-dns/s6dns-rci.h> #include <s6-dns/s6dns-resolve.h> int s6dns_resolveq_aaaaa_r (genalloc *ips, char const *name, size_t len, s6dns_rci_t const *rci, s6dns_debughook_t const *dbh, tain_t const *deadline, tain_t *stamp) diff --git a/src/skadns/skadns_cancel.c b/src/skadns/skadns_cancel.c index 3595585..8a4ec7c 100644 --- a/src/skadns/skadns_cancel.c +++ b/src/skadns/skadns_cancel.c @@ -5,11 +5,9 @@ #define _BSD_SOURCE #endif -#include <stdint.h> #include <errno.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/error.h> -#include <skalibs/tai.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> #include <s6-dns/skadns.h> diff --git a/src/skadns/skadns_packet.c b/src/skadns/skadns_packet.c index c77bb04..ff5f300 100644 --- a/src/skadns/skadns_packet.c +++ b/src/skadns/skadns_packet.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/gensetdyn.h> #include <s6-dns/skadns.h> diff --git a/src/skadns/skadns_packetlen.c b/src/skadns/skadns_packetlen.c index 77e3ba1..bf9f98b 100644 --- a/src/skadns/skadns_packetlen.c +++ b/src/skadns/skadns_packetlen.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <stdint.h> #include <errno.h> #include <skalibs/gensetdyn.h> #include <s6-dns/skadns.h> diff --git a/src/skadns/skadns_release.c b/src/skadns/skadns_release.c index f563dbe..26c9c4f 100644 --- a/src/skadns/skadns_release.c +++ b/src/skadns/skadns_release.c @@ -5,7 +5,6 @@ #define _BSD_SOURCE #endif -#include <stdint.h> #include <errno.h> #include <skalibs/alloc.h> #include <skalibs/gensetdyn.h> diff --git a/src/skadns/skadns_send.c b/src/skadns/skadns_send.c index 35177c2..9df39f0 100644 --- a/src/skadns/skadns_send.c +++ b/src/skadns/skadns_send.c @@ -4,19 +4,16 @@ #include <string.h> #include <stdint.h> #include <errno.h> -#include <skalibs/types.h> -#include <skalibs/tai.h> -#include <skalibs/stralloc.h> +#include <skalibs/uint16.h> #include <skalibs/gensetdyn.h> #include <skalibs/skaclient.h> -#include <s6-dns/s6dns-domain.h> #include <s6-dns/skadns.h> static skadnsanswer_t const skadnsanswer_initial = { .status = EAGAIN, .data = 0, .len = 0 } ; int skadns_send (skadns_t *a, uint16_t *u, s6dns_domain_t const *d, uint16_t qtype, tain_t const *limit, tain_t const *deadline, tain_t *stamp) { - unsigned int i ; + uint32_t i ; char tmp[17] = "--Q" ; char err ; struct iovec v[2] = { { .iov_base = tmp, .iov_len = 17 }, { .iov_base = (void *)d->s, .iov_len = d->len } } ; diff --git a/src/skadns/skadns_start.c b/src/skadns/skadns_start.c index 2f56cc8..f2376e2 100644 --- a/src/skadns/skadns_start.c +++ b/src/skadns/skadns_start.c @@ -1,6 +1,5 @@ /* ISC license. */ -#include <skalibs/tai.h> #include <skalibs/skaclient.h> #include <s6-dns/skadns.h> diff --git a/src/skadns/skadns_startf.c b/src/skadns/skadns_startf.c index ac19a0c..8dc1675 100644 --- a/src/skadns/skadns_startf.c +++ b/src/skadns/skadns_startf.c @@ -1,7 +1,6 @@ /* ISC license. */ #include <skalibs/environ.h> -#include <skalibs/tai.h> #include <skalibs/skaclient.h> #include <s6-dns/skadns.h> diff --git a/src/skadns/skadns_update.c b/src/skadns/skadns_update.c index 24b1e2e..39b1dd0 100644 --- a/src/skadns/skadns_update.c +++ b/src/skadns/skadns_update.c @@ -9,7 +9,7 @@ #include <stdint.h> #include <errno.h> #include <skalibs/error.h> -#include <skalibs/types.h> +#include <skalibs/uint16.h> #include <skalibs/alloc.h> #include <skalibs/genalloc.h> #include <skalibs/gensetdyn.h> |