Changeset 200 for trunk/src/sh_socket.c

Timestamp:

Nov 27, 2008, 10:26:50 PM (16 years ago)

Author:

katerina

Message:

Implement server->client SCAN command to run file check on demand.

File:

• trunk/src/sh_socket.c (modified) (3 diffs)

trunk/src/sh_socket.c

@@ -53 +53 @@
       SL_RET0(_("sh_socket_server_cmd"));
     }
-  if ((srvcmd[0] == 'S') || (srvcmd[1] == 'T') || 
-      (srvcmd[2] == 'O') || (srvcmd[3] == 'P'))
+  if ((srvcmd[0] == 'S') && (srvcmd[1] == 'T') && 
+      (srvcmd[2] == 'O') && (srvcmd[3] == 'P'))
     {
       TPT((0, FIL__, __LINE__, _("msg=<stop command from server>\n")));
@@ -60 +60 @@
       raise(SIGQUIT);
 #else
-      TPT((0, FIL__, __LINE__, _("msg=<sigquit not defined>\n")));
+      sig_terminate       = 1;
+      ++sig_raised;
 #endif
     } 
-  else if ((srvcmd[0] == 'R') || (srvcmd[1] == 'E') || 
-           (srvcmd[2] == 'L') || (srvcmd[3] == 'O') ||
-           (srvcmd[4] == 'A') || (srvcmd[5] == 'D'))
+  else if ((srvcmd[0] == 'R') && (srvcmd[1] == 'E') &&
+           (srvcmd[2] == 'L') && (srvcmd[3] == 'O') &&
+           (srvcmd[4] == 'A') && (srvcmd[5] == 'D'))
     {
       TPT((0, FIL__, __LINE__, _("msg=<reload command from server>\n")));
@@ -71 +72 @@
       raise(SIGHUP);
 #else
-      TPT((0, FIL__, __LINE__, _("msg=<sighup not defined>\n")));
-#endif
+      sig_config_read_again = 1;
+      ++sig_raised;
+#endif
+    }
+  else if ((srvcmd[0] == 'S') && (srvcmd[1] == 'C') &&
+           (srvcmd[2] == 'A') && (srvcmd[3] == 'N'))
+    {
+      TPT((0, FIL__, __LINE__, _("msg=<scan command from server>\n")));
+      if (sh.flag.isdaemon == ON) 
+        { 
+#ifdef SIGTTOU
+          raise(SIGTTOU);
+#else
+          sig_force_check = 1;
+          ++sig_raised;
+#endif
+        } 
+      else 
+        {
+          sig_force_check = 1;
+          ++sig_raised;
+        }
     }
   else