lib: minor reordering

diff --git a/knot-resolver.files b/knot-resolver.files
index 323b9c99a8ef4ef7fdc150c7c9ddd8dd4292e4ba..6074d1e44cecb3fcb97a0ef11282efed9c569e45 100644 (file)
--- a/knot-resolver.files
+++ b/knot-resolver.files
@@ -30,10 +30,12 @@ lib/resolve.c
 lib/resolve.h
 lib/rplan.c
 lib/rplan.h
+lib/utils.c
 lib/utils.h
 lib/zonecut.c
 lib/zonecut.h
 tests/Makefile.am
+tests/pydnstest/__init__.py
 tests/pydnstest/scenario.py
 tests/test.h
 tests/test_cache.c

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ba490c3ddae5dd57b6da79cef304c0432b8170d5..91dd2caf9b445629d38280da5afda1ddf9fe8047 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,6 +12,8 @@ libkresolve_static_la_SOURCES =               \
        layer/stats.h   \
        layer/stats.c   \
        layer.h                 \
+       utils.h                 \
+       utils.c                 \
        context.h               \
        context.c               \
        resolve.h               \

diff --git a/lib/rplan.c b/lib/rplan.c
index d4e82f46de93c0630ed1856efd5a7c55ba7ea13a..772172d4c1f69c269f2258890eae3e8f961a1ef2 100644 (file)
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -23,6 +23,7 @@
 #include "lib/rplan.h"
 #include "lib/context.h"
 #include "lib/cache.h"
+#include "lib/utils.h"
 
 #define DEBUG_MSG(fmt, ...) fprintf(stderr, "[rplan] " fmt, ## __VA_ARGS__)
 

diff --git a/lib/utils.c b/lib/utils.c
new file mode 100644 (file)
index 0000000..5796bae
--- /dev/null
+++ b/lib/utils.c
@@ -0,0 +1,21 @@
+#include <libknot/descriptor.h>
+#include <libknot/rrtype/aaaa.h>
+
+#include "lib/utils.h"
+
+int kr_rrset_to_addr(struct sockaddr_storage *ss, const knot_rrset_t *rr)
+{
+       /* Retrieve an address from glue record. */
+       switch(rr->type) {
+       case KNOT_RRTYPE_A:
+               knot_a_addr(&rr->rrs, 0, (struct sockaddr_in *)ss);
+               break;
+       case KNOT_RRTYPE_AAAA:
+               knot_aaaa_addr(&rr->rrs, 0, (struct sockaddr_in6 *)ss);
+               break;
+       default:
+               return KNOT_EINVAL;
+       }
+
+       return KNOT_EOK;
+}

diff --git a/lib/utils.h b/lib/utils.h
index 359819680a25a94a8b6bbdb311a88c953bbaf9c4..c795b32acbb5191fb259ee161edc60503a561d34 100644 (file)
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -16,9 +16,7 @@
 
 #pragma once
 
-#include <libknot/descriptor.h>
 #include <libknot/rrset.h>
-#include <libknot/rrtype/aaaa.h>
 #include <libknot/internal/sockaddr.h>
 
 #include "lib/defines.h"
@@ -29,20 +27,4 @@
  * \param rr resource record
  * \return KNOT_E*
  */
-static inline int kr_rrset_to_addr(struct sockaddr_storage *ss, const knot_rrset_t *rr)
-{
-       /* Retrieve an address from glue record. */
-       switch(rr->type) {
-       case KNOT_RRTYPE_A:
-               knot_a_addr(&rr->rrs, 0, (struct sockaddr_in *)ss);
-               break;
-       case KNOT_RRTYPE_AAAA:
-               knot_aaaa_addr(&rr->rrs, 0, (struct sockaddr_in6 *)ss);
-               break;
-       default:
-               return KNOT_EINVAL;
-       }
-
-       sockaddr_port_set((struct sockaddr_storage *)ss, KR_DNS_PORT);
-       return KNOT_EOK;
-}
+int kr_rrset_to_addr(struct sockaddr_storage *ss, const knot_rrset_t *rr);