X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=dns.h;h=c5d2fae3562f96fe230c73e1e57a6e06dd885535;hb=d553a1c2d1cd3fcdd65ade64940b5bd3efc70675;hp=a737536589382f385d3652e2adeb0c1bd41bf096;hpb=f0f4bb0c37eeed71934e3191cffa5afb1cfdca0d;p=catta

diff --git a/dns.h b/dns.h
index a737536..c5d2fae 100644
--- a/dns.h
+++ b/dns.h
@@ -5,40 +5,50 @@
 
 #include "rr.h"
 
-#define FLX_DNS_MAX_PACKET_SIZE 9000
+#define FLX_DNS_PACKET_MAX_SIZE 9000
+#define FLX_DNS_PACKET_HEADER_SIZE 12
 
 typedef struct _flxDnsPacket {
-    guint size, rindex;
-    guint8 data[FLX_DNS_MAX_PACKET_SIZE];
+    guint size, rindex, max_size;
 } flxDnsPacket;
 
-flxDnsPacket* flx_dns_packet_new(void);
+
+#define FLX_DNS_PACKET_DATA(p) (((guint8*) p) + sizeof(flxDnsPacket))
+
+flxDnsPacket* flx_dns_packet_new(guint size);
+flxDnsPacket* flx_dns_packet_new_query(guint size);
+flxDnsPacket* flx_dns_packet_new_response(guint size);
+
 void flx_dns_packet_free(flxDnsPacket *p);
 void flx_dns_packet_set_field(flxDnsPacket *p, guint index, guint16 v);
 guint16 flx_dns_packet_get_field(flxDnsPacket *p, guint index);
 
+guint8 *flx_dns_packet_extend(flxDnsPacket *p, guint l);
+
 guint8 *flx_dns_packet_append_uint16(flxDnsPacket *p, guint16 v);
+guint8 *flx_dns_packet_append_uint32(flxDnsPacket *p, guint32 v);
 guint8 *flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name);
 guint8 *flx_dns_packet_append_name_compressed(flxDnsPacket *p, const gchar *name, guint8 *prev);
-guint8 *flx_dns_packet_extend(flxDnsPacket *p, guint l);
+guint8 *flx_dns_packet_append_bytes(flxDnsPacket  *p, gconstpointer, guint l);
+guint8* flx_dns_packet_append_key(flxDnsPacket *p, flxKey *k);
+guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cache_flush);
+
 gint flx_dns_packet_is_query(flxDnsPacket *p);
 gint flx_dns_packet_check_valid(flxDnsPacket *p);
 
-gint flx_dns_packet_consume_name(flxDnsPacket *p, gchar *ret_name, guint l);
 gint flx_dns_packet_consume_uint16(flxDnsPacket *p, guint16 *ret_v);
 gint flx_dns_packet_consume_uint32(flxDnsPacket *p, guint32 *ret_v);
+gint flx_dns_packet_consume_name(flxDnsPacket *p, gchar *ret_name, guint l);
 gint flx_dns_packet_consume_bytes(flxDnsPacket *p, gpointer ret_data, guint l);
-
-gconstpointer flx_dns_packet_get_rptr(flxDnsPacket *p);
-
 flxKey* flx_dns_packet_consume_key(flxDnsPacket *p);
 flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_flush);
 
-guint8* flx_dns_packet_append_key(flxDnsPacket *p, flxKey *k);
-guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cache_flush);
+gconstpointer flx_dns_packet_get_rptr(flxDnsPacket *p);
 
 gint flx_dns_packet_skip(flxDnsPacket *p, guint length);
 
+gboolean flx_dns_packet_is_empty(flxDnsPacket *p);
+
 #define DNS_FIELD_ID 0
 #define DNS_FIELD_FLAGS 1
 #define DNS_FIELD_QDCOUNT 2
@@ -49,6 +59,7 @@ gint flx_dns_packet_skip(flxDnsPacket *p, guint length);
 #define DNS_FLAG_QR (1 << 15)
 #define DNS_FLAG_OPCODE (15 << 11)
 #define DNS_FLAG_RCODE (15)
+#define DNS_FLAG_TC (1 << 9)
 
 #define DNS_FLAGS(qr, opcode, aa, tc, rd, ra, z, ad, cd, rcode) \
         (((guint16) !!qr << 15) |  \