X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=sys%2Fsrc%2Fcmd%2Fndb%2Fdns.h;h=c3d3efcbcf2d11197293e6a4e52f415b0806346b;hb=4bbb3b0b21edd81be37a0a6ad12c76a63d127bed;hp=32f55d96d4517ec47b2f9961202356902c1efbb8;hpb=2dc97202de20c3e5b89e66d16e102ea393a19b6c;p=plan9front.git

diff --git a/sys/src/cmd/ndb/dns.h b/sys/src/cmd/ndb/dns.h
index 32f55d96d..c3d3efcbc 100644
--- a/sys/src/cmd/ndb/dns.h
+++ b/sys/src/cmd/ndb/dns.h
@@ -71,6 +71,7 @@ enum
 	Tmailb=	253,	/* { Tmb, Tmg, Tmr } */
 	Tmaila= 254,	/* obsolete */
 	Tall=	255,	/* all records */
+	Tcaa=	257,	/* certification authority authorization */
 
 	/* classes */
 	Csym=	0,	/* internal symbols */
@@ -150,8 +151,8 @@ enum
 	/* parallelism: tune; was 32; allow lots */
 	Maxactive=	250,
 
-	/* tune; was 60*1000; keep it short */
-	Maxreqtm=	8*1000,	/* max. ms to process a request */
+	/* tune; was 8*1000; that was too short */
+	Maxreqtm=	60*1000,	/* max. ms to process a request */
 
 	Notauthoritative = 0,
 	Authoritative,
@@ -171,6 +172,7 @@ typedef struct Server	Server;
 typedef struct Sig	Sig;
 typedef struct Srv	Srv;
 typedef struct Txt	Txt;
+typedef struct Caa	Caa;
 
 /*
  *  a structure to track a request and any slave process handling it
@@ -216,6 +218,12 @@ struct Key
 	int	alg;
 	Block;
 };
+struct Caa
+{
+	int	flags;
+	DN	*tag;
+	Block;
+};
 struct Cert
 {
 	int	type;
@@ -288,6 +296,7 @@ struct RR
 		SOA	*soa;	/* soa timers - soa */
 		Srv	*srv;
 		Key	*key;
+		Caa	*caa;
 		Cert	*cert;
 		Sig	*sig;
 		Null	*null;
@@ -423,7 +432,6 @@ extern vlong	nowns;
 extern Area	*owned;
 extern int	sendnotifies;
 extern ulong	target;
-extern int	testing;	/* test cache whenever removing a DN */
 extern char	*trace;
 extern int	traceactivity;
 extern char	*zonerefreshprogram;
@@ -433,7 +441,6 @@ extern char	*zonerefreshprogram;
 
 
 /* dn.c */
-extern char	*rrtname[];
 extern char	*rname[];
 extern unsigned	nrname;
 extern char	*opname[];
@@ -449,13 +456,12 @@ void	dnagedb(void);
 void	dnagenever(DN *);
 void	dnauthdb(void);
 void	dndump(char*);
-void	dnget(void);
 void	dninit(void);
 DN*	dnlookup(char*, int, int);
 DN*	idnlookup(char*, int, int);
+DN*	ipalookup(uchar*, int, int);
 void	dnptr(uchar*, uchar*, char*, int, int, int);
 void	dnpurge(void);
-void	dnput(void);
 void	dnslog(char*, ...);
 void	dnstats(char *file);
 void*	emalloc(int);
@@ -495,13 +501,12 @@ void	addarea(DN *dp, RR *rp, Ndbtuple *t);
 
 /* dblookup.c */
 int	baddelegation(RR*, RR*, uchar*);
-RR*	dbinaddr(DN*, int);
 RR*	dblookup(char*, int, int, int, int);
 RR*	dnsservers(int);
 RR*	domainlist(int);
 int	insideaddr(char *dom);
 int	insidens(uchar *ip);
-int	myaddr(char *addr);
+int	myip(uchar *ip);
 int	opendatabase(void);
 int	outsidensip(int, uchar *ip);
 
@@ -510,7 +515,6 @@ char*	walkup(char*);
 RR*	getdnsservers(int);
 void	logreply(int, uchar*, DNSmsg*);
 void	logsend(int, int, uchar*, char*, char*, int);
-void	procsetname(char *fmt, ...);
 
 /* dnresolve.c */
 RR*	dnresolve(char*, int, int, Request*, RR**, int, int, int, int*);
@@ -533,8 +537,4 @@ int	convDNS2M(DNSmsg*, uchar*, int);
 /* convM2DNS.c */
 char*	convM2DNS(uchar*, int, DNSmsg*, int*);
 
-/* idn.c */
-char*	utf2idn(char *, char *, int);
-char*	idn2utf(char *, char *, int);
-
 #pragma varargck argpos dnslog 1