[naviserver-commits] modules/nsdns dns.c,1.2,1.3 dns.h,1.2,1.3 nsdns.c,1.2,1.3

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/modules/nsdns
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18236/nsdns

Modified Files:
	dns.c dns.h nsdns.c 
Log Message:
compiler warnings silence


Index: nsdns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/nsdns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nsdns.c	8 Jun 2005 20:03:42 -0000	1.2
--- nsdns.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 84,88 ****
  {
      char *path, *address;
-     struct sockaddr_in addr;
  
      Ns_Log(Notice, "nsdns module version %s server: %s", VERSION,server);
--- 84,87 ----
***************
*** 175,183 ****
  DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
      enum commands {
          cmdAdd, cmdRemove, cmdFlush, cmdList, cmdResolve, cmdQueue, cmdLookup
!     } cmd;
  
!     static char *sCmd[] = {
          "add", "del", "flush", "list", "resolve", "queue", "lookup", 0
      };
--- 174,183 ----
  DnsCmd(ClientData arg,Tcl_Interp *interp,int objc,Tcl_Obj *CONST objv[])
  {
+     int cmd;
      enum commands {
          cmdAdd, cmdRemove, cmdFlush, cmdList, cmdResolve, cmdQueue, cmdLookup
!     };
  
!     static const char *sCmd[] = {
          "add", "del", "flush", "list", "resolve", "queue", "lookup", 0
      };

Index: dns.c
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dns.c	8 Jun 2005 20:03:42 -0000	1.2
--- dns.c	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 238,242 ****
      if(!y) return;
  
!     Ns_DStringPrintf(ds, "Name=%s, Type=%s(%d), Class=%d, TTL=%u, Length=%d, ",
                    y->name,
                    dnsTypeStr(y->type),
--- 238,242 ----
      if(!y) return;
  
!     Ns_DStringPrintf(ds, "Name=%s, Type=%s(%d), Class=%u, TTL=%lu, Length=%u, ",
                    y->name,
                    dnsTypeStr(y->type),
***************
*** 264,268 ****
       case DNS_TYPE_SOA:
           if(!y->data.soa) break;
!          Ns_DStringPrintf(ds,"MNAME=%s, RNAME=%s, SERIAL=%ul, REFRESH=%ul, RETRY=%ul, EXPIRE=%ul, TTL=%ul ",
                            y->data.soa->mname,y->data.soa->rname,y->data.soa->serial,
                            y->data.soa->refresh,y->data.soa->retry,y->data.soa->expire,
--- 264,268 ----
       case DNS_TYPE_SOA:
           if(!y->data.soa) break;
!          Ns_DStringPrintf(ds,"MNAME=%s, RNAME=%s, SERIAL=%lu, REFRESH=%lu, RETRY=%lu, EXPIRE=%lu, TTL=%lu ",
                            y->data.soa->mname,y->data.soa->rname,y->data.soa->serial,
                            y->data.soa->refresh,y->data.soa->retry,y->data.soa->expire,
***************
*** 270,274 ****
           break;
      }
!     if(y->timestamp) Ns_DStringPrintf(ds,", TIMESTAMP=%ul",y->timestamp);
  }
  
--- 270,274 ----
           break;
      }
!     if(y->timestamp) Ns_DStringPrintf(ds,", TIMESTAMP=%lu",y->timestamp);
  }
  

Index: dns.h
===================================================================
RCS file: /cvsroot/naviserver/modules/nsdns/dns.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dns.h	8 Jun 2005 20:03:42 -0000	1.2
--- dns.h	12 Jun 2005 22:34:22 -0000	1.3
***************
*** 43,46 ****
--- 43,47 ----
  #define DNS_TYPE_TXT            16
  #define DNS_TYPE_SRV            33
+ #define DNS_TYPE_NAPTR          35
  #define DNS_TYPE_ANY            255
  #define DNS_DEFAULT_TTL         (60 * 60)
***************
*** 105,108 ****
--- 106,119 ----
  } dnsName;
  
+ typedef struct _dnsNA {
+     struct _dnsNA *next;
+     short order;
+     short prefs;
+     char *flags;
+     char *service;
+     char *regexp;
+     char *replace;
+ } dnsNA;
+ 
  typedef struct _dnsRecord {
      struct _dnsRecord *next,*prev;
***************
*** 116,119 ****
--- 127,131 ----
        struct in_addr ipaddr;
        dnsMX *mx;
+       dnsNA *na;
        dnsSOA *soa;
      } data;