Reorganized source files, renamed zonec.

- zonec renamed to zoneparser
- src/zone/ renamed to src/zoneparser/
- zone loader and zone dump moved to dnslib

CuteDNS.files

@@ -9,34 +9,9 @@ src/hash/universal-system.c
 src/hash/universal-system.h
 src/other/print.c
 src/other/print.h
-src/server/socket.c
-src/server/socket.h
-src/server/name-server.c
-src/server/name-server.h
-src/server/server.c
-src/server/server.h
-src/zone/zlexer.lex
-src/zone/zonec.c
-src/zone/zonec.h
-src/zone/zparser.y
-src/zone/zone-dump.c
-src/zone/zone-dump.h
-src/zone/zone-load.c
-src/zone/zone-load.h
-src/zone/parser-util.h
-src/zone/parser-util.c
-src/tests/libtap/tap.c
-src/tests/libtap/tap.h
-src/tests/main.c
-src/tests/server_tests.c
-src/tests/skiplist_tests.c
-src/tests/slab_tests.c
-src/tests/da_tests.c
-src/tests/tap_unit.h
-src/tests/zonedb_tests.c
-src/tests/dnslib_tests.c
-src/tests/cuckoo_tests.c
-src/tests/template_tests.c
+src/other/tree.h
+src/other/bitset.h
+src/other/bitset.c
 src/other/log.h
 src/other/log.c
 src/other/debug.h
@@ -44,11 +19,22 @@ src/other/dynamic-array.h
 src/other/dynamic-array.c
 src/other/skip-list.h
 src/other/skip-list.c
-tests/querytcp.c
+src/server/socket.c
+src/server/socket.h
+src/server/name-server.c
+src/server/name-server.h
+src/server/server.c
+src/server/server.h
 src/server/udp-handler.h
 src/server/tcp-handler.h
 src/server/udp-handler.c
 src/server/tcp-handler.c
+src/server/dthreads.h
+src/server/dthreads.c
+src/stat/gatherer.h
+src/stat/gatherer.c
+src/stat/stat.h
+src/stat/stat.c
 src/dnslib/dname.h
 src/dnslib/dname.c
 src/dnslib/rrset.h
@@ -58,26 +44,12 @@ src/dnslib/rdata.c
 src/dnslib/node.h
 src/dnslib/node.c
 src/dnslib/consts.h
-src/tests/dnslib/dnslib_dname_tests.c
-src/tests/dnslib/dnslib_rdata_tests.c
-src/tests/dnslib/dnslib_rrset_tests.c
-src/tests/dnslib/dnslib_node_tests.c
-src/tests/dnslib/dnslib_response_tests.c
 src/dnslib/descriptor.h
 src/dnslib/descriptor.c
-src/server/dthreads.h
-src/server/dthreads.c
-src/tests/dthreads_tests.c
-src/stat/gatherer.h
-src/stat/gatherer.c
-src/stat/stat.h
-src/stat/stat.c
 src/dnslib/zone.h
 src/dnslib/zone.c
-src/tests/dnslib/dnslib_zone_tests.c
 src/dnslib/rrsig.h
 src/dnslib/rrsig.c
-src/other/tree.h
 src/dnslib/response.h
 src/dnslib/packet.h
 src/dnslib/response.c
@@ -85,21 +57,47 @@ src/dnslib/edns.h
 src/dnslib/utils.h
 src/dnslib/zonedb.h
 src/dnslib/zonedb.c
-src/other/bitset.h
-src/other/bitset.c
-src/zone/dns.h
-src/zone/dns.c
-src/zone/main.c
-src/zone/parser-util.h
-src/zone/parser-util.c
 src/dnslib/debug.h
 src/dnslib/debug.c
 src/dnslib/dnslib.h
 src/dnslib/tolower.h
+src/dnslib/zone-dump.c
+src/dnslib/zone-dump.h
+src/dnslib/zone-load.c
+src/dnslib/zone-load.h
+src/zoneparser/dns.h
+src/zoneparser/dns.c
+src/zoneparser/main.c
+src/zoneparser/parser-util.h
+src/zoneparser/parser-util.c
+src/zoneparser/zlexer.lex
+src/zoneparser/zonec.c
+src/zoneparser/zonec.h
+src/zoneparser/zparser.y
 src/alloc/malloc.h
 src/alloc/malloc.c
 src/alloc/slab.h
 src/alloc/slab.c
