From c6da305acdbf001c6e1e41e7ce9ded5a81639870 Mon Sep 17 00:00:00 2001
From: Karel Slany <karel.slany@nic.cz>
Date: Wed, 13 Jul 2016 12:10:22 +0200
Subject: [PATCH] Changes induced by recent rebase.
---
lib/legacy/libknot/processing/layer.h | 59 ---------------------------
lib/rplan.c | 1 -
modules/cookies/cookiemonster.c | 2 +
3 files changed, 2 insertions(+), 60 deletions(-)
delete mode 100644 lib/legacy/libknot/processing/layer.h
diff --git a/lib/legacy/libknot/processing/layer.h b/lib/legacy/libknot/processing/layer.h
deleted file mode 100644
index dec48bf3f..000000000
--- a/lib/legacy/libknot/processing/layer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 2016 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Processing API has been removed from libknot in latest versions. */
-
-#include <libknot/packet/pkt.h>
-#include <libknot/mm_ctx.h>
-
-/*! Layer processing states.
- * Each state represents the state machine transition,
- * and determines readiness for the next action.
- */
-enum knot_layer_state {
- KNOT_STATE_NOOP = 0, /*!< N/A */
- KNOT_STATE_CONSUME = 1 << 0, /*!< Consume data. */
- KNOT_STATE_PRODUCE = 1 << 1, /*!< Produce data. */
- KNOT_STATE_DONE = 1 << 2, /*!< Finished. */
- KNOT_STATE_FAIL = 1 << 3 /*!< Error. */
-};
-
-struct knot_layer_api;
-typedef struct knot_layer_api knot_layer_api_t;
-
-struct knot_layer;
-typedef struct knot_layer knot_layer_t;
-
-/*! \brief Packet processing context. */
-struct knot_layer {
- knot_mm_t *mm; /* Processing memory context. */
- int state; /* Bitmap of enum knot_layer_state. */
- void *data; /* Module specific. */
- const struct knot_layer_api *api;
-};
-
-/*! \brief Packet processing module API. */
-struct knot_layer_api {
- int (*begin)(knot_layer_t *ctx, void *module_param);
- int (*reset)(knot_layer_t *ctx);
- int (*finish)(knot_layer_t *ctx);
- int (*consume)(knot_layer_t *ctx, knot_pkt_t *pkt);
- int (*produce)(knot_layer_t *ctx, knot_pkt_t *pkt);
- int (*fail)(knot_layer_t *ctx, knot_pkt_t *pkt);
- void *data;
-};
diff --git a/lib/rplan.c b/lib/rplan.c
index cff753af5..f5d050e80 100644
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -17,7 +17,6 @@
#include <libknot/descriptor.h>
#include <libknot/errcode.h>
-#include "lib/legacy/libknot/processing/layer.h"
#include "lib/rplan.h"
#include "lib/resolve.h"
#include "lib/cache.h"
diff --git a/modules/cookies/cookiemonster.c b/modules/cookies/cookiemonster.c
index 0f4d70eaf..bb6793502 100644
--- a/modules/cookies/cookiemonster.c
+++ b/modules/cookies/cookiemonster.c
@@ -28,6 +28,8 @@
#include "lib/cookies/helper.h"
#include "lib/cookies/lru_cache.h"
#include "lib/cookies/nonce.h"
+#include "lib/resolve.h"
+#include "lib/rplan.h"
#include "modules/cookies/cookiemonster.h"
#define DEBUG_MSG(qry, fmt...) QRDEBUG(qry, "cookies", fmt)
--
GitLab