add client part of probing

[catta] / dns.c

diff --git a/dns.c b/dns.c
index 776ead24bf9130ab92540287b69103ccf92e7865..073eaba57de5549ac5a6455bfbf02e59a050d60b 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -26,7 +26,7 @@ flxDnsPacket* flx_dns_packet_new_query(guint max_size) {
     flxDnsPacket *p;
 
     p = flx_dns_packet_new(max_size);
-    flx_dns_packet_set_field(p, DNS_FIELD_FLAGS, DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+    flx_dns_packet_set_field(p, FLX_DNS_FIELD_FLAGS, FLX_DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
     return p;
 }
 
@@ -34,7 +34,7 @@ flxDnsPacket* flx_dns_packet_new_response(guint max_size) {
     flxDnsPacket *p;
 
     p = flx_dns_packet_new(max_size);
-    flx_dns_packet_set_field(p, DNS_FIELD_FLAGS, DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
+    flx_dns_packet_set_field(p, FLX_DNS_FIELD_FLAGS, FLX_DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0));
     return p;
 }
 
@@ -200,9 +200,9 @@ gint flx_dns_packet_check_valid(flxDnsPacket *p) {
     if (p->size < 12)
         return -1;
 
-    flags = flx_dns_packet_get_field(p, DNS_FIELD_FLAGS);
+    flags = flx_dns_packet_get_field(p, FLX_DNS_FIELD_FLAGS);
 
-    if (flags & DNS_FLAG_OPCODE || flags & DNS_FLAG_RCODE)
+    if (flags & FLX_DNS_FLAG_OPCODE || flags & FLX_DNS_FLAG_RCODE)
         return -1;
 
     return 0;
@@ -211,7 +211,7 @@ gint flx_dns_packet_check_valid(flxDnsPacket *p) {
 gint flx_dns_packet_is_query(flxDnsPacket *p) {
     g_assert(p);
     
-    return !(flx_dns_packet_get_field(p, DNS_FIELD_FLAGS) & DNS_FLAG_QR);
+    return !(flx_dns_packet_get_field(p, FLX_DNS_FIELD_FLAGS) & FLX_DNS_FLAG_QR);
 }
 
 static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint l) {
@@ -390,7 +390,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
     g_assert(p);
     g_assert(ret_cache_flush);
 
-    g_message("consume_record()");
+/*     g_message("consume_record()"); */
 
     if (flx_dns_packet_consume_name(p, name, sizeof(name)) < 0 ||
         flx_dns_packet_consume_uint16(p, &type) < 0 ||
@@ -401,7 +401,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
         
         goto fail;
 
-    g_message("name = %s, rdlength = %u", name, rdlength);
+/*     g_message("name = %s, rdlength = %u", name, rdlength); */
     
     start = flx_dns_packet_get_rptr(p);
 
@@ -411,7 +411,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
         case FLX_DNS_TYPE_PTR:
         case FLX_DNS_TYPE_CNAME:
 
-            g_message("ptr");
+/*             g_message("ptr"); */
             
             if (flx_dns_packet_consume_name(p, buf, sizeof(buf)) < 0)
                 goto fail;
@@ -422,7 +422,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
             
         case FLX_DNS_TYPE_SRV:
 
-            g_message("srv");
+/*             g_message("srv"); */
             
             if (flx_dns_packet_consume_uint16(p, &r->data.srv.priority) < 0 ||
                 flx_dns_packet_consume_uint16(p, &r->data.srv.weight) < 0 ||
@@ -435,7 +435,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
 
         case FLX_DNS_TYPE_HINFO:
             
-            g_message("hinfo");
+/*             g_message("hinfo"); */
 
             if (flx_dns_packet_consume_string(p, buf, sizeof(buf)) < 0)
                 goto fail;
@@ -450,34 +450,30 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
 
         case FLX_DNS_TYPE_TXT:
 
-            g_message("txt");
+/*             g_message("txt"); */
 
             if (rdlength > 0) {
                 r->data.txt.string_list = flx_string_list_parse(flx_dns_packet_get_rptr(p), rdlength);
                 
                 if (flx_dns_packet_skip(p, rdlength) < 0)
                     goto fail;
-            }
+            } else
+                r->data.txt.string_list = NULL;
             
             break;
 
         case FLX_DNS_TYPE_A:
 
-            g_message("A");
-
+/*             g_message("A"); */
 
-            g_message("%p", flx_dns_packet_get_rptr(p));
-                
             if (flx_dns_packet_consume_bytes(p, &r->data.a.address, sizeof(flxIPv4Address)) < 0)
                 goto fail;
-
-            g_message("%p", flx_dns_packet_get_rptr(p));
             
             break;
 
         case FLX_DNS_TYPE_AAAA:
 
-            g_message("aaaa");
+/*             g_message("aaaa"); */
             
             if (flx_dns_packet_consume_bytes(p, &r->data.aaaa.address, sizeof(flxIPv6Address)) < 0)
                 goto fail;
@@ -486,7 +482,7 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
             
         default:
 
-            g_message("generic");
+/*             g_message("generic"); */
             
             if (rdlength > 0) {
 
@@ -499,14 +495,14 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl
             break;
     }
 
-    g_message("%i == %u ?", (guint8*) flx_dns_packet_get_rptr(p) - (guint8*) start, rdlength);
+/*     g_message("%i == %u ?", (guint8*) flx_dns_packet_get_rptr(p) - (guint8*) start, rdlength); */
     
     /* Check if we read enough data */
     if ((guint8*) flx_dns_packet_get_rptr(p) - (guint8*) start != rdlength)
         goto fail;
     
-    *ret_cache_flush = !!(class & MDNS_CACHE_FLUSH);
-    class &= ~ MDNS_CACHE_FLUSH;
+    *ret_cache_flush = !!(class & FLX_DNS_CACHE_FLUSH);
+    class &= ~ FLX_DNS_CACHE_FLUSH;
 
     r->ttl = ttl;
 
@@ -530,7 +526,7 @@ flxKey* flx_dns_packet_consume_key(flxDnsPacket *p) {
         flx_dns_packet_consume_uint16(p, &class) < 0)
         return NULL;
 
-    class &= ~ MDNS_CACHE_FLUSH;
+    class &= ~ FLX_DNS_CACHE_FLUSH;
 
     return flx_key_new(name, class, type);
 }
@@ -565,7 +561,7 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac
 
     if (!(t = flx_dns_packet_append_name(p, r->key->name)) ||
         !flx_dns_packet_append_uint16(p, r->key->type) ||
-        !flx_dns_packet_append_uint16(p, cache_flush ? (r->key->class | MDNS_CACHE_FLUSH) : (r->key->class &~ MDNS_CACHE_FLUSH)) ||
+        !flx_dns_packet_append_uint16(p, cache_flush ? (r->key->class | FLX_DNS_CACHE_FLUSH) : (r->key->class &~ FLX_DNS_CACHE_FLUSH)) ||
         !flx_dns_packet_append_uint32(p, r->ttl) ||
         !(l = flx_dns_packet_append_uint16(p, 0)))
         goto fail;
@@ -606,7 +602,7 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac
 
             size = flx_string_list_serialize(r->data.txt.string_list, NULL, 0);
 
-            g_message("appending string: %u %p", size, r->data.txt.string_list);
+/*             g_message("appending string: %u %p", size, r->data.txt.string_list); */
 
             if (!(data = flx_dns_packet_extend(p, size)))
                 goto fail;
@@ -645,7 +641,7 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac
     size = flx_dns_packet_extend(p, 0) - start;
     g_assert(size <= 0xFFFF);
 
-    g_message("appended %u", size);
+/*     g_message("appended %u", size); */
 
     * (guint16*) l = g_htons((guint16) size);
     
@@ -662,3 +658,11 @@ gboolean flx_dns_packet_is_empty(flxDnsPacket *p) {
 
     return p->size <= FLX_DNS_PACKET_HEADER_SIZE;
 }
+
+guint flx_dns_packet_space(flxDnsPacket *p) {
+    g_assert(p);
+
+    g_assert(p->size <= p->max_size);
+    
+    return p->max_size - p->size;
+}