From 8d74686a7e41392792ec896c31af2e5e0193a9b4 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <clonearmy@gmail.com>
Date: Sat, 26 May 2012 19:15:56 +0200
Subject: [PATCH] minor changes
---
examples/dns.c | 15 ++++++++-------
src/hammer.h | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/examples/dns.c b/examples/dns.c
index e6dee66d..bc948c6b 100644
--- a/examples/dns.c
+++ b/examples/dns.c
@@ -388,7 +388,7 @@ const HParser* init_parser() {
h_int_range(h_uint16(), 255, 255),
NULL);
- const HParser *dns_question = h_sequence(h_sequence(h_many1(h_length_value(h_uint8(),
+ const HParser *dns_question = h_sequence(h_sequence(h_many1(h_length_value(h_int_range(h_uint8(), 1, 255),
h_uint8())),
h_ch('\x00'),
NULL), // QNAME
@@ -405,12 +405,13 @@ const HParser* init_parser() {
NULL);
- dns_message = (HParser*)h_attr_bool(h_sequence(dns_header,
- h_many(dns_question),
- h_many(dns_rr),
- h_end_p(),
- NULL),
- validate_dns);
+ dns_message = (HParser*)h_action(h_attr_bool(h_sequence(dns_header,
+ h_many(dns_question),
+ h_many(dns_rr),
+ h_end_p(),
+ NULL),
+ validate_dns),
+ pack_dns_struct);
return dns_message;
}
diff --git a/src/hammer.h b/src/hammer.h
index 95da0eed..62b56766 100644
--- a/src/hammer.h
+++ b/src/hammer.h
@@ -229,7 +229,7 @@ const HParser* h_action(const HParser* p, const HAction a);
*
* Result token type: TT_UINT
*/
-const HParser* h_not_in(const uint8_t *charset, int length);
+const HParser* h_not_in(const uint8_t *charset, size_t length);
/**
* A no-argument parser that succeeds if there is no more input to
--
GitLab