Moved EDNS to libknot/rdata as opt.h

Knot.files

@@ -223,8 +223,6 @@ src/libknot/dnssec/sig0.c
 src/libknot/dnssec/sig0.h
 src/libknot/dnssec/sign.c
 src/libknot/dnssec/sign.h
-src/libknot/edns.c
-src/libknot/edns.h
 src/libknot/libknot.h
 src/libknot/packet/compr.c
 src/libknot/packet/compr.h
@@ -246,6 +244,8 @@ src/libknot/rdata/rrsig.h
 src/libknot/rdata/soa.h
 src/libknot/rdata/tsig.c
 src/libknot/rdata/tsig.h
+src/libknot/rdata/opt.c
+src/libknot/rdata/opt.h
 src/libknot/rdataset.c
 src/libknot/rdataset.h
 src/libknot/rrset-dump.c

src/Makefile.am

@@ -157,8 +157,8 @@ libknot_la_SOURCES =				\
 	libknot/dnssec/sig0.h			\
 	libknot/dnssec/sign.c			\
 	libknot/dnssec/sign.h			\
-	libknot/edns.c				\
-	libknot/edns.h				\
+	libknot/rdata/opt.c			\
+	libknot/rdata/opt.h			\
 	libknot/libknot.h			\
 	libknot/packet/compr.c			\
 	libknot/packet/compr.h			\

src/knot/conf/cf-parse.y

@@ -33,7 +33,7 @@
 #include "common/sockaddr.h"
 #include "libknot/dname.h"
 #include "libknot/binary.h"
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "knot/server/rrl.h"
 #include "knot/nameserver/query_module.h"
 #include "knot/conf/conf.h"

src/knot/nameserver/internet.c

@@ -19,7 +19,7 @@
 #include "libknot/common.h"
 #include "libknot/rdata/rdname.h"
 #include "libknot/rdata/soa.h"
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "libknot/dnssec/rrset-sign.h"
 #include "knot/nameserver/internet.h"
 #include "knot/nameserver/nsec_proofs.h"

src/libknot/libknot.h

@@ -29,7 +29,7 @@
 
 #include "libknot/consts.h"
 #include "libknot/dname.h"
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "libknot/packet/wire.h"
 #include "libknot/packet/compr.h"
 #include "libknot/packet/pkt.h"

src/libknot/packet/pkt.h

@@ -32,7 +32,7 @@
 
 #include "libknot/dname.h"
 #include "libknot/rrset.h"
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "libknot/packet/wire.h"
 #include "libknot/packet/compr.h"
 #include "common/mempattern.h"

src/libknot/edns.c → src/libknot/rdata/opt.c

@@ -19,7 +19,7 @@
 #include <assert.h>
 
 #include <string.h>
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "libknot/common.h"
 #include "common/descriptor.h"
 #include "common/debug.h"

src/libknot/edns.h → src/libknot/rdata/opt.h

 /*!
- * \file edns.h
+ * \file opt.h
  *
  * \author Lubos Slovak <lubos.slovak@nic.cz>
  *
- * \brief Functions for manipulating the EDNS OPT pseudo-RR and EDNS server
- *        parameters.
+ * \brief Functions for manipulating the EDNS OPT pseudo-RR.
  *
  * \addtogroup libknot
  * @{
@@ -25,8 +24,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _KNOT_EDNS_H_
-#define _KNOT_EDNS_H_
+#ifndef _KNOT_OPT_H_
+#define _KNOT_OPT_H_
 
 #include <stdint.h>
 
@@ -235,6 +234,6 @@ bool knot_edns_has_nsid(const knot_rrset_t *opt_rr);
  */
 bool knot_edns_check_record(knot_rrset_t *opt_rr);
 
-#endif /* _KNOT_EDNS_H_ */
+#endif /* _KNOT_OPT_H_ */
 
 /*! @} */

tests/edns.c

@@ -19,7 +19,7 @@
 
 #include <assert.h>
 #include "common/errcode.h"
-#include "libknot/edns.h"
+#include "libknot/rdata/opt.h"
 #include "common/descriptor.h"
 
 static const uint16_t E_MAX_PLD = 10000;