+src/tests/libtap/tap.c
+src/tests/libtap/tap.h
+src/tests/main.c
+src/tests/server_tests.c
+src/tests/skiplist_tests.c
+src/tests/slab_tests.c
+src/tests/da_tests.c
+src/tests/tap_unit.h
+src/tests/zonedb_tests.c
+src/tests/dnslib_tests.c
+src/tests/cuckoo_tests.c
+src/tests/template_tests.c
+src/tests/dthreads_tests.c
+src/tests/dnslib/dnslib_dname_tests.c
+src/tests/dnslib/dnslib_rdata_tests.c
+src/tests/dnslib/dnslib_rrset_tests.c
+src/tests/dnslib/dnslib_node_tests.c
+src/tests/dnslib/dnslib_response_tests.c
+src/tests/dnslib/dnslib_zone_tests.c
+tests/querytcp.c
 deprecated/zone-database.c
 deprecated/zone-database.h
 deprecated/zone-data-structure.c

Makefile

@@ -9,10 +9,10 @@ COL_CYAN = \033[01;36m
 COL_WHITE = \033[01;37m
 COL_END = \033[0m
 
-INC_DIRS = obj/ src/ src/hash/ src/dns/ src/other/ src/server/ src/zone/ src/tests src/tests/libtap src/dnslib/ src/stat src/alloc/
+INC_DIRS = obj/ src/ src/hash/ src/dns/ src/other/ src/server/ src/zoneparser/ src/tests src/tests/libtap src/dnslib/ src/stat src/alloc/
 SRC_DIRS = src/
 TESTS_DIR = src/tests/
-ZONEC_DIR = src/zone/
+ZONEC_DIR = src/zoneparser/
 OBJ_DIR = obj/
 BIN_DIR = bin/
 
@@ -37,7 +37,7 @@ CFLAGS_OPTIMAL = -O2 -funroll-loops -fomit-frame-pointer
 CFLAGS += -Wall -std=gnu99 -D _XOPEN_SOURCE=600 -D_GNU_SOURCE
 LDFLAGS += -lpthread -lurcu -lldns -lrt -lm
 
-all: cutedns unittests zonec
+all: cutedns unittests zoneparser
 ifeq ($(DEBUG),1)
 CFLAGS += $(CFLAGS_DEBUG)
 else
@@ -50,18 +50,18 @@ DEPEND = $(CC) $(addprefix -I ,$(INC_DIRS)) -MM $(SRC_FILES)   2>/dev/null | sed
 Makefile.depend:
 	@$(DEPEND) > Makefile.depend
 
-$(LEXER_OBJ).c: $(SRC_DIRS)zone/zlexer.lex
+$(LEXER_OBJ).c: $(ZONEC_DIR)/zlexer.lex
 	$(LEX) -i -t $< >> $@
 
-$(PARSER_OBJ).c $(PARSER_OBJ).h: $(SRC_DIRS)zone/zparser.y
-	$(YACC) -d -o $(PARSER_OBJ).c $(SRC_DIRS)zone/zparser.y
+$(PARSER_OBJ).c $(PARSER_OBJ).h: $(ZONEC_DIR)/zparser.y
+	$(YACC) -d -o $(PARSER_OBJ).c $(ZONEC_DIR)/zparser.y
 
 # cutedns
 cutedns: Makefile.depend $(PARSER_FILES) $(OBJS) $(SRC_DIRS)main.c
 	@echo "$(COL_WHITE)Linking... $(COL_YELLOW)${BIN_DIR}$@$(COL_END) <-- $(COL_CYAN)$(OBJS) $(SRC_DIRS)main.c$(COL_END)"
 	@$(CC) $(CFLAGS) $(addprefix -I ,$(INC_DIRS)) $(LDFLAGS) $(OBJS) $(SRC_DIRS)main.c -o ${BIN_DIR}$@
 
-zonec: Makefile.depend cutedns $(OBJS) $(PARSER_FILES) $(ZPARSER_FILES)
+zoneparser: Makefile.depend cutedns $(OBJS) $(PARSER_FILES) $(ZPARSER_FILES)
 	@echo "$(COL_WHITE)Linking... $(COL_YELLOW)${BIN_DIR}$@$(COL_END) <-- $(COL_CYAN)$(PARSER_FILES) $(OBJS) $(ZONEC_FILES)$(COL_END)"
 	@$(CC) $(CFLAGS) $(addprefix -I ,$(INC_DIRS)) $(LDFLAGS) $(OBJS) $(ZONEC_FILES) -o ${BIN_DIR}$@