Merge remote-tracking branch 'bunter/master'

Also, fix makefile

Conflicts:
	src/hammer.c

examples/Makefile

@@ -0,0 +1,16 @@
+
+OUTPUTS := dns.o \
+	   dns
+
+TOPLEVEL := ../
+
+include ../common.mk
+
+
+all: dns
+
+dns: LDFLAGS:=-L../src -lhammer $(LDFLAGS)
+dns: dns.o
+	$(call hush, "Linking $@") $(CC) -o $@ $^ $(LDFLAGS)
+
+dns.o: ../src/hammer.h

examples/dns.c

@@ -1,16 +1,51 @@
-#include "../hammer.h"
+#include "../src/hammer.h"
+
+#define false 0
+#define true 1
 
 bool is_zero(parse_result_t *p) {
+  if (TT_UINT != p->ast->token_type)
+    return false;
   return (0 == p->ast->uint);
 }
 
-bool validate_dns(parse_result_t *p) {
-  
+/**
+ * A label can't be more than 63 characters.
+ */
+bool validate_label(parse_result_t *p) {
+  if (TT_SEQUENCE != p->ast->token_type)
+    return false;
+  return (64 > p->ast->seq->used);
 }
 
-int main(int argc, char **argv) {
+/**
+ * Every DNS message should have QDCOUNT entries in the question
+ * section, and ANCOUNT+NSCOUNT+ARCOUNT resource records.
+ */
+bool validate_dns(parse_result_t *p) {
+  if (TT_SEQUENCE != p->ast->token_type)
+    return false;
+  // The header holds the counts as its last 4 elements.
+  parsed_token_t **elems = p->ast->seq->elements[0]->seq->elements;
+  size_t qd = elems[8]->uint;
+  size_t an = elems[9]->uint;
+  size_t ns = elems[10]->uint;
+  size_t ar = elems[11]->uint;
+  parsed_token_t *questions = p->ast->seq->elements[1];
+  if (questions->seq->used != qd)
+    return false;
+  parsed_token_t *rrs = p->ast->seq->elements[2];
+  if (an+ns+ar != rrs->seq->used)
+    return false;
+  return true;
+}
 
-  const parser_t dns_header = sequence(bits(16, false), // ID
+parser_t* init_parser() {
+  static parser_t *dns_message = NULL;
+  if (dns_message)
+    return dns_message;
+
+  const parser_t *dns_header = sequence(bits(16, false), // ID
 				       bits(1, false),  // QR
 				       bits(4, false),  // opcode
 				       bits(1, false),  // AA
@@ -25,28 +60,44 @@ int main(int argc, char **argv) {
 				       uint16(), // ARCOUNT
 				       NULL);
 
-  const parser_t *dns_question = sequence(length_value(uint8(), uint8()), // QNAME
-					  uint16(),                       // QTYPE
-					  uint16(),                       // QCLASS
+  const parser_t *type = int_range(uint16(), 1, 16);
+
+  const parser_t *qtype = choice(type, 
+				 int_range(uint16(), 252, 255),
+				 NULL);
+
+  const parser_t *class = int_range(uint16(), 1, 4);
+  
+  const parser_t *qclass = choice(class,
+				  int_range(uint16(), 255, 255),
+				  NULL);
+
+  const parser_t *dns_question = sequence(sequence(many1(length_value(uint8(), 
+								      uint8())), 
+						   ch('\x00'),
+						   NULL),  // QNAME
+					  qtype,           // QTYPE
+					  qclass,          // QCLASS
 					  NULL);
 
-  const parser_t *letter = choice(range('a', 'z'),
-				  range('A', 'Z'),
+  const parser_t *letter = choice(ch_range('a', 'z'),
+				  ch_range('A', 'Z'),
 				  NULL);
 
   const parser_t *let_dig = choice(letter,
-				   range('0', '9'),
+				   ch_range('0', '9'),
 				   NULL);
 
   const parser_t *ldh_str = many1(choice(let_dig,
 					 ch('-'),
 					 NULL));
 
-  const parser_t *label = sequence(letter,
-				   optional(sequence(optional(ldh_str),
-						     let_dig,
-						     NULL)),
-				   NULL);
+  const parser_t *label = attr_bool(sequence(letter,
+					     optional(sequence(optional(ldh_str),
+							       let_dig,
+							       NULL)),
+					     NULL),
+				    validate_label);
 
   /**
    * You could write it like this ...
@@ -62,7 +113,7 @@ int main(int argc, char **argv) {
    * ... but this is easier and equivalent
    */
 
-  parser_t *subdomain = sepBy1(label, ch('.'));
+  const parser_t *subdomain = sepBy1(label, ch('.'));
 
   const parser_t *domain = choice(subdomain, 
 				  ch(' '), 
@@ -72,14 +123,16 @@ int main(int argc, char **argv) {
 				    uint16(),                       // TYPE
 				    uint16(),                       // CLASS
 				    uint32(),                       // TTL
-				    length_value(uint16(), uint8()) // RDLENGTH+RDATA
+				    length_value(uint16(), uint8()), // RDLENGTH+RDATA
 				    NULL);
 
 
-  const parser_t *dns_message = attr_bool(sequence(dns_header,
-						   dns_question,
-						   many(dns_rr),
-						   end_p(),
-						   NULL),
-					  validate_dns);
+  dns_message = (parser_t*)attr_bool(sequence(dns_header,
+					      many(dns_question),
+					      many(dns_rr),
+					      end_p(),
+					      NULL),
+				     validate_dns);
+
+  return dns_message;
 }