Merge remote branch 'origin/axfr-in' into debug
Conflicts: src/knot/server/tcp-handler.c
Showing
- Knot.files 8 additions, 0 deletionsKnot.files
- configure.ac 1 addition, 1 deletionconfigure.ac
- libknot/hash/cuckoo-hash-table.c 1 addition, 1 deletionlibknot/hash/cuckoo-hash-table.c
- libknot/nameserver/name-server.c 1 addition, 0 deletionslibknot/nameserver/name-server.c
- libknot/nameserver/name-server.h 1 addition, 0 deletionslibknot/nameserver/name-server.h
- src/Makefile.am 10 additions, 2 deletionssrc/Makefile.am
- src/common/acl.c 8 additions, 10 deletionssrc/common/acl.c
- src/common/evsched.c 23 additions, 8 deletionssrc/common/evsched.c
- src/common/fdset.c 74 additions, 0 deletionssrc/common/fdset.c
- src/common/fdset.h 181 additions, 0 deletionssrc/common/fdset.h
- src/common/fdset_epoll.c 197 additions, 0 deletionssrc/common/fdset_epoll.c
- src/common/fdset_poll.c 212 additions, 0 deletionssrc/common/fdset_poll.c
- src/common/lists.c 2 additions, 0 deletionssrc/common/lists.c
- src/common/sockaddr.c 15 additions, 5 deletionssrc/common/sockaddr.c
- src/knot/main.c 1 addition, 0 deletionssrc/knot/main.c
- src/knot/server/server.c 5 additions, 6 deletionssrc/knot/server/server.c
- src/knot/server/tcp-handler.c 202 additions, 223 deletionssrc/knot/server/tcp-handler.c
- src/knot/server/tcp-handler.h 2 additions, 18 deletionssrc/knot/server/tcp-handler.h
- src/knot/server/xfr-handler.c 445 additions, 469 deletionssrc/knot/server/xfr-handler.c
- src/knot/server/xfr-handler.h 22 additions, 34 deletionssrc/knot/server/xfr-handler.h
Loading
Please register or sign in to comment