File 0001-SRV-NAPTR-patch.patch of Package djbdns

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-SRV-NAPTR-patch.patch of Package djbdns (Revision 44131353cdcabee65036c0c4a9d87516)

Currently displaying revision 44131353cdcabee65036c0c4a9d87516 , Show latest

From c4415d111e74d5cb43a9972c0e04fdcab4f2c4e6 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bwachter-spam@lart.info>
Date: Sun, 17 Jun 2018 23:38:16 +0300
Subject: [PATCH] SRV + NAPTR patch

---
 axfr-get.c     | 59 ++++++++++++++++++++++++++++++++++++++++++
 dns.h          |  2 ++
 parsetype.c    |  2 ++
 printrecord.c  | 52 +++++++++++++++++++++++++++++++++++++
 tinydns-data.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 184 insertions(+)

diff --git a/axfr-get.c b/axfr-get.c
index f6bf5bd..3a665eb 100644
--- a/axfr-get.c
+++ b/axfr-get.c
@@ -210,6 +210,57 @@ unsigned int doit(char *buf,unsigned int len,unsigned int pos)
     if (!stralloc_cats(&line,".:")) return 0;
     if (!stralloc_catulong0(&line,dist,0)) return 0;
   }
+  else if (byte_equal(data,2,DNS_T_SRV)) {
+    uint16 dist, weight, port;
+    if (!stralloc_copys(&line,"S")) return 0;
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,"::")) return 0;
+    pos = x_copy(buf,len,pos,data,2);
+    uint16_unpack_big(data,&dist);
+    pos = x_copy(buf,len,pos,data,2);
+    uint16_unpack_big(data,&weight);
+    pos = x_copy(buf,len,pos,data,2);
+    uint16_unpack_big(data,&port);
+    x_getname(buf,len,pos,&d1);
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,".:")) return 0;
+    if (!stralloc_catulong0(&line,dist,0)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catulong0(&line,weight,0)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catulong0(&line,port,0)) return 0;
+  }
+  else if (byte_equal(data,2,DNS_T_NAPTR)) {
+    uint16 order, preference;
+    char flags[255], service[255], regexp[255];
+    char fs, ss, rs;
+    if (!stralloc_copys(&line,"N")) return 0;
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    pos = x_copy(buf,len,pos,data,2);
+    uint16_unpack_big(data,&order);
+    pos = x_copy(buf,len,pos,data,2);
+    uint16_unpack_big(data,&preference);
+    pos = x_copy(buf,len,pos,&fs,1);
+    pos = x_copy(buf,len,pos,flags,fs);
+    pos = x_copy(buf,len,pos,&ss,1);
+    pos = x_copy(buf,len,pos,service,ss);
+    pos = x_copy(buf,len,pos,&rs,1);
+    pos = x_copy(buf,len,pos,regexp,rs);
+    x_getname(buf,len,pos,&d1);
+    if (!stralloc_catulong0(&line,order,0)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catulong0(&line,preference,0)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catb(&line,flags,fs)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catb(&line,service,ss)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!stralloc_catb(&line,regexp,rs)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,".")) return 0;
+  }
   else if (byte_equal(data,2,DNS_T_A) && (dlen == 4)) {
     char ipstr[IP4_FMT];
     if (!stralloc_copys(&line,"+")) return 0;
@@ -226,6 +277,14 @@ unsigned int doit(char *buf,unsigned int len,unsigned int pos)
     x_copy(buf,len,pos,data,16);
     if (!stralloc_catb(&line,ipstr,ip6_fmt_flat(ipstr,data))) return 0;
   }
+  else if (byte_equal(data,2,DNS_T_PTR)) {
+    if (!stralloc_copys(&line,"^")) return 0;
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,":")) return 0;
+    x_getname(buf,len,pos,&d1);
+    if (!dns_domain_todot_cat(&line,d1)) return 0;
+    if (!stralloc_cats(&line,".")) return 0;
+  }
   else {
     unsigned char ch;
     unsigned char ch2;
diff --git a/dns.h b/dns.h
index c9689a2..3eefae1 100644
--- a/dns.h
+++ b/dns.h
@@ -27,6 +27,8 @@
 #define DNS_T_NSEC3 "\0\62"
 #define DNS_T_NSEC3PARAM "\0\63"
 #define DNS_T_AXFR "\0\374"
+#define DNS_T_SRV "\0\041"
+#define DNS_T_NAPTR "\0\43"
 #define DNS_T_ANY "\0\377"
 /* Pseudo-RRs for DNSSEC */
 #define DNS_T_HASHREF "\377\1"
diff --git a/parsetype.c b/parsetype.c
index b3bc332..437b05e 100644
--- a/parsetype.c
+++ b/parsetype.c
@@ -26,6 +26,8 @@ int parsetype(char *s,char type[2])
   else if (case_equals(s,"axfr")) byte_copy(type,2,DNS_T_AXFR);
   else if (case_equals(s,"dnskey")) byte_copy(type,2,DNS_T_DNSKEY);
   else if (case_equals(s,"ds")) byte_copy(type,2,DNS_T_DS);
+  else if (case_equals(s,"srv")) byte_copy(type,2,DNS_T_SRV);
+  else if (case_equals(s,"naptr")) byte_copy(type,2,DNS_T_NAPTR);
   else
     return 0;
 
diff --git a/printrecord.c b/printrecord.c
index 4cc744d..cc1b9fd 100644
--- a/printrecord.c
+++ b/printrecord.c
@@ -211,6 +211,58 @@ unsigned int printrecord_cat(stralloc *out,const char *buf,unsigned int len,unsi
     if (!hexout(out,misc,8,6,2)) return 0;
     rawlen = datalen;
   }
+  else if (byte_equal(misc,2,DNS_T_SRV)) {
+    uint16 u16tmp;
+    if (!stralloc_cats(out," SRV ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+    uint16_unpack_big(misc,&u16tmp);
+    pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+    uint16_unpack_big(misc,&u16);
+    if (!stralloc_catulong0(out,u16,0)) return 0;
+    if (!stralloc_cats(out," ")) return 0;
+    if (!stralloc_catulong0(out,u16tmp,0)) return 0;
+    if (!stralloc_cats(out," ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+    uint16_unpack_big(misc,&u16);
+    if (!stralloc_catulong0(out,u16,0)) return 0;
+    if (!stralloc_cats(out," ")) return 0;
+    pos = dns_packet_getname(buf,len,pos,&d); if (!pos) return 0;
+    if (!dns_domain_todot_cat(out,d)) return 0;
+  }
+  else if (byte_equal(misc,2,DNS_T_NAPTR)) {
+    char str[255];
+    unsigned int oldpos;
+    if (!stralloc_cats(out," NAPTR ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+    uint16_unpack_big(misc,&u16);
+    if (!stralloc_catulong0(out,u16,0)) return 0;
+    if (!stralloc_cats(out," ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,misc,2); if (!pos) return 0;
+    uint16_unpack_big(misc,&u16);
+    if (!stralloc_catulong0(out,u16,0)) return 0;
+    if (!stralloc_cats(out," ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,&ch,1); if (!pos) return 0;
+    pos = dns_packet_copy(buf,len,pos,str,ch); if (!pos) return 0;
+    if (!stralloc_cats(out,"\"")) return 0;
+    if (!stralloc_catb(out,str,ch)) return 0;
+    if (!stralloc_cats(out,"\" ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,&ch,1); if (!pos) return 0;
+    pos = dns_packet_copy(buf,len,pos,str,ch); if (!pos) return 0;
+    if (!stralloc_cats(out,"\"")) return 0;
+    if (!stralloc_catb(out,str,ch)) return 0;
+    if (!stralloc_cats(out,"\" ")) return 0;
+    pos = dns_packet_copy(buf,len,pos,&ch,1); if (!pos) return 0;
+    pos = dns_packet_copy(buf,len,pos,str,ch); if (!pos) return 0;
+    if (!stralloc_cats(out,"\"")) return 0;
+    if (!stralloc_catb(out,str,ch)) return 0;
+    if (!stralloc_cats(out,"\" ")) return 0;
+    pos = dns_packet_getname(buf,len,pos,&d); if (!pos) return 0;
+    oldpos = out->len;
+    if (!dns_domain_todot_cat(out,d)) return 0;
+    if (out->len == oldpos)
+      if (!stralloc_cats(out,".")) return 0;
+  }
+
   else {
     if (!stralloc_cats(out," ")) return 0;
     uint16_unpack_big(misc,&u16);
diff --git a/tinydns-data.c b/tinydns-data.c
index c635755..391b4a5 100644
--- a/tinydns-data.c
+++ b/tinydns-data.c
@@ -214,6 +214,8 @@ int main()
   char type[2];
   char soa[20];
   char buf[4];
+  char naptr[4];
+  char srv[6];
 
   umask(022);
 
@@ -486,6 +488,73 @@ int main()
 	rr_finish(d1);
 	break;
 
+      case 'N':
+	if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
+	if (!dns_domain_fromdot(&d2,f[6].s,f[6].len)) nomem();
+	if (!stralloc_0(&f[7])) nomem();
+	if (!scan_ulong(f[7].s,&ttl)) ttl = TTL_POSITIVE;
+	ttdparse(&f[8],ttd);
+	locparse(&f[9],loc);
+
+	if (!stralloc_0(&f[1])) nomem();
+	if (!scan_ulong(f[1].s,&u)) u = 0;
+	uint16_pack_big(naptr,u);
+	if (!stralloc_0(&f[2])) nomem();
+	if (!scan_ulong(f[2].s,&u)) u = 0;
+	uint16_pack_big(naptr + 2,u);
+
+	txtparse(&f[3]); if (f[3].len > 255)
+ 	  syntaxerror(": it is not allowed more than 255 chars in a label");
+	txtparse(&f[4]); if (f[4].len > 255)
+ 	  syntaxerror(": it is not allowed more than 255 chars in a label");
+	txtparse(&f[5]); if (f[5].len > 255)
+ 	  syntaxerror(": it is not allowed more than 255 chars in a label");
+
+	rr_start(DNS_T_NAPTR,ttl,ttd,loc);
+	rr_add(naptr,4);
+
+	ch = f[3].len; rr_add(&ch,1);
+	rr_add(f[3].s, f[3].len);
+	ch = f[4].len; rr_add(&ch,1);
+	rr_add(f[4].s, f[4].len);
+	ch = f[5].len; rr_add(&ch,1);
+	rr_add(f[5].s, f[5].len);
+
+	rr_addname(d2);
+	rr_finish(d1);
+	break;
+
+      case 'S':
+	if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
+	if (!stralloc_0(&f[6])) nomem();
+	if (!scan_ulong(f[6].s,&ttl)) ttl = TTL_POSITIVE;
+	ttdparse(&f[7],ttd);
+	locparse(&f[8],loc);
+
+	if (!stralloc_0(&f[1])) nomem();
+
+	if (byte_chr(f[2].s,f[2].len,'.') >= f[2].len) {
+	  if (!stralloc_cats(&f[2],".srv.")) nomem();
+	  if (!stralloc_catb(&f[2],f[0].s,f[0].len)) nomem();
+	}
+	if (!dns_domain_fromdot(&d2,f[2].s,f[2].len)) nomem();
+
+	if (!stralloc_0(&f[4])) nomem();
+	if (!scan_ulong(f[4].s,&u)) u = 0;
+	uint16_pack_big(srv,u);
+	if (!stralloc_0(&f[5])) nomem();
+	if (!scan_ulong(f[5].s,&u)) u = 0;
+	uint16_pack_big(srv + 2,u);
+	if (!stralloc_0(&f[3])) nomem();
+	if (!scan_ulong(f[3].s,&u)) nomem();
+	uint16_pack_big(srv + 4,u);
+
+	rr_start(DNS_T_SRV,ttl,ttd,loc);
+	rr_add(srv,6);
+        rr_addname(d2);
+        rr_finish(d1);
+	break;
+
       default:
         syntaxerror(": unrecognized leading character");
     }
-- 
2.17.0

Places

File 0001-SRV-NAPTR-patch.patch of Package djbdns (Revision 44131353cdcabee65036c0c4a9d87516)

Places