From ae1f55cbdddc0d07e1cdaf0cafb735c63942ec14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 15 Feb 2017 18:19:32 +0100 Subject: [PATCH] kres-gen.lua: reduce installed whitespace --- daemon/daemon.mk | 5 +- daemon/lua/kres-gen.lua | 218 ++++++++++++++++++++-------------------- 2 files changed, 112 insertions(+), 111 deletions(-) diff --git a/daemon/daemon.mk b/daemon/daemon.mk index 3d66c040e..d33b13513 100644 --- a/daemon/daemon.mk +++ b/daemon/daemon.mk @@ -58,7 +58,8 @@ daemon/lua/trust_anchors.lua: daemon/lua/trust_anchors.lua.in daemon/lua/kres-gen.lua: | $(libkres) @echo "WARNING: regenerating $@" - daemon/lua/kres-gen.sh > $@ + @# the sed saves some space(s) + daemon/lua/kres-gen.sh | sed 's/ /\t/g' > $@ .DELETE_ON_ERROR: daemon/lua/kres-gen.lua # Client @@ -73,4 +74,4 @@ client-install: kresc-install client-clean: kresc-clean endif -.PHONY: daemon daemon-install daemon-clean client client-install client-clean \ No newline at end of file +.PHONY: daemon daemon-install daemon-clean client client-install client-clean diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua index 6ccab78b4..eca33cf76 100644 --- a/daemon/lua/kres-gen.lua +++ b/daemon/lua/kres-gen.lua @@ -11,154 +11,154 @@ typedef void *(*map_alloc_f)(void *, size_t); typedef void (*map_free_f)(void *baton, void *ptr); typedef enum {KNOT_ANSWER, KNOT_AUTHORITY, KNOT_ADDITIONAL} knot_section_t; typedef struct { - uint16_t pos; - uint16_t flags; - uint16_t compress_ptr[16]; + uint16_t pos; + uint16_t flags; + uint16_t compress_ptr[16]; } knot_rrinfo_t; typedef unsigned char knot_dname_t; typedef unsigned char knot_rdata_t; typedef struct knot_rdataset knot_rdataset_t; struct knot_rdataset { - uint16_t rr_count; - knot_rdata_t *data; + uint16_t rr_count; + knot_rdata_t *data; }; typedef struct knot_rrset knot_rrset_t; typedef struct { - struct knot_pkt *pkt; - uint16_t pos; - uint16_t count; + struct knot_pkt *pkt; + uint16_t pos; + uint16_t count; } knot_pktsection_t; struct knot_pkt { - uint8_t *wire; - size_t size; - size_t max_size; - size_t parsed; - uint16_t reserved; - uint16_t qname_size; - uint16_t rrset_count; - uint16_t flags; - knot_rrset_t *opt_rr; - knot_rrset_t *tsig_rr; - struct { - uint8_t *pos; - size_t len; - } tsig_wire; - knot_section_t current; - knot_pktsection_t sections[3]; - size_t rrset_allocd; - knot_rrinfo_t *rr_info; - knot_rrset_t *rr; - knot_mm_t mm; + uint8_t *wire; + size_t size; + size_t max_size; + size_t parsed; + uint16_t reserved; + uint16_t qname_size; + uint16_t rrset_count; + uint16_t flags; + knot_rrset_t *opt_rr; + knot_rrset_t *tsig_rr; + struct { + uint8_t *pos; + size_t len; + } tsig_wire; + knot_section_t current; + knot_pktsection_t sections[3]; + size_t rrset_allocd; + knot_rrinfo_t *rr_info; + knot_rrset_t *rr; + knot_mm_t mm; }; typedef struct knot_pkt knot_pkt_t; typedef struct { - void *root; - map_alloc_f malloc; - map_free_f free; - void *baton; + void *root; + map_alloc_f malloc; + map_free_f free; + void *baton; } map_t; typedef struct { - knot_rrset_t **at; - size_t len; - size_t cap; + knot_rrset_t **at; + size_t len; + size_t cap; } rr_array_t; struct ranked_rr_array_entry { - uint32_t qry_uid; - uint8_t rank; - uint8_t revalidation_cnt; - _Bool cached; - _Bool yielded; - _Bool to_wire; - knot_rrset_t *rr; + uint32_t qry_uid; + uint8_t rank; + uint8_t revalidation_cnt; + _Bool cached; + _Bool yielded; + _Bool to_wire; + knot_rrset_t *rr; }; typedef struct ranked_rr_array_entry ranked_rr_array_entry_t; typedef struct { - ranked_rr_array_entry_t **at; - size_t len; - size_t cap; + ranked_rr_array_entry_t **at; + size_t len; + size_t cap; } ranked_rr_array_t; struct kr_zonecut { - knot_dname_t *name; - knot_rrset_t *key; - knot_rrset_t *trust_anchor; - struct kr_zonecut *parent; - map_t nsset; - knot_mm_t *pool; + knot_dname_t *name; + knot_rrset_t *key; + knot_rrset_t *trust_anchor; + struct kr_zonecut *parent; + map_t nsset; + knot_mm_t *pool; }; typedef struct { - struct kr_query **at; - size_t len; - size_t cap; + struct kr_query **at; + size_t len; + size_t cap; } kr_qarray_t; struct kr_rplan { - kr_qarray_t pending; - kr_qarray_t resolved; - struct kr_request *request; - knot_mm_t *pool; - uint32_t next_uid; + kr_qarray_t pending; + kr_qarray_t resolved; + struct kr_request *request; + knot_mm_t *pool; + uint32_t next_uid; }; struct kr_request { - struct kr_context *ctx; - knot_pkt_t *answer; - struct kr_query *current_query; - struct { - const knot_rrset_t *key; - const struct sockaddr *addr; - const struct sockaddr *dst_addr; - const knot_pkt_t *packet; - const knot_rrset_t *opt; - } qsource; - struct { - unsigned int rtt; - const struct sockaddr *addr; - } upstream; - uint32_t options; - int state; - ranked_rr_array_t answ_selected; - ranked_rr_array_t auth_selected; - rr_array_t additional; - _Bool answ_validated; - _Bool auth_validated; - struct kr_rplan rplan; - int has_tls; - knot_mm_t pool; + struct kr_context *ctx; + knot_pkt_t *answer; + struct kr_query *current_query; + struct { + const knot_rrset_t *key; + const struct sockaddr *addr; + const struct sockaddr *dst_addr; + const knot_pkt_t *packet; + const knot_rrset_t *opt; + } qsource; + struct { + unsigned int rtt; + const struct sockaddr *addr; + } upstream; + uint32_t options; + int state; + ranked_rr_array_t answ_selected; + ranked_rr_array_t auth_selected; + rr_array_t additional; + _Bool answ_validated; + _Bool auth_validated; + struct kr_rplan rplan; + int has_tls; + knot_mm_t pool; }; struct knot_rrset { - knot_dname_t *_owner; - uint16_t type; - uint16_t rclass; - knot_rdataset_t rrs; - void *additional; + knot_dname_t *_owner; + uint16_t type; + uint16_t rclass; + knot_rdataset_t rrs; + void *additional; }; struct kr_nsrep { - unsigned int score; - unsigned int reputation; - const knot_dname_t *name; - struct kr_context *ctx; + unsigned int score; + unsigned int reputation; + const knot_dname_t *name; + struct kr_context *ctx; /* beware: hidden stub */ }; struct kr_query { - struct kr_query *parent; - knot_dname_t *sname; - uint16_t stype; - uint16_t sclass; - uint16_t id; - uint32_t flags; - uint32_t secret; - uint16_t fails; - uint16_t reorder; - struct timeval timestamp; - struct kr_zonecut zone_cut; - struct kr_nsrep ns; + struct kr_query *parent; + knot_dname_t *sname; + uint16_t stype; + uint16_t sclass; + uint16_t id; + uint32_t flags; + uint32_t secret; + uint16_t fails; + uint16_t reorder; + struct timeval timestamp; + struct kr_zonecut zone_cut; + struct kr_nsrep ns; /* ^hidden stub^ */ char _stub[]; }; struct kr_context { - uint32_t options; - knot_rrset_t *opt_rr; - map_t trust_anchors; - map_t negative_anchors; - struct kr_zonecut root_hints; + uint32_t options; + knot_rrset_t *opt_rr; + map_t trust_anchors; + map_t negative_anchors; + struct kr_zonecut root_hints; char _stub[]; }; struct query_flag {static const int NO_MINIMIZE = 1; static const int NO_THROTTLE = 2; static const int NO_IPV6 = 4; static const int NO_IPV4 = 8; static const int TCP = 16; static const int RESOLVED = 32; static const int AWAIT_IPV4 = 64; static const int AWAIT_IPV6 = 128; static const int AWAIT_CUT = 256; static const int SAFEMODE = 512; static const int CACHED = 1024; static const int NO_CACHE = 2048; static const int EXPIRING = 4096; static const int ALLOW_LOCAL = 8192; static const int DNSSEC_WANT = 16384; static const int DNSSEC_BOGUS = 32768; static const int DNSSEC_INSECURE = 65536; static const int STUB = 131072; static const int ALWAYS_CUT = 262144; static const int DNSSEC_WEXPAND = 524288; static const int PERMISSIVE = 1048576; static const int STRICT = 2097152; static const int BADCOOKIE_AGAIN = 4194304; static const int CNAME = 8388608; static const int REORDER_RR = 16777216; static const int TRACE = 33554432; static const int NO_0X20 = 67108864;}; -- 2.47.3