diff options
Diffstat (limited to 'testcode/replay.h')
| -rw-r--r-- | testcode/replay.h | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/testcode/replay.h b/testcode/replay.h index beac3ce839d2..05bd442f57f5 100644 --- a/testcode/replay.h +++ b/testcode/replay.h @@ -21,16 +21,16 @@ * specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** @@ -129,7 +129,7 @@ #ifndef TESTCODE_REPLAY_H #define TESTCODE_REPLAY_H #include "util/netevent.h" -#include "testcode/ldns-testpkts.h" +#include "testcode/testpkts.h" #include "util/rbtree.h" struct replay_answer; struct replay_moment; @@ -138,6 +138,7 @@ struct fake_pending; struct fake_timer; struct replay_var; struct infra_cache; +struct sldns_buffer; /** * A replay scenario. @@ -217,12 +218,6 @@ struct replay_moment { /** length of addr, if 0, then any address will do */ socklen_t addrlen; - /** what pending query should timeout or is answered. or - * NULL for last sent query. - * Unused at this time. - */ - ldns_rr* qname; - /** macro name, for assign. */ char* variable; /** string argument, for assign. */ @@ -318,7 +313,7 @@ struct replay_runtime { */ struct fake_pending { /** what is important only that we remember the query, copied here. */ - ldns_buffer* buffer; + struct sldns_buffer* buffer; /** and to what address this is sent to. */ struct sockaddr_storage addr; /** len of addr */ @@ -338,8 +333,9 @@ struct fake_pending { /** next in pending list */ struct fake_pending* next; - /** the buffer parsed into a ldns_pkt */ - ldns_pkt* pkt; + /** the buffer parsed into a sldns_pkt */ + uint8_t* pkt; + size_t pkt_len; /** by what transport was the query sent out */ enum transport_type transport; /** if this is a serviced query */ @@ -357,7 +353,8 @@ struct replay_answer { /** reply information */ struct comm_reply repinfo; /** the answer preparsed as ldns pkt */ - ldns_pkt* pkt; + uint8_t* pkt; + size_t pkt_len; }; /** |