X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=dns.c;h=e485ed8467b464183871c2ab7808b5902f256e69;hb=7dce450bdc23ea306a61e00f914481e29ebcb176;hp=3f508271672e19584fe1bbab230492d294ae8df5;hpb=b8c78f5c0da93d92aa28d3ef3757e78d03141f41;p=catta diff --git a/dns.c b/dns.c index 3f50827..e485ed8 100644 --- a/dns.c +++ b/dns.c @@ -7,40 +7,40 @@ #include "dns.h" #include "util.h" -flxDnsPacket* flx_dns_packet_new(guint max_size) { - flxDnsPacket *p; +AvahiDnsPacket* avahi_dns_packet_new(guint max_size) { + AvahiDnsPacket *p; if (max_size <= 0) - max_size = FLX_DNS_PACKET_MAX_SIZE; - else if (max_size < FLX_DNS_PACKET_HEADER_SIZE) - max_size = FLX_DNS_PACKET_HEADER_SIZE; + max_size = AVAHI_DNS_PACKET_MAX_SIZE; + else if (max_size < AVAHI_DNS_PACKET_HEADER_SIZE) + max_size = AVAHI_DNS_PACKET_HEADER_SIZE; - p = g_malloc(sizeof(flxDnsPacket) + max_size); - p->size = p->rindex = FLX_DNS_PACKET_HEADER_SIZE; + p = g_malloc(sizeof(AvahiDnsPacket) + max_size); + p->size = p->rindex = AVAHI_DNS_PACKET_HEADER_SIZE; p->max_size = max_size; p->name_table = NULL; - memset(FLX_DNS_PACKET_DATA(p), 0, p->size); + memset(AVAHI_DNS_PACKET_DATA(p), 0, p->size); return p; } -flxDnsPacket* flx_dns_packet_new_query(guint max_size) { - flxDnsPacket *p; +AvahiDnsPacket* avahi_dns_packet_new_query(guint max_size) { + AvahiDnsPacket *p; - p = flx_dns_packet_new(max_size); - flx_dns_packet_set_field(p, FLX_DNS_FIELD_FLAGS, FLX_DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); + p = avahi_dns_packet_new(max_size); + avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); return p; } -flxDnsPacket* flx_dns_packet_new_response(guint max_size) { - flxDnsPacket *p; +AvahiDnsPacket* avahi_dns_packet_new_response(guint max_size) { + AvahiDnsPacket *p; - p = flx_dns_packet_new(max_size); - flx_dns_packet_set_field(p, FLX_DNS_FIELD_FLAGS, FLX_DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); + p = avahi_dns_packet_new(max_size); + avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_FLAGS, AVAHI_DNS_FLAGS(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)); return p; } -void flx_dns_packet_free(flxDnsPacket *p) { +void avahi_dns_packet_free(AvahiDnsPacket *p) { g_assert(p); if (p->name_table) @@ -49,22 +49,22 @@ void flx_dns_packet_free(flxDnsPacket *p) { g_free(p); } -void flx_dns_packet_set_field(flxDnsPacket *p, guint index, guint16 v) { +void avahi_dns_packet_set_field(AvahiDnsPacket *p, guint index, guint16 v) { g_assert(p); - g_assert(index < FLX_DNS_PACKET_HEADER_SIZE); + g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE); - ((guint16*) FLX_DNS_PACKET_DATA(p))[index] = g_htons(v); + ((guint16*) AVAHI_DNS_PACKET_DATA(p))[index] = g_htons(v); } -guint16 flx_dns_packet_get_field(flxDnsPacket *p, guint index) { +guint16 avahi_dns_packet_get_field(AvahiDnsPacket *p, guint index) { g_assert(p); - g_assert(index < FLX_DNS_PACKET_HEADER_SIZE); + g_assert(index < AVAHI_DNS_PACKET_HEADER_SIZE); - return g_ntohs(((guint16*) FLX_DNS_PACKET_DATA(p))[index]); + return g_ntohs(((guint16*) AVAHI_DNS_PACKET_DATA(p))[index]); } /* Read the first label from string *name, unescape "\" and write it to dest */ -gchar *flx_unescape_label(gchar *dest, guint size, const gchar **name) { +gchar *avahi_unescape_label(gchar *dest, guint size, const gchar **name) { guint i = 0; gchar *d; @@ -105,7 +105,7 @@ gchar *flx_unescape_label(gchar *dest, guint size, const gchar **name) { return dest; } -guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) { +guint8* avahi_dns_packet_append_name(AvahiDnsPacket *p, const gchar *name) { guint8 *d, *saved_ptr = NULL; guint saved_size; @@ -113,7 +113,7 @@ guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) { g_assert(name); saved_size = p->size; - saved_ptr = flx_dns_packet_extend(p, 0); + saved_ptr = avahi_dns_packet_extend(p, 0); while (*name) { guint n; @@ -126,14 +126,14 @@ guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) { if (p->name_table && (prev = g_hash_table_lookup(p->name_table, name))) { guint index; - g_assert(prev >= FLX_DNS_PACKET_DATA(p)); - index = (guint) (prev - FLX_DNS_PACKET_DATA(p)); + g_assert(prev >= AVAHI_DNS_PACKET_DATA(p)); + index = (guint) (prev - AVAHI_DNS_PACKET_DATA(p)); g_assert(index < p->size); if (index < 0x4000) { guint16 *t; - if (!(t = (guint16*) flx_dns_packet_extend(p, sizeof(guint16)))) + if (!(t = (guint16*) avahi_dns_packet_extend(p, sizeof(guint16)))) return NULL; *t = g_htons((0xC000 | index)); @@ -143,19 +143,19 @@ guint8* flx_dns_packet_append_name(flxDnsPacket *p, const gchar *name) { pname = name; - if (!(flx_unescape_label(label, sizeof(label), &name))) + if (!(avahi_unescape_label(label, sizeof(label), &name))) goto fail; - if (!(d = flx_dns_packet_append_string(p, label))) + if (!(d = avahi_dns_packet_append_string(p, label))) goto fail; if (!p->name_table) - p->name_table = g_hash_table_new_full((GHashFunc) flx_domain_hash, (GEqualFunc) flx_domain_equal, g_free, NULL); + p->name_table = g_hash_table_new_full((GHashFunc) avahi_domain_hash, (GEqualFunc) avahi_domain_equal, g_free, NULL); g_hash_table_insert(p->name_table, g_strdup(pname), d); } - if (!(d = flx_dns_packet_extend(p, 1))) + if (!(d = avahi_dns_packet_extend(p, 1))) goto fail; *d = 0; @@ -167,22 +167,22 @@ fail: return NULL; } -guint8* flx_dns_packet_append_uint16(flxDnsPacket *p, guint16 v) { +guint8* avahi_dns_packet_append_uint16(AvahiDnsPacket *p, guint16 v) { guint8 *d; g_assert(p); - if (!(d = flx_dns_packet_extend(p, sizeof(guint16)))) + if (!(d = avahi_dns_packet_extend(p, sizeof(guint16)))) return NULL; *((guint16*) d) = g_htons(v); return d; } -guint8 *flx_dns_packet_append_uint32(flxDnsPacket *p, guint32 v) { +guint8 *avahi_dns_packet_append_uint32(AvahiDnsPacket *p, guint32 v) { guint8 *d; g_assert(p); - if (!(d = flx_dns_packet_extend(p, sizeof(guint32)))) + if (!(d = avahi_dns_packet_extend(p, sizeof(guint32)))) return NULL; *((guint32*) d) = g_htonl(v); @@ -190,21 +190,21 @@ guint8 *flx_dns_packet_append_uint32(flxDnsPacket *p, guint32 v) { return d; } -guint8 *flx_dns_packet_append_bytes(flxDnsPacket *p, gconstpointer b, guint l) { +guint8 *avahi_dns_packet_append_bytes(AvahiDnsPacket *p, gconstpointer b, guint l) { guint8* d; g_assert(p); g_assert(b); g_assert(l); - if (!(d = flx_dns_packet_extend(p, l))) + if (!(d = avahi_dns_packet_extend(p, l))) return NULL; memcpy(d, b, l); return d; } -guint8* flx_dns_packet_append_string(flxDnsPacket *p, const gchar *s) { +guint8* avahi_dns_packet_append_string(AvahiDnsPacket *p, const gchar *s) { guint8* d; guint k; @@ -214,7 +214,7 @@ guint8* flx_dns_packet_append_string(flxDnsPacket *p, const gchar *s) { if ((k = strlen(s)) >= 255) k = 255; - if (!(d = flx_dns_packet_extend(p, k+1))) + if (!(d = avahi_dns_packet_extend(p, k+1))) return NULL; *d = (guint8) k; @@ -223,7 +223,7 @@ guint8* flx_dns_packet_append_string(flxDnsPacket *p, const gchar *s) { return d; } -guint8 *flx_dns_packet_extend(flxDnsPacket *p, guint l) { +guint8 *avahi_dns_packet_extend(AvahiDnsPacket *p, guint l) { guint8 *d; g_assert(p); @@ -231,31 +231,31 @@ guint8 *flx_dns_packet_extend(flxDnsPacket *p, guint l) { if (p->size+l > p->max_size) return NULL; - d = FLX_DNS_PACKET_DATA(p) + p->size; + d = AVAHI_DNS_PACKET_DATA(p) + p->size; p->size += l; return d; } -gint flx_dns_packet_check_valid(flxDnsPacket *p) { +gint avahi_dns_packet_check_valid(AvahiDnsPacket *p) { guint16 flags; g_assert(p); if (p->size < 12) return -1; - flags = flx_dns_packet_get_field(p, FLX_DNS_FIELD_FLAGS); + flags = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS); - if (flags & FLX_DNS_FLAG_OPCODE || flags & FLX_DNS_FLAG_RCODE) + if (flags & AVAHI_DNS_FLAG_OPCODE || flags & AVAHI_DNS_FLAG_RCODE) return -1; return 0; } -gint flx_dns_packet_is_query(flxDnsPacket *p) { +gint avahi_dns_packet_is_query(AvahiDnsPacket *p) { g_assert(p); - return !(flx_dns_packet_get_field(p, FLX_DNS_FIELD_FLAGS) & FLX_DNS_FLAG_QR); + return !(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_QR); } /* Read a label from a DNS packet, escape "\" and ".", append \0 */ @@ -294,7 +294,7 @@ static gchar *escape_label(guint8* src, guint src_length, gchar **ret_name, guin return r; } -static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint l) { +static gint consume_labels(AvahiDnsPacket *p, guint index, gchar *ret_name, guint l) { gint ret = 0; int compressed = 0; int first_label = 1; @@ -306,7 +306,7 @@ static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint if (index+1 > p->size) return -1; - n = FLX_DNS_PACKET_DATA(p)[index]; + n = AVAHI_DNS_PACKET_DATA(p)[index]; if (!n) { index++; @@ -337,7 +337,7 @@ static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint } else first_label = 0; - if (!(escape_label(FLX_DNS_PACKET_DATA(p) + index, n, &ret_name, &l))) + if (!(escape_label(AVAHI_DNS_PACKET_DATA(p) + index, n, &ret_name, &l))) return -1; index += n; @@ -350,7 +350,7 @@ static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint if (index+2 > p->size) return -1; - index = ((guint) (FLX_DNS_PACKET_DATA(p)[index] & ~0xC0)) << 8 | FLX_DNS_PACKET_DATA(p)[index+1]; + index = ((guint) (AVAHI_DNS_PACKET_DATA(p)[index] & ~0xC0)) << 8 | AVAHI_DNS_PACKET_DATA(p)[index+1]; if (!compressed) ret += 2; @@ -361,7 +361,7 @@ static gint consume_labels(flxDnsPacket *p, guint index, gchar *ret_name, guint } } -gint flx_dns_packet_consume_name(flxDnsPacket *p, gchar *ret_name, guint l) { +gint avahi_dns_packet_consume_name(AvahiDnsPacket *p, gchar *ret_name, guint l) { gint r; if ((r = consume_labels(p, p->rindex, ret_name, l)) < 0) @@ -371,33 +371,33 @@ gint flx_dns_packet_consume_name(flxDnsPacket *p, gchar *ret_name, guint l) { return 0; } -gint flx_dns_packet_consume_uint16(flxDnsPacket *p, guint16 *ret_v) { +gint avahi_dns_packet_consume_uint16(AvahiDnsPacket *p, guint16 *ret_v) { g_assert(p); g_assert(ret_v); if (p->rindex + sizeof(guint16) > p->size) return -1; - *ret_v = g_ntohs(*((guint16*) (FLX_DNS_PACKET_DATA(p) + p->rindex))); + *ret_v = g_ntohs(*((guint16*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex))); p->rindex += sizeof(guint16); return 0; } -gint flx_dns_packet_consume_uint32(flxDnsPacket *p, guint32 *ret_v) { +gint avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, guint32 *ret_v) { g_assert(p); g_assert(ret_v); if (p->rindex + sizeof(guint32) > p->size) return -1; - *ret_v = g_ntohl(*((guint32*) (FLX_DNS_PACKET_DATA(p) + p->rindex))); + *ret_v = g_ntohl(*((guint32*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex))); p->rindex += sizeof(guint32); return 0; } -gint flx_dns_packet_consume_bytes(flxDnsPacket *p, gpointer ret_data, guint l) { +gint avahi_dns_packet_consume_bytes(AvahiDnsPacket *p, gpointer ret_data, guint l) { g_assert(p); g_assert(ret_data); g_assert(l > 0); @@ -405,13 +405,13 @@ gint flx_dns_packet_consume_bytes(flxDnsPacket *p, gpointer ret_data, guint l) { if (p->rindex + l > p->size) return -1; - memcpy(ret_data, FLX_DNS_PACKET_DATA(p) + p->rindex, l); + memcpy(ret_data, AVAHI_DNS_PACKET_DATA(p) + p->rindex, l); p->rindex += l; return 0; } -gint flx_dns_packet_consume_string(flxDnsPacket *p, gchar *ret_string, guint l) { +gint avahi_dns_packet_consume_string(AvahiDnsPacket *p, gchar *ret_string, guint l) { guint k; g_assert(p); @@ -421,7 +421,7 @@ gint flx_dns_packet_consume_string(flxDnsPacket *p, gchar *ret_string, guint l) if (p->rindex >= p->size) return -1; - k = FLX_DNS_PACKET_DATA(p)[p->rindex]; + k = AVAHI_DNS_PACKET_DATA(p)[p->rindex]; if (p->rindex+1+k > p->size) return -1; @@ -429,7 +429,7 @@ gint flx_dns_packet_consume_string(flxDnsPacket *p, gchar *ret_string, guint l) if (l > k+1) l = k+1; - memcpy(ret_string, FLX_DNS_PACKET_DATA(p)+p->rindex+1, l-1); + memcpy(ret_string, AVAHI_DNS_PACKET_DATA(p)+p->rindex+1, l-1); ret_string[l-1] = 0; @@ -439,16 +439,16 @@ gint flx_dns_packet_consume_string(flxDnsPacket *p, gchar *ret_string, guint l) } -gconstpointer flx_dns_packet_get_rptr(flxDnsPacket *p) { +gconstpointer avahi_dns_packet_get_rptr(AvahiDnsPacket *p) { g_assert(p); if (p->rindex > p->size) return NULL; - return FLX_DNS_PACKET_DATA(p) + p->rindex; + return AVAHI_DNS_PACKET_DATA(p) + p->rindex; } -gint flx_dns_packet_skip(flxDnsPacket *p, guint length) { +gint avahi_dns_packet_skip(AvahiDnsPacket *p, guint length) { g_assert(p); if (p->rindex + length > p->size) @@ -458,13 +458,13 @@ gint flx_dns_packet_skip(flxDnsPacket *p, guint length) { return 0; } -flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_flush) { +AvahiRecord* avahi_dns_packet_consume_record(AvahiDnsPacket *p, gboolean *ret_cache_flush) { gchar name[257], buf[257]; guint16 type, class; guint32 ttl; guint16 rdlength; gconstpointer data; - flxRecord *r = NULL; + AvahiRecord *r = NULL; gconstpointer start; g_assert(p); @@ -472,93 +472,92 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl /* g_message("consume_record()"); */ - if (flx_dns_packet_consume_name(p, name, sizeof(name)) < 0 || - flx_dns_packet_consume_uint16(p, &type) < 0 || - flx_dns_packet_consume_uint16(p, &class) < 0 || - flx_dns_packet_consume_uint32(p, &ttl) < 0 || - flx_dns_packet_consume_uint16(p, &rdlength) < 0 || + if (avahi_dns_packet_consume_name(p, name, sizeof(name)) < 0 || + avahi_dns_packet_consume_uint16(p, &type) < 0 || + avahi_dns_packet_consume_uint16(p, &class) < 0 || + avahi_dns_packet_consume_uint32(p, &ttl) < 0 || + avahi_dns_packet_consume_uint16(p, &rdlength) < 0 || p->rindex + rdlength > p->size) - goto fail; /* g_message("name = %s, rdlength = %u", name, rdlength); */ - *ret_cache_flush = !!(class & FLX_DNS_CACHE_FLUSH); - class &= ~ FLX_DNS_CACHE_FLUSH; + *ret_cache_flush = !!(class & AVAHI_DNS_CACHE_FLUSH); + class &= ~AVAHI_DNS_CACHE_FLUSH; - start = flx_dns_packet_get_rptr(p); + start = avahi_dns_packet_get_rptr(p); - r = flx_record_new_full(name, class, type); + r = avahi_record_new_full(name, class, type); switch (type) { - case FLX_DNS_TYPE_PTR: - case FLX_DNS_TYPE_CNAME: + case AVAHI_DNS_TYPE_PTR: + case AVAHI_DNS_TYPE_CNAME: /* g_message("ptr"); */ - if (flx_dns_packet_consume_name(p, buf, sizeof(buf)) < 0) + if (avahi_dns_packet_consume_name(p, buf, sizeof(buf)) < 0) goto fail; r->data.ptr.name = g_strdup(buf); break; - case FLX_DNS_TYPE_SRV: + case AVAHI_DNS_TYPE_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 || - flx_dns_packet_consume_uint16(p, &r->data.srv.port) < 0 || - flx_dns_packet_consume_name(p, buf, sizeof(buf)) < 0) + if (avahi_dns_packet_consume_uint16(p, &r->data.srv.priority) < 0 || + avahi_dns_packet_consume_uint16(p, &r->data.srv.weight) < 0 || + avahi_dns_packet_consume_uint16(p, &r->data.srv.port) < 0 || + avahi_dns_packet_consume_name(p, buf, sizeof(buf)) < 0) goto fail; r->data.srv.name = g_strdup(buf); break; - case FLX_DNS_TYPE_HINFO: + case AVAHI_DNS_TYPE_HINFO: /* g_message("hinfo"); */ - if (flx_dns_packet_consume_string(p, buf, sizeof(buf)) < 0) + if (avahi_dns_packet_consume_string(p, buf, sizeof(buf)) < 0) goto fail; r->data.hinfo.cpu = g_strdup(buf); - if (flx_dns_packet_consume_string(p, buf, sizeof(buf)) < 0) + if (avahi_dns_packet_consume_string(p, buf, sizeof(buf)) < 0) goto fail; r->data.hinfo.os = g_strdup(buf); break; - case FLX_DNS_TYPE_TXT: + case AVAHI_DNS_TYPE_TXT: /* g_message("txt"); */ if (rdlength > 0) { - r->data.txt.string_list = flx_string_list_parse(flx_dns_packet_get_rptr(p), rdlength); + r->data.txt.string_list = avahi_string_list_parse(avahi_dns_packet_get_rptr(p), rdlength); - if (flx_dns_packet_skip(p, rdlength) < 0) + if (avahi_dns_packet_skip(p, rdlength) < 0) goto fail; } else r->data.txt.string_list = NULL; break; - case FLX_DNS_TYPE_A: + case AVAHI_DNS_TYPE_A: /* g_message("A"); */ - if (flx_dns_packet_consume_bytes(p, &r->data.a.address, sizeof(flxIPv4Address)) < 0) + if (avahi_dns_packet_consume_bytes(p, &r->data.a.address, sizeof(AvahiIPv4Address)) < 0) goto fail; break; - case FLX_DNS_TYPE_AAAA: + case AVAHI_DNS_TYPE_AAAA: /* g_message("aaaa"); */ - if (flx_dns_packet_consume_bytes(p, &r->data.aaaa.address, sizeof(flxIPv6Address)) < 0) + if (avahi_dns_packet_consume_bytes(p, &r->data.aaaa.address, sizeof(AvahiIPv6Address)) < 0) goto fail; break; @@ -569,19 +568,19 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl if (rdlength > 0) { - r->data.generic.data = g_memdup(flx_dns_packet_get_rptr(p), rdlength); + r->data.generic.data = g_memdup(avahi_dns_packet_get_rptr(p), rdlength); - if (flx_dns_packet_skip(p, rdlength) < 0) + if (avahi_dns_packet_skip(p, rdlength) < 0) goto fail; } break; } -/* g_message("%i == %u ?", (guint8*) flx_dns_packet_get_rptr(p) - (guint8*) start, rdlength); */ +/* g_message("%i == %u ?", (guint8*) avahi_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) + if ((guint8*) avahi_dns_packet_get_rptr(p) - (guint8*) start != rdlength) goto fail; r->ttl = ttl; @@ -590,28 +589,30 @@ flxRecord* flx_dns_packet_consume_record(flxDnsPacket *p, gboolean *ret_cache_fl fail: if (r) - flx_record_unref(r); + avahi_record_unref(r); return NULL; } -flxKey* flx_dns_packet_consume_key(flxDnsPacket *p) { +AvahiKey* avahi_dns_packet_consume_key(AvahiDnsPacket *p, gboolean *ret_unicast_response) { gchar name[256]; guint16 type, class; g_assert(p); + g_assert(ret_unicast_response); - if (flx_dns_packet_consume_name(p, name, sizeof(name)) < 0 || - flx_dns_packet_consume_uint16(p, &type) < 0 || - flx_dns_packet_consume_uint16(p, &class) < 0) + if (avahi_dns_packet_consume_name(p, name, sizeof(name)) < 0 || + avahi_dns_packet_consume_uint16(p, &type) < 0 || + avahi_dns_packet_consume_uint16(p, &class) < 0) return NULL; - class &= ~ FLX_DNS_CACHE_FLUSH; + *ret_unicast_response = !!(class & AVAHI_DNS_UNICAST_RESPONSE); + class &= ~AVAHI_DNS_UNICAST_RESPONSE; - return flx_key_new(name, class, type); + return avahi_key_new(name, class, type); } -guint8* flx_dns_packet_append_key(flxDnsPacket *p, flxKey *k) { +guint8* avahi_dns_packet_append_key(AvahiDnsPacket *p, AvahiKey *k, gboolean unicast_response) { guint8 *t; guint size; @@ -620,9 +621,9 @@ guint8* flx_dns_packet_append_key(flxDnsPacket *p, flxKey *k) { size = p->size; - if (!(t = flx_dns_packet_append_name(p, k->name)) || - !flx_dns_packet_append_uint16(p, k->type) || - !flx_dns_packet_append_uint16(p, k->class)) { + if (!(t = avahi_dns_packet_append_name(p, k->name)) || + !avahi_dns_packet_append_uint16(p, k->type) || + !avahi_dns_packet_append_uint16(p, k->class | (unicast_response ? AVAHI_DNS_UNICAST_RESPONSE : 0))) { p->size = size; return NULL; } @@ -630,7 +631,7 @@ guint8* flx_dns_packet_append_key(flxDnsPacket *p, flxKey *k) { return t; } -guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cache_flush) { +guint8* avahi_dns_packet_append_record(AvahiDnsPacket *p, AvahiRecord *r, gboolean cache_flush) { guint8 *t, *l, *start; guint size; @@ -639,69 +640,69 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac size = p->size; - 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 | 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))) + if (!(t = avahi_dns_packet_append_name(p, r->key->name)) || + !avahi_dns_packet_append_uint16(p, r->key->type) || + !avahi_dns_packet_append_uint16(p, cache_flush ? (r->key->class | AVAHI_DNS_CACHE_FLUSH) : (r->key->class &~ AVAHI_DNS_CACHE_FLUSH)) || + !avahi_dns_packet_append_uint32(p, r->ttl) || + !(l = avahi_dns_packet_append_uint16(p, 0))) goto fail; - start = flx_dns_packet_extend(p, 0); + start = avahi_dns_packet_extend(p, 0); switch (r->key->type) { - case FLX_DNS_TYPE_PTR: - case FLX_DNS_TYPE_CNAME : + case AVAHI_DNS_TYPE_PTR: + case AVAHI_DNS_TYPE_CNAME : - if (!(flx_dns_packet_append_name(p, r->data.ptr.name))) + if (!(avahi_dns_packet_append_name(p, r->data.ptr.name))) goto fail; break; - case FLX_DNS_TYPE_SRV: + case AVAHI_DNS_TYPE_SRV: - if (!flx_dns_packet_append_uint16(p, r->data.srv.priority) || - !flx_dns_packet_append_uint16(p, r->data.srv.weight) || - !flx_dns_packet_append_uint16(p, r->data.srv.port) || - !flx_dns_packet_append_name(p, r->data.srv.name)) + if (!avahi_dns_packet_append_uint16(p, r->data.srv.priority) || + !avahi_dns_packet_append_uint16(p, r->data.srv.weight) || + !avahi_dns_packet_append_uint16(p, r->data.srv.port) || + !avahi_dns_packet_append_name(p, r->data.srv.name)) goto fail; break; - case FLX_DNS_TYPE_HINFO: - if (!flx_dns_packet_append_string(p, r->data.hinfo.cpu) || - !flx_dns_packet_append_string(p, r->data.hinfo.os)) + case AVAHI_DNS_TYPE_HINFO: + if (!avahi_dns_packet_append_string(p, r->data.hinfo.cpu) || + !avahi_dns_packet_append_string(p, r->data.hinfo.os)) goto fail; break; - case FLX_DNS_TYPE_TXT: { + case AVAHI_DNS_TYPE_TXT: { guint8 *data; guint size; - size = flx_string_list_serialize(r->data.txt.string_list, NULL, 0); + size = avahi_string_list_serialize(r->data.txt.string_list, NULL, 0); /* g_message("appending string: %u %p", size, r->data.txt.string_list); */ - if (!(data = flx_dns_packet_extend(p, size))) + if (!(data = avahi_dns_packet_extend(p, size))) goto fail; - flx_string_list_serialize(r->data.txt.string_list, data, size); + avahi_string_list_serialize(r->data.txt.string_list, data, size); break; } - case FLX_DNS_TYPE_A: + case AVAHI_DNS_TYPE_A: - if (!flx_dns_packet_append_bytes(p, &r->data.a.address, sizeof(r->data.a.address))) + if (!avahi_dns_packet_append_bytes(p, &r->data.a.address, sizeof(r->data.a.address))) goto fail; break; - case FLX_DNS_TYPE_AAAA: + case AVAHI_DNS_TYPE_AAAA: - if (!flx_dns_packet_append_bytes(p, &r->data.aaaa.address, sizeof(r->data.aaaa.address))) + if (!avahi_dns_packet_append_bytes(p, &r->data.aaaa.address, sizeof(r->data.aaaa.address))) goto fail; break; @@ -709,7 +710,7 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac default: if (r->data.generic.size && - flx_dns_packet_append_bytes(p, r->data.generic.data, r->data.generic.size)) + avahi_dns_packet_append_bytes(p, r->data.generic.data, r->data.generic.size)) goto fail; break; @@ -718,7 +719,7 @@ guint8* flx_dns_packet_append_record(flxDnsPacket *p, flxRecord *r, gboolean cac - size = flx_dns_packet_extend(p, 0) - start; + size = avahi_dns_packet_extend(p, 0) - start; g_assert(size <= 0xFFFF); /* g_message("appended %u", size); */ @@ -733,13 +734,13 @@ fail: return NULL; } -gboolean flx_dns_packet_is_empty(flxDnsPacket *p) { +gboolean avahi_dns_packet_is_empty(AvahiDnsPacket *p) { g_assert(p); - return p->size <= FLX_DNS_PACKET_HEADER_SIZE; + return p->size <= AVAHI_DNS_PACKET_HEADER_SIZE; } -guint flx_dns_packet_space(flxDnsPacket *p) { +guint avahi_dns_packet_space(AvahiDnsPacket *p) { g_assert(p); g_assert(p->size <= p->max_size);