afn_getoneipnum and afn_getipnums seems to be working

diff --git a/app/chkspf.c b/app/chkspf.c
index c8b3224496e437296e4676e09e17bbf0c4ea4ede..7dac2aceb595ee17e08a62028c4f052f531c36c3 100644 (file)
--- a/app/chkspf.c
+++ b/app/chkspf.c
@@ -37,7 +37,7 @@ SPFENU spf;
 AFNTYP **afns;
 
 try=0;
-afns=afn_getipnum(peerip);
+afns=afn_getipnums(peerip);
 if (afns!=(AFNTYP **)0) {
   for (int i=0;afns[i]!=(AFNTYP *)0;i++) {
     spf=spf_getstatus(&try,domain,afns[i]);

diff --git a/app/scarmt.c b/app/scarmt.c
index 37e321481ed1c250d6a7e42fed465851ea327f77..ca8ef6b4c2a1c3c8bfc903cef34d5436d072fa77 100644 (file)
--- a/app/scarmt.c
+++ b/app/scarmt.c
@@ -46,20 +46,20 @@ static void check_credibility(SCATYP *scanref,char **dnsbls,int num,char *rmtip)
 #define OPEP    "scarmt.c:check_credibilty,"
 
 SRVTYP *srv;
-AFNTYP **afns;
+AFNTYP *afn;
 char *reversip;
 int phase;
 _Bool proceed;
 
 srv=(SRVTYP *)0;
-afns=(AFNTYP **)0;
+afn=(AFNTYP *)0;
 reversip=(char *)0;
 phase=0;
 proceed=true;
 while (proceed==true) {
   switch (phase) {      
     case 0      :       //get the remoteip AFN
-      if ((afns=afn_getipnum(rmtip))==(AFNTYP **)0) {
+      if ((afn=afn_getoneipnum(rmtip))==(AFNTYP *)0) {
         (void) rou_alert(0,"%s Unable to get afn data for remote <%s> (WRONG IP?)",
                             OPEP,rmtip);
         phase=999;      //Trouble trouble
@@ -73,7 +73,7 @@ while (proceed==true) {
         }
       break;
     case 2      :       //getting the reverss-address
-      reversip=afn_reversipnum(*afns);
+      reversip=afn_reversipnum(afn);
       srv->reverse=rou_freestr(srv->reverse);
       srv->reverse=dns_get_reverse_addr(reversip);
       break;
@@ -123,7 +123,7 @@ while (proceed==true) {
   }
 srv=sql_freesrv(srv);
 reversip=rou_freestr(reversip);
-afns=(AFNTYP **)rou_freelist((void **)afns,(genfree_t)afn_freeipnum);
+afn=afn_freeipnum(afn);
 
 #undef  OPEP
 }

diff --git a/lib/lvleml.c b/lib/lvleml.c
index f047919d1bd973262856054ff67babb696236d71..892f3bb71fc3094c46ff5d70228baf68ce7b7023 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -99,8 +99,8 @@ if (contact!=(CONTYP *)0) {
   contact->peername=rou_freestr(contact->peername);
   contact->peerip=rou_freestr(contact->peerip);
   contact->locserv=rou_freestr(contact->locserv);
-  contact->localafn=(AFNTYP **)rou_freelist((void **)contact->localafn,
-                                            (genfree_t)afn_freeipnum);
+  contact->localafns=(AFNTYP **)rou_freelist((void **)contact->localafns,
+                                             (genfree_t)afn_freeipnum);
   contact->locip=rou_freestr(contact->locip);
   contact->locname=rou_freestr(contact->locname);
   (void) free(contact);
@@ -142,7 +142,7 @@ while (proceed==true) {
     case 1      :       //check about local domain, TEMPORARY code
       int status;
 
-      status=dns_is_domain_local(rcpt->domain,contact->localafn);
+      status=dns_is_domain_local(rcpt->domain,contact->localafns);
       switch (status) {
         case dns_nomx   :
           done=false;
@@ -1346,19 +1346,19 @@ static _Bool set_orgn_rmtip(CONTYP *contact,char *rmtip)
 
 {
 _Bool isok;
-AFNTYP **afns;
+AFNTYP *afn;
 
 isok=false;
-if ((afns=afn_getipnum(rmtip))!=(AFNTYP **)0) {
+if ((afn=afn_getoneipnum(rmtip))!=(AFNTYP *)0) {
   char *reverse;
 
-  reverse=afn_reversipnum(afns[0]);
+  reverse=afn_reversipnum(afn);
   contact->peerip=rou_freestr(contact->peerip);
   contact->peerip=strdup(rmtip);
   contact->peername=rou_freestr(contact->peername);
   contact->peername=dns_get_reverse_addr(reverse);
   reverse=rou_freestr(reverse);
-  afns=(AFNTYP **)rou_freelist((void **)afns,(genfree_t)afn_freeipnum);
+  afn=afn_freeipnum(afn);
   isok=true;
   }
 (void) signon(contact);
@@ -2375,7 +2375,7 @@ while (proceed==true) {
       contact->peername=soc_getaddrinfo(contact->socptr,false,true);
       contact->peerip=soc_getaddrinfo(contact->socptr,false,false);
       contact->logptr=log_openlog(contact->mainsesid,(const char *)0);
-      contact->localafn=afn_getipnum(contact->locip);
+      contact->localafns=afn_getipnums(contact->locip);
       (void) rou_alert(0,"Contact from peer <%s> to port <%s> started",
                           contact->peerip,contact->locserv);
       break;

diff --git a/lib/lvleml.h b/lib/lvleml.h
index 4e9d3c9eada2b58e808a8056053ccee9abf4c290..41c11eeb6b9e2b3b90bfa67d080670a78925d484 100644 (file)
--- a/lib/lvleml.h
+++ b/lib/lvleml.h
@@ -23,7 +23,7 @@ typedef struct  {
         char *locip;            //socket local IP num
         RELTYP privilege;       //onnection privilege
         char *authname;         //Link is authenticated name
-        AFNTYP **localafn;      //local IP as an AFNUM
+        AFNTYP **localafns;     //local IP as an AFNUM
         char *locname;          //socket local hostname
         char *locserv;          //local service port
         char *peername;         //socket remote peer FQDN

diff --git a/lib/unitls.c b/lib/unitls.c
index bc5056d08a843832362b14fa4f5973cb6222b4c3..0cb1c934e255d21f6159870ce3a34289c266fd26 100644 (file)
--- a/lib/unitls.c
+++ b/lib/unitls.c
@@ -465,7 +465,7 @@ while (proceed==true) {
         }
       break;
     case 2      :       //converting interface IP list to AFNTYP list
-      afns=afn_getipnum(localip);
+      afns=afn_getipnums(localip);
       (void) freeifaddrs(ifaddr);
       break;
     default     :       //SAFE Guard