#include <afs/param.h>
#include <afs/stds.h>
-#ifndef DJGPP
#include <windows.h>
#include <winsock2.h>
#include <iphlpapi.h>
-#else
-#include <netdb.h>
-#endif /* !DJGPP */
#include <stdlib.h>
#include <malloc.h>
#include <string.h>
+#include "afsd.h"
+
#include <rx/rx.h>
#include <rx/rx_prototypes.h>
#include <WINNT/afsreg.h>
-#include "afsd.h"
#include "afsicf.h"
/* in seconds */
static int daemon_ShutdownFlag = 0;
-#ifndef DJGPP
void cm_IpAddrDaemon(long parm)
{
+ extern void smb_CheckVCs(void);
+
rx_StartClientThread();
while (daemon_ShutdownFlag == 0) {
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
void cm_BkgDaemon(long parm)
{
osi_assert(cm_bkgQueueCount-- > 0);
lock_ReleaseWrite(&cm_daemonLock);
+ osi_Log2(afsd_logp,"cm_BkgDaemon (before) scp 0x%x ref %d",rp->scp, rp->scp->refCount);
+
(*rp->procp)(rp->scp, rp->p1, rp->p2, rp->p3, rp->p4, rp->userp);
- cm_ReleaseUser(rp->userp);
+ osi_Log2(afsd_logp,"cm_BkgDaemon (after) scp 0x%x ref %d",rp->scp, rp->scp->refCount);
+
+ cm_ReleaseUser(rp->userp);
cm_ReleaseSCache(rp->scp);
free(rp);
lock_ReleaseWrite(&cm_daemonLock);
}
-void cm_QueueBKGRequest(cm_scache_t *scp, cm_bkgProc_t *procp, long p1, long p2, long p3, long p4,
+void cm_QueueBKGRequest(cm_scache_t *scp, cm_bkgProc_t *procp, afs_uint32 p1, afs_uint32 p2, afs_uint32 p3, afs_uint32 p4,
cm_user_t *userp)
{
cm_bkgRequest_t *rp;
if (!scm) return FALSE;
/* Open Windows Firewall service */
- svc = OpenService(scm, "SharedAccess", SERVICE_QUERY_CONFIG);
+ svc = OpenService(scm, "MpsSvc", SERVICE_QUERY_CONFIG);
+ if (!svc) {
+ afsi_log("MpsSvc Service could not be opened for query: 0x%x", GetLastError());
+ svc = OpenService(scm, "SharedAccess", SERVICE_QUERY_CONFIG);
+ if (!svc)
+ afsi_log("SharedAccess Service could not be opened for query: 0x%x", GetLastError());
+ }
if (!svc)
goto close_scm;
/* Query Windows Firewall service config, this time for real */
flag = QueryServiceConfig(svc, pConfig, BufSize, &BufSize);
- if (!flag)
+ if (!flag) {
+ afsi_log("QueryServiceConfig failed: 0x%x", GetLastError());
goto free_pConfig;
+ }
/* Is it autostart? */
+ afsi_log("AutoStart 0x%x", pConfig->dwStartType);
if (pConfig->dwStartType < SERVICE_DEMAND_START)
result = TRUE;
HMODULE hHookDll;
int configureFirewall = IsWindowsFirewallPresent();
+ if (!configureFirewall) {
+ afsi_log("No Windows Firewall detected");
+ }
+
/* ping all file servers, up or down, with unauthenticated connection,
* to find out whether we have all our callbacks from the server still.
* Also, ping down VLDBs.
lastTokenCacheCheck = now - cm_daemonTokenCheckInterval/2 + (rand() % cm_daemonTokenCheckInterval);
while (daemon_ShutdownFlag == 0) {
- thrd_Sleep(30 * 1000); /* sleep 30 seconds */
- if (daemon_ShutdownFlag == 1)
- return;
-
if (configureFirewall) {
/* Open Microsoft Firewall to allow in port 7001 */
switch (icf_CheckAndAddAFSPorts(AFS_PORTSET_CLIENT)) {
default:
afsi_log("Unknown Windows Firewall Configuration error");
}
- }
+ }
/* find out what time it is */
now = osi_Time();
SetEvent(WaitToTerminate);
}
}
+
+ thrd_Sleep(30 * 1000); /* sleep 30 seconds */
+ if (daemon_ShutdownFlag == 1)
+ return;
}
}
lock_InitializeRWLock(&cm_daemonLock, "cm_daemonLock");
osi_EndOnce(&once);
-#ifndef DJGPP
/* creating IP Address Change monitor daemon */
phandle = thrd_Create((SecurityAttrib) 0, 0,
(ThreadFunc) cm_IpAddrDaemon, 0, 0, &pid, "cm_IpAddrDaemon");
osi_assert(phandle != NULL);
thrd_CloseHandle(phandle);
-#endif /* DJGPP */
/* creating pinging daemon */
phandle = thrd_Create((SecurityAttrib) 0, 0,