Index: openafs/src/WINNT/afsd/cm_conn.c diff -c openafs/src/WINNT/afsd/cm_conn.c:1.49.2.11 openafs/src/WINNT/afsd/cm_conn.c:1.49.2.12 *** openafs/src/WINNT/afsd/cm_conn.c:1.49.2.11 Sat Feb 3 21:46:25 2007 --- openafs/src/WINNT/afsd/cm_conn.c Sat Mar 10 10:50:07 2007 *************** *** 168,173 **** --- 168,174 ---- long timeUsed, timeLeft; long code; char addr[16]; + int forcing_new = 0; osi_Log2(afsd_logp, "cm_Analyze connp 0x%p, code 0x%x", connp, errorCode); *************** *** 195,204 **** lock_ReleaseWrite(&cm_callbackLock); } - /* If not allowed to retry, don't */ - if (reqp->flags & CM_REQ_NORETRY) - goto out; - /* if timeout - check that it did not exceed the HardDead timeout * and retry */ --- 196,201 ---- *************** *** 487,493 **** else if (errorCode >= -64 && errorCode < 0) { /* mark server as down */ lock_ObtainMutex(&serverp->mx); ! serverp->flags |= CM_SERVERFLAG_DOWN; lock_ReleaseMutex(&serverp->mx); cm_ForceNewConnections(serverp); if ( timeLeft > 2 ) --- 484,495 ---- else if (errorCode >= -64 && errorCode < 0) { /* mark server as down */ lock_ObtainMutex(&serverp->mx); ! if (reqp->flags & CM_REQ_NEW_CONN_FORCED) ! serverp->flags |= CM_SERVERFLAG_DOWN; ! else { ! reqp->flags |= CM_REQ_NEW_CONN_FORCED; ! forcing_new = 1; ! } lock_ReleaseMutex(&serverp->mx); cm_ForceNewConnections(serverp); if ( timeLeft > 2 ) *************** *** 611,617 **** } } ! if (retry && dead_session) retry = 0; out: --- 613,622 ---- } } ! /* If not allowed to retry, don't */ ! if (!forcing_new && (reqp->flags & CM_REQ_NORETRY)) ! retry = 0; ! else if (retry && dead_session) retry = 0; out: Index: openafs/src/WINNT/afsd/cm_conn.h diff -c openafs/src/WINNT/afsd/cm_conn.h:1.13.4.6 openafs/src/WINNT/afsd/cm_conn.h:1.13.4.7 *** openafs/src/WINNT/afsd/cm_conn.h:1.13.4.6 Sat Feb 3 21:46:25 2007 --- openafs/src/WINNT/afsd/cm_conn.h Sat Mar 10 10:50:07 2007 *************** *** 43,48 **** --- 43,49 ---- /* flags in cm_req structure */ #define CM_REQ_NORETRY 0x1 + #define CM_REQ_NEW_CONN_FORCED 0x2 /* * Vice2 error codes Index: openafs/src/WINNT/afsd/cm_daemon.c diff -c openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.10 openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.11 *** openafs/src/WINNT/afsd/cm_daemon.c:1.16.4.10 Sun Feb 4 10:39:14 2007 --- openafs/src/WINNT/afsd/cm_daemon.c Sat Mar 10 10:50:07 2007 *************** *** 31,37 **** /* in seconds */ long cm_daemonCheckDownInterval = 180; ! long cm_daemonCheckUpInterval = 600; long cm_daemonCheckVolInterval = 3600; long cm_daemonCheckCBInterval = 60; long cm_daemonCheckLockInterval = 60; --- 31,37 ---- /* in seconds */ long cm_daemonCheckDownInterval = 180; ! long cm_daemonCheckUpInterval = 240; long cm_daemonCheckVolInterval = 3600; long cm_daemonCheckCBInterval = 60; long cm_daemonCheckLockInterval = 60; Index: openafs/src/WINNT/afsd/cm_server.c diff -c openafs/src/WINNT/afsd/cm_server.c:1.25.2.3 openafs/src/WINNT/afsd/cm_server.c:1.25.2.4 *** openafs/src/WINNT/afsd/cm_server.c:1.25.2.3 Tue Jun 27 23:24:05 2006 --- openafs/src/WINNT/afsd/cm_server.c Mon Mar 19 08:46:15 2007 *************** *** 49,55 **** long code; int wasDown = 0; cm_conn_t *connp; ! struct rx_connection * callp; long secs; long usecs; Capabilities caps = {0, 0}; --- 49,55 ---- long code; int wasDown = 0; cm_conn_t *connp; ! struct rx_connection * rxconnp; long secs; long usecs; Capabilities caps = {0, 0}; *************** *** 93,103 **** } else { /* file server */ ! callp = cm_GetRxConn(connp); ! code = RXAFS_GetCapabilities(callp, &caps); if (code == RXGEN_OPCODE) ! code = RXAFS_GetTime(callp, &secs, &usecs); ! rx_PutConnection(callp); } if (wasDown) rx_SetConnDeadTime(connp->callp, ConnDeadtimeout); --- 93,103 ---- } else { /* file server */ ! rxconnp = cm_GetRxConn(connp); ! code = RXAFS_GetCapabilities(rxconnp, &caps); if (code == RXGEN_OPCODE) ! code = RXAFS_GetTime(rxconnp, &secs, &usecs); ! rx_PutConnection(rxconnp); } if (wasDown) rx_SetConnDeadTime(connp->callp, ConnDeadtimeout); Index: openafs/src/WINNT/afssvrmgr/svrmgr.h diff -c openafs/src/WINNT/afssvrmgr/svrmgr.h:1.3 openafs/src/WINNT/afssvrmgr/svrmgr.h:1.3.4.1 *** openafs/src/WINNT/afssvrmgr/svrmgr.h:1.3 Sat Nov 5 01:47:50 2005 --- openafs/src/WINNT/afssvrmgr/svrmgr.h Sat Mar 10 09:26:19 2007 *************** *** 56,64 **** #define cszENDING_CLONE TEXT(".clone") #define REGSTR_SETTINGS_BASE HKCU ! #define REGSTR_SETTINGS_PATH TEXT("Software\\TransarcCorporation\\AFS Server Manager") #define REGVAL_SETTINGS TEXT("Settings") ! #define REGSTR_SETTINGS_PREFS TEXT("Software\\TransarcCorporation\\AFS Server Manager\\Preferences") #define REGSTR_SETTINGS_CELLS REGSTR_SETTINGS_PREFS --- 56,64 ---- #define cszENDING_CLONE TEXT(".clone") #define REGSTR_SETTINGS_BASE HKCU ! #define REGSTR_SETTINGS_PATH TEXT("Software\\OpenAFS\\AFS Server Manager") #define REGVAL_SETTINGS TEXT("Settings") ! #define REGSTR_SETTINGS_PREFS TEXT("Software\\OpenAFS\\AFS Server Manager\\Preferences") #define REGSTR_SETTINGS_CELLS REGSTR_SETTINGS_PREFS Index: openafs/src/WINNT/afsusrmgr/TaAfsUsrMgr.h diff -c openafs/src/WINNT/afsusrmgr/TaAfsUsrMgr.h:1.3 openafs/src/WINNT/afsusrmgr/TaAfsUsrMgr.h:1.3.4.1 *** openafs/src/WINNT/afsusrmgr/TaAfsUsrMgr.h:1.3 Sat Nov 5 01:47:52 2005 --- openafs/src/WINNT/afsusrmgr/TaAfsUsrMgr.h Sat Mar 10 09:26:20 2007 *************** *** 47,55 **** #endif #define REGSTR_SETTINGS_BASE HKCU ! #define REGSTR_SETTINGS_PATH TEXT("Software\\TransarcCorporation\\AFS Account Manager") #define REGVAL_SETTINGS TEXT("Settings") ! #define REGSTR_SETTINGS_PREFS TEXT("Software\\TransarcCorporation\\AFS Account Manager\\Preferences") #define REGSTR_SETTINGS_CELLS REGSTR_SETTINGS_PREFS --- 47,55 ---- #endif #define REGSTR_SETTINGS_BASE HKCU ! #define REGSTR_SETTINGS_PATH TEXT("Software\\OpenAFS\\AFS Account Manager") #define REGVAL_SETTINGS TEXT("Settings") ! #define REGSTR_SETTINGS_PREFS TEXT("Software\\OpenAFS\\AFS Account Manager\\Preferences") #define REGSTR_SETTINGS_CELLS REGSTR_SETTINGS_PREFS Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.10 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.11 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.5.4.10 Thu Mar 8 20:13:17 2007 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Mon Mar 19 18:28:40 2007 *************** *** 198,204 ****
OpenAFS for Windows 1.5.16
Release Notes
The Andrew File System (AFS) is a location-independent --- 583,589 ----
OpenAFS for Windows 1.5.17
Release Notes
The Andrew File System (AFS) is a location-independent
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm
diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.9 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.10
*** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm:1.2.6.9 Thu Mar 8 20:13:21 2007
--- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/toc.htm Mon Mar 19 18:28:44 2007
***************
*** 10,16 ****