Adjusting scanning timing

diff --git a/app/scanner.c b/app/scanner.c
index f92ac79eb73782c56fad6ca947ceefdda562c2a2..3c63768c669955cedb735b97031e89b6292e85bf 100644 (file)
--- a/app/scanner.c
+++ b/app/scanner.c
@@ -336,7 +336,11 @@ int main(int argc,char *argv[])
 
 {
 #define OPEP            "scanner.c:main,"
-#define FREQUENCY       -(60*10)        //10 minutes
+#ifdef  MODEDEBUG
+#define DOITAGAIN       -(60*10)        //10 minutes in seconds
+#else
+#define DOITAGAIN       -(3600*24)      //1 day in seconds
+#endif
 
 int status;
 ARGTYP *params;
@@ -371,7 +375,7 @@ while (proceed==true) {
         }
       break;
     case 3      :       //do program main purpose
-      (void) doscanning(FREQUENCY);
+      (void) doscanning(DOITAGAIN);
       break;
     default     :       //end of task
       params=par_freeparams(params);

diff --git a/lib/gessql.c b/lib/gessql.c
index 24d6f6e2c727fb0047ff4e651ef936b2e48fa222..71835c39daae8e600efff8e134c2ed41e0c3057e 100644 (file)
--- a/lib/gessql.c
+++ b/lib/gessql.c
@@ -841,33 +841,34 @@ return isok;
 /*      remote IP to be scanned to establish credibilty.*/
 /*                                                      */
 /********************************************************/
-PUBLIC char **sql_getnewrmtip(SQLPTR *sqlptr,int frequency)
+PUBLIC char **sql_getnewrmtip(SQLPTR *sqlptr,int delay)
 
 {
 #define OPEP    "gessql.c:sql_getnewrmtip,"
-#define DATLIM  "2020-01-01"
 
-static char *cmd="select remoteip from "RMTTBL" WHERE lastscan<%s "
+static char *cmd="select remoteip from "RMTTBL" WHERE "
+                 "(lastscan<lastupdate) and (lastscan<%s) "
                  "order by lastscan asc limit 10";
 
 char **rmtip;
 SQLRES *rs;
 int num;
-char *delta;
+char *again;
 int phase;
 _Bool proceed;
 
 rmtip=(char **)0;
 rs=(SQLRES *)0;
 num=0;
-delta=sql_caldate(sqlptr,"lastupdate",frequency);
+again=sql_caldate(sqlptr,"NOW()",delay);
 phase=0;
 proceed=true;
 while (proceed==true) {
   switch (phase) {
     case 0      :       //do we have some remote IP
-      if ((rs=sql_gettupple(sqlptr,cmd,delta))==(SQLRES *)0) {
-        (void) rou_alert(0,"%s unable to get remoteip list (Database BUG?)",OPEP);
+      if ((rs=sql_gettupple(sqlptr,cmd,again))==(SQLRES *)0) {
+        (void) rou_alert(0,"%s unable to get remoteip list "
+                           "(Database BUG?)",OPEP);
         phase=999;      //No need to go further
         }
       break;
@@ -882,7 +883,8 @@ while (proceed==true) {
 
         ip=sql_getvalue(sqlptr,rs,i,"remoteip");
         if (ip!=(const char *)0)
-          rmtip=(char **)rou_addlist((void **)rmtip,(void *)strdup(ip));
+          rmtip=(char **)rou_addlist((void **)rmtip,
+                                     (void *)strdup(ip));
         }
       break;
     case 3      :       //clearing result
@@ -894,10 +896,9 @@ while (proceed==true) {
     }
   phase++;
   }
-delta=rou_freestr(delta);
+again=rou_freestr(again);
 return rmtip;
 
-#undef  DATLIM
 #undef  OPEP
 }
 /*