windows-addr-change-mods-20060509

[openafs.git] / src / WINNT / afsd / cm_daemon.c

diff --git a/src/WINNT/afsd/cm_daemon.c b/src/WINNT/afsd/cm_daemon.c
index 6b719f5..ac210e1 100644 (file)
--- a/src/WINNT/afsd/cm_daemon.c
+++ b/src/WINNT/afsd/cm_daemon.c
@@ -23,16 +23,17 @@
 
 #include <rx/rx.h>
 #include <rx/rx_prototypes.h>
+#include <WINNT/afsreg.h>
 
 #include "afsd.h"
 #include "afsicf.h"
 
 /* in seconds */
-long cm_daemonCheckDownInterval = 180;
-long cm_daemonCheckUpInterval = 600;
-long cm_daemonCheckVolInterval = 3600;
-long cm_daemonCheckCBInterval = 60;
-long cm_daemonCheckLockInterval = 60;
+long cm_daemonCheckDownInterval  = 180;
+long cm_daemonCheckUpInterval    = 600;
+long cm_daemonCheckVolInterval   = 3600;
+long cm_daemonCheckCBInterval    = 60;
+long cm_daemonCheckLockInterval  = 60;
 long cm_daemonTokenCheckInterval = 180;
 
 osi_rwlock_t cm_daemonLock;
@@ -49,6 +50,8 @@ static int daemon_ShutdownFlag = 0;
 #ifndef DJGPP
 void cm_IpAddrDaemon(long parm)
 {
+    extern void smb_CheckVCs(void);
+
     rx_StartClientThread();
 
     while (daemon_ShutdownFlag == 0) {
@@ -56,8 +59,10 @@ void cm_IpAddrDaemon(long parm)
        if (Result == NO_ERROR && daemon_ShutdownFlag == 0) {
            osi_Log0(afsd_logp, "cm_IpAddrDaemon CheckDownServers");
            Sleep(2500);
-            cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS, NULL);
-       }
+           cm_ForceNewConnectionsAllServers();
+            cm_CheckServers(CM_FLAG_CHECKUPSERVERS | CM_FLAG_CHECKDOWNSERVERS, NULL);
+           smb_CheckVCs();
+       }       
     }
 }
 #endif
@@ -173,6 +178,58 @@ IsWindowsFirewallPresent(void)
     return result;
 }
 
+void
+cm_DaemonCheckInit(void)
+{
+    HKEY parmKey;
+    DWORD dummyLen;
+    DWORD dummy;
+    DWORD code;
+
+    code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+                         0, KEY_QUERY_VALUE, &parmKey);
+    if (code)
+       return;
+
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "DownServerCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonCheckDownInterval = dummy;
+    
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "UpServerCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonCheckUpInterval = dummy;
+    
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "VolumeCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonCheckVolInterval = dummy;
+    
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "CallbackCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonCheckCBInterval = dummy;
+    
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "LockCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonCheckLockInterval = dummy;
+    
+    dummyLen = sizeof(DWORD);
+    code = RegQueryValueEx(parmKey, "TokenCheckInterval", NULL, NULL,
+                           (BYTE *) &dummy, &dummyLen);
+    if (code == ERROR_SUCCESS)
+       cm_daemonTokenCheckInterval = dummy;
+    
+    RegCloseKey(parmKey);
+}
+
 /* periodic check daemon */
 void cm_Daemon(long parm)
 {
@@ -206,8 +263,11 @@ void cm_Daemon(long parm)
         code = 0;
     else
         memcpy(&code, thp->h_addr_list[0], 4);
+    
     srand(ntohl(code));
 
+    cm_DaemonCheckInit();
+
     now = osi_Time();
     lastVolCheck = now - cm_daemonCheckVolInterval/2 + (rand() % cm_daemonCheckVolInterval);
     lastCBExpirationCheck = now - cm_daemonCheckCBInterval/2 + (rand() % cm_daemonCheckCBInterval);