jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-20 07:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

time_t-200408018

Browse Source 
time values in the cache manager and smb engine which are passed to
the run time library must be of type time_t and not long or int or
unsigned long or unsigned int or ...
This commit is contained in:
Jeffrey Altman 2004-08-18 18:10:17 +00:00 committed by Jeffrey Altman
parent ddaba14e37
commit f21740a0ac
4 changed files with 68 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WINNT/afsd/cm_scache.h
View File

@ -72,8 +72,8 @@ typedef struct cm_scache {
/* file status */
int fileType; /* file type */
unsigned long clientModTime; /* mtime */
unsigned long serverModTime; /* at server, for concurrent call
time_t clientModTime; /* mtime */
time_t serverModTime; /* at server, for concurrent call
* comparisons */
osi_hyper_t length; /* file length */
cm_prefetch_t prefetch; /* prefetch info structure */
@ -97,12 +97,12 @@ typedef struct cm_scache {
* the link contents here.
*/
cm_fid_t *mountRootFidp; /* mounted on root */
unsigned int mountRootGen; /* time to update mountRootFidp? */
time_t mountRootGen; /* time to update mountRootFidp? */
cm_fid_t *dotdotFidp; /* parent of volume root */
/* callback info */
struct cm_server *cbServerp; /* server granting callback */
long cbExpires; /* time callback expires */
time_t cbExpires; /* time callback expires */
/* access cache */
long anyAccess; /* anonymous user's access */

71
src/WINNT/afsd/smb.c
View File

@ -43,12 +43,12 @@ smb_vc_t *active_vcp = NULL;
/* TODO; logout mechanism needs to be thread-safe */
char *loggedOutName = NULL;
smb_user_t *loggedOutUserp = NULL;
unsigned long loggedOutTime;
time_t loggedOutTime;
int loggedOut = 0;
int smbShutdownFlag = 0;
int smb_LogoffTokenTransfer;
unsigned long smb_LogoffTransferTimeout;
time_t smb_LogoffTransferTimeout;
DWORD last_msg_time = 0;
@ -432,7 +432,7 @@ static int ExtractBits(WORD bits, short start, short len)
}
#ifndef DJGPP
void ShowUnixTime(char *FuncName, afs_uint32 unixTime)
void ShowUnixTime(char *FuncName, time_t unixTime)
{
FILETIME ft;
WORD wDate, wTime;
@ -583,12 +583,12 @@ smb_CalculateNowTZ()
}
#ifndef DJGPP
void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, afs_uint32 unixTime)
void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime)
{
struct tm *ltp;
SYSTEMTIME stm;
struct tm localJunk;
long ersatz_unixTime;
time_t ersatz_unixTime;
/*
* Must use kludge-GMT instead of real GMT.
@ -623,7 +623,7 @@ void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, afs_uint32 unixTime)
SystemTimeToFileTime(&stm, largeTimep);
}
#else /* DJGPP */
void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, afs_uint32 unixTime)
void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime)
{
/* unixTime: seconds since 1/1/1970 00:00:00 GMT */
/* FILETIME: 100ns intervals since 1/1/1601 00:00:00 ??? */
@ -645,7 +645,7 @@ void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, afs_uint32 unixTime)
#endif /* !DJGPP */
#ifndef DJGPP
void smb_UnixTimeFromLargeSearchTime(afs_uint32 *unixTimep, FILETIME *largeTimep)
void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep)
{
SYSTEMTIME stm;
struct tm lt;
@ -668,7 +668,7 @@ void smb_UnixTimeFromLargeSearchTime(afs_uint32 *unixTimep, FILETIME *largeTimep
_timezone = save_timezone;
}
#else /* DJGPP */
void smb_UnixTimeFromLargeSearchTime(afs_uint32 *unixTimep, FILETIME *largeTimep)
void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep)
{
/* unixTime: seconds since 1/1/1970 00:00:00 GMT */
/* FILETIME: 100ns intervals since 1/1/1601 00:00:00 GMT? */
@ -689,32 +689,33 @@ void smb_UnixTimeFromLargeSearchTime(afs_uint32 *unixTimep, FILETIME *largeTimep
}
#endif /* !DJGPP */
void smb_SearchTimeFromUnixTime(long *dosTimep, afs_uint32 unixTime)
void smb_SearchTimeFromUnixTime(long *dosTimep, time_t unixTime)
{
struct tm *ltp;
int dosDate;
int dosTime;
struct tm localJunk;
struct tm *ltp;
int dosDate;
int dosTime;
struct tm localJunk;
time_t t = unixTime;
ltp = localtime((time_t*) &unixTime);
ltp = localtime((time_t*) &t);
/* if we fail, make up something */
if (!ltp) {
ltp = &localJunk;
localJunk.tm_year = 89 - 20;
localJunk.tm_mon = 4;
localJunk.tm_mday = 12;
localJunk.tm_hour = 0;
localJunk.tm_min = 0;
localJunk.tm_sec = 0;
}
/* if we fail, make up something */
if (!ltp) {
ltp = &localJunk;
localJunk.tm_year = 89 - 20;
localJunk.tm_mon = 4;
localJunk.tm_mday = 12;
localJunk.tm_hour = 0;
localJunk.tm_min = 0;
localJunk.tm_sec = 0;
}
dosDate = ((ltp->tm_year-80)<<9) | ((ltp->tm_mon+1) << 5) | (ltp->tm_mday);
dosTime = (ltp->tm_hour<<11) | (ltp->tm_min << 5) | (ltp->tm_sec / 2);
*dosTimep = (dosDate<<16) | dosTime;
dosDate = ((ltp->tm_year-80)<<9) | ((ltp->tm_mon+1) << 5) | (ltp->tm_mday);
dosTime = (ltp->tm_hour<<11) | (ltp->tm_min << 5) | (ltp->tm_sec / 2);
*dosTimep = (dosDate<<16) | dosTime;
}
void smb_UnixTimeFromSearchTime(afs_uint32 *unixTimep, long searchTime)
void smb_UnixTimeFromSearchTime(time_t *unixTimep, time_t searchTime)
{
unsigned short dosDate;
unsigned short dosTime;
@ -734,12 +735,12 @@ void smb_UnixTimeFromSearchTime(afs_uint32 *unixTimep, long searchTime)
*unixTimep = mktime(&localTm);
}
void smb_DosUTimeFromUnixTime(afs_uint32 *dosUTimep, afs_uint32 unixTime)
void smb_DosUTimeFromUnixTime(time_t *dosUTimep, time_t unixTime)
{
*dosUTimep = unixTime - smb_localZero;
}
void smb_UnixTimeFromDosUTime(afs_uint32 *unixTimep, afs_uint32 dosTime)
void smb_UnixTimeFromDosUTime(time_t *unixTimep, time_t dosTime)
{
#ifndef DJGPP
*unixTimep = dosTime + smb_localZero;
@ -2592,7 +2593,7 @@ long smb_ReceiveNegotiate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
char protocol_array[10][1024]; /* protocol signature of the client */
int caps; /* capabilities */
time_t unixTime;
long dosTime;
time_t dosTime;
TIME_ZONE_INFORMATION tzi;
osi_Log1(smb_logp, "SMB receive negotiate; %d + 1 ongoing ops",
@ -3169,7 +3170,7 @@ long smb_ApplyDirListPatches(smb_dirListPatch_t **dirPatchespp,
long code = 0;
cm_scache_t *scp;
char *dptr;
long dosTime;
time_t dosTime;
u_short shortTemp;
char attr;
smb_dirListPatch_t *patchp;
@ -3801,7 +3802,7 @@ long smb_ReceiveCoreSetFileAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_pack
unsigned short attribute;
cm_attr_t attr;
cm_scache_t *newScp;
long dosTime;
time_t dosTime;
cm_user_t *userp;
int caseFold;
char *tidPathp;
@ -3900,7 +3901,7 @@ long smb_ReceiveCoreGetFileAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_pack
long code = 0;
cm_scache_t *rootScp;
cm_scache_t *newScp, *dscp;
long dosTime;
time_t dosTime;
int attrs;
cm_user_t *userp;
int caseFold;
@ -4062,7 +4063,7 @@ long smb_ReceiveCoreOpen(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
long code = 0;
cm_user_t *userp;
cm_scache_t *scp;
long dosTime;
time_t dosTime;
int caseFold;
cm_space_t *spacep;
char *tidPathp;

22
src/WINNT/afsd/smb.h
View File

@ -153,7 +153,7 @@ typedef struct smb_vc {
struct smb_user *usersp; /* the first child in the user session list */
struct smb_fid *fidsp; /* the first child in the open file list */
struct smb_user *justLoggedOut; /* ready for profile upload? */
unsigned long logoffTime; /* tick count when logged off */
time_t logoffTime; /* tick count when logged off */
/*struct cm_user *logonDLLUser; /* integrated logon user */
unsigned char errorCount;
char rname[17];
@ -316,7 +316,7 @@ typedef struct smb_dirSearch {
int refCount; /* reference count */
long cookie; /* value returned to the caller */
struct cm_scache *scp; /* vnode of the dir we're searching */
long lastTime; /* last time we used this */
time_t lastTime; /* last time we used this */
long flags; /* flags (see below);
* locked by smb_globalLock */
unsigned short attribute; /* search attribute
@ -350,7 +350,7 @@ typedef struct smb_waitingLock {
smb_vc_t *vcp;
smb_packet_t *inp;
smb_packet_t *outp;
u_long timeRemaining;
time_t timeRemaining;
void *lockp;
} smb_waitingLock_t;
@ -380,17 +380,17 @@ extern void smb_Init(osi_log_t *logp, char *smbNamep, int useV3, int LANadapt,
#endif
);
extern void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, afs_uint32 unixTime);
extern void smb_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime);
extern void smb_UnixTimeFromLargeSearchTime(afs_uint32 *unixTimep, FILETIME *largeTimep);
extern void smb_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep);
extern void smb_SearchTimeFromUnixTime(long *dosTimep, afs_uint32 unixTime);
extern void smb_SearchTimeFromUnixTime(time_t *dosTimep, time_t unixTime);
extern void smb_UnixTimeFromSearchTime(afs_uint32 *unixTimep, long searchTime);
extern void smb_UnixTimeFromSearchTime(time_t *unixTimep, time_t searchTime);
extern void smb_DosUTimeFromUnixTime(afs_uint32 *dosUTimep, afs_uint32 unixTime);
extern void smb_DosUTimeFromUnixTime(time_t *dosUTimep, time_t unixTime);
extern void smb_UnixTimeFromDosUTime(afs_uint32 *unixTimep, afs_uint32 dosUTime);
extern void smb_UnixTimeFromDosUTime(time_t *unixTimep, time_t dosUTime);
extern smb_vc_t *smb_FindVC(unsigned short lsn, int flags, int lana);
@ -476,7 +476,7 @@ extern void smb_HoldVC(smb_vc_t *vcp);
/* some globals, too */
extern char *smb_localNamep;
extern int loggedOut;
extern unsigned long loggedOutTime;
extern time_t loggedOutTime;
extern char *loggedOutName;
extern smb_user_t *loggedOutUserp;
@ -487,7 +487,7 @@ extern osi_rwlock_t smb_globalLock;
extern osi_rwlock_t smb_rctLock;
extern int smb_LogoffTokenTransfer;
extern unsigned long smb_LogoffTransferTimeout;
extern time_t smb_LogoffTransferTimeout;
extern int smb_maxVCPerServer; /* max # of VCs per server */
extern int smb_maxMpxRequests; /* max # of mpx requests */

33
src/WINNT/client_creds/ipaddrchg.c
View File

@ -305,25 +305,26 @@ ObtainTokensFromUserIfNeeded(HWND hWnd)
strcpy(aserver.cell, rootcell);
rc = ktc_GetToken(&aserver, &atoken, sizeof(atoken), &aclient);
if ( rc == 0 ) {
GetLocalTime (&stNow);
SystemTimeToFileTime (&stNow, &ftNow);
llNow = (((LONGLONG)ftNow.dwHighDateTime) << 32) + (LONGLONG)(ftNow.dwLowDateTime);
llNow /= c100ns1SECOND;
GetLocalTime (&stNow);
SystemTimeToFileTime (&stNow, &ftNow);
llNow = (((LONGLONG)ftNow.dwHighDateTime) << 32) + (LONGLONG)(ftNow.dwLowDateTime);
llNow /= c100ns1SECOND;
TimeToSystemTime (&stExpires, atoken.endTime);
SystemTimeToFileTime (&stExpires, &ftExpires);
llExpires = (((LONGLONG)ftExpires.dwHighDateTime) << 32) + (LONGLONG)(ftExpires.dwLowDateTime);
llExpires /= c100ns1SECOND;
TimeToSystemTime (&stExpires, atoken.endTime);
SystemTimeToFileTime (&stExpires, &ftExpires);
llExpires = (((LONGLONG)ftExpires.dwHighDateTime) << 32) + (LONGLONG)(ftExpires.dwLowDateTime);
llExpires /= c100ns1SECOND;
if (llNow < llExpires)
goto cleanup;
if (!rc && (llNow < llExpires))
goto cleanup;
if ( IsDebuggerPresent() ) {
char message[256];
sprintf(message,"ObtainTokensFromUserIfNeeded: %d now = %ul endTime = %ul\n",
rc, llNow, llExpires);
OutputDebugString(message);
if ( IsDebuggerPresent() ) {
char message[256];
sprintf(message,"ObtainTokensFromUserIfNeeded: %d now = %ul endTime = %ul\n",
rc, llNow, llExpires);
OutputDebugString(message);
}
}
#ifdef USE_FSPROBE