merge

[plan9front.git] / sys / src / cmd / ndb / dns.h

diff --git a/sys/src/cmd/ndb/dns.h b/sys/src/cmd/ndb/dns.h
index 1e0ae2e86ce2846fbd0d7a6a9604845cb4323f79..8a255aac2811af4e6ee3f2acb76fa4b330fc819c 100644 (file)
--- a/sys/src/cmd/ndb/dns.h
+++ b/sys/src/cmd/ndb/dns.h
@@ -182,6 +182,7 @@ struct Request
        jmp_buf mret;           /* where master jumps to after starting a slave */
        int     id;
        char    *from;          /* who asked us? */
+       void    *aux;
 };
 
 /*
@@ -447,14 +448,13 @@ void      dnageall(int);
 void   dnagedb(void);
 void   dnagenever(DN *);
 void   dnauthdb(void);
-void   dncheck(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);
@@ -477,6 +477,8 @@ RR* rrlookup(DN*, int, int);
 char*  rrname(int, char*, int);
 RR*    rrremneg(RR**);
 RR*    rrremtype(RR**, int);
+RR*    rrremowner(RR**, DN*);
+RR*    rrremfilter(RR**, int (*)(RR*, void*), void*);
 int    rrsupported(int);
 int    rrtype(char*);
 void   slave(Request*);
@@ -492,13 +494,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);
 
@@ -519,7 +520,6 @@ void        initdnsmsg(DNSmsg *mp, RR *rp, int flags, ushort reqno);
 /* dnserver.c */
 void   dnserver(DNSmsg*, DNSmsg*, Request*, uchar *, int);
 void   dnudpserver(char*);
-void   dntcpserver(char*);
 
 /* dnnotify.c */
 void   dnnotify(DNSmsg*, DNSmsg*, Request*);
@@ -531,4 +531,8 @@ 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