From e3721fd93deaca4ae663c5e8fa89eae7297ce47f Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 7 Jul 2007 14:38:33 +0000 Subject: [PATCH] DEVEL15-windows-give-up-callbacks-20070707 don't try so hard to give up all callbacks. If the server doesn't respond in 10 seconds, too bad! cleanup the server probe code a bit. reorganize the code so that we can avoid unnecessary pointer evaluation. add a missing include file. (cherry picked from commit 90bc0a7f3108372bfc9408127fea17d37025c9ae) --- src/WINNT/afsd/cm_callback.c | 2 ++ src/WINNT/afsd/cm_server.c | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c index 23d189860..44df24f48 100644 --- a/src/WINNT/afsd/cm_callback.c +++ b/src/WINNT/afsd/cm_callback.c @@ -1800,7 +1800,9 @@ cm_GiveUpAllCallbacks(cm_server_t *tsp) code = cm_ConnByServer(tsp, cm_rootUserp, &connp); if (code == 0) { rxconnp = cm_GetRxConn(connp); + rx_SetConnDeadTime(rxconnp, 10); code = RXAFS_GiveUpAllCallBacks(rxconnp); + rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); rx_PutConnection(rxconnp); } } diff --git a/src/WINNT/afsd/cm_server.c b/src/WINNT/afsd/cm_server.c index 5e4ffda3d..a9b27d335 100644 --- a/src/WINNT/afsd/cm_server.c +++ b/src/WINNT/afsd/cm_server.c @@ -22,6 +22,7 @@ #include #include "afsd.h" +#include #include #include @@ -87,21 +88,21 @@ cm_PingServer(cm_server_t *tsp) wasDown ? "down" : "up", tsp->capabilities); + rxconnp = cm_GetRxConn(connp); if (wasDown) - rx_SetConnDeadTime(connp->callp, 10); + rx_SetConnDeadTime(rxconnp, 10); if (tsp->type == CM_SERVER_VLDB) { - code = VL_ProbeServer(connp->callp); + code = VL_ProbeServer(rxconnp); } 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); + rx_SetConnDeadTime(rxconnp, ConnDeadtimeout); + rx_PutConnection(rxconnp); cm_PutConn(connp); } /* got an unauthenticated connection to this server */ -- 2.39.5