mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-20 23:00:56 -05:00
lint faster, lint fix and define.
git-svn-id: file:///svn/unbound/trunk@260 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
f4ee65daa5
commit
182b6b7b46
4 changed files with 15 additions and 9 deletions
13
Makefile.in
13
Makefile.in
|
|
@ -126,12 +126,13 @@ realclean: clean
|
|||
rm -f util/configlexer.c util/configparser.c util/configparser.h
|
||||
rm -f Makefile
|
||||
|
||||
lint:
|
||||
$Qfor i in $(filter-out util/configparser.c,$(filter-out util/configlexer.c,$(sort $(ALL_SRC)))); do \
|
||||
echo lint $$i; \
|
||||
$(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $(srcdir)/$$i ; \
|
||||
if [ $$? -ne 0 ] ; then exit 1 ; fi ; \
|
||||
done
|
||||
$(BUILD)%.lint: $(srcdir)/%.c
|
||||
$(INFO) Lint $<
|
||||
@if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi
|
||||
$Q$(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $<
|
||||
$Qtouch $@
|
||||
|
||||
lint: $(addprefix $(BUILD),$(filter-out util/configparser.lint,$(filter-out util/configlexer.lint,$(sort $(ALL_SRC:.c=.lint)))))
|
||||
|
||||
tags: $(srcdir)/*.[ch] $(srcdir)/*/*.[ch]
|
||||
ctags -f $(srcdir)/tags $(srcdir)/*.[ch] $(srcdir)/*/*.[ch]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
26 April 2007: Wouter
|
||||
- floating point exception fix in lock-verify.
|
||||
- lint uses make dependency
|
||||
- fixup lint in dname owner domain name compression code.
|
||||
- define for offset range that can be compressed to.
|
||||
|
||||
25 April 2007: Wouter
|
||||
- prettier code; parse_rrset->type kept in host byte order.
|
||||
|
|
|
|||
|
|
@ -183,6 +183,8 @@ struct rr_parse {
|
|||
|
||||
/** error codes, extended with EDNS, so > 15. */
|
||||
#define EDNS_RCODE_BADVERS 16 /** bad EDNS version */
|
||||
/** largest valid compression offset */
|
||||
#define PTR_MAX_OFFSET 0x3fff
|
||||
|
||||
/**
|
||||
* EDNS data storage
|
||||
|
|
|
|||
|
|
@ -649,7 +649,7 @@ compress_tree_store(struct compress_tree_node** tree, uint8_t* dname,
|
|||
if(closest) uplabs = labs - closest->labs;
|
||||
log_assert(uplabs >= 0);
|
||||
while(uplabs--) {
|
||||
if(offset > 0x3fff) { /* largest valid compr. offset */
|
||||
if(offset > PTR_MAX_OFFSET) {
|
||||
if(lastparentptr)
|
||||
*lastparentptr = closest;
|
||||
return 1; /* compression pointer no longer useful */
|
||||
|
|
@ -713,7 +713,7 @@ bakedname(int dosig, struct compress_tree_node** tree, size_t* offset,
|
|||
struct compress_tree_node* p;
|
||||
int labs = dname_count_labels(rk->dname);
|
||||
p = compress_tree_lookup(*tree, rk->dname, labs);
|
||||
if(p) {
|
||||
if(p && p->offset <= PTR_MAX_OFFSET) {
|
||||
/* compress it */
|
||||
int labcopy = labs - p->labs;
|
||||
size_t len = 0;
|
||||
|
|
@ -735,7 +735,7 @@ bakedname(int dosig, struct compress_tree_node** tree, size_t* offset,
|
|||
from += lablen;
|
||||
}
|
||||
/* insert compression ptr */
|
||||
ptr = 0xc000 | p->offset;
|
||||
ptr = (uint16_t)(0xc000 | p->offset);
|
||||
ptr = htons(ptr);
|
||||
memmove(dat, &ptr, sizeof(ptr));
|
||||
len += sizeof(ptr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue