From 9374963fcade1390ce97e388c19ccf104f969f18 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 23 Apr 2004 04:38:54 +0000 Subject: [PATCH] ren-msgbox-logfile-20040422 Several fixes: (1) the log file afsd_logp should not be referenced in the smb modules instead the smb_logp should be used (2) Properly define the dummy_MessageBox function as _stdcall (3) When afsd_service.exe fails due to a Network Error (IP address change) display a MessageBox to the end user (4) Fix "rename foo foo" to not generate a "destination file exists" error (Thanks to asanka) --- src/WINNT/afsd/afsd_service.c | 6 +- src/WINNT/afsd/smb.c | 178 ++++++++++++++++++++-------------- src/WINNT/afsd/smb3.c | 152 ++++++++++++++--------------- 3 files changed, 182 insertions(+), 154 deletions(-) diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c index cc3883f0a..018569139 100644 --- a/src/WINNT/afsd/afsd_service.c +++ b/src/WINNT/afsd/afsd_service.c @@ -59,7 +59,7 @@ extern HANDLE afsi_file; */ static void afsd_notifier(char *msgp, char *filep, long line) { - char tbuffer[100]; + char tbuffer[512]; char *ptbuf[1]; HANDLE h; @@ -104,7 +104,7 @@ static void afsd_notifier(char *msgp, char *filep, long line) /* * For use miscellaneously in smb.c; need to do better */ -static int DummyMessageBox(HWND h, LPCTSTR l1, LPCTSTR l2, UINT ui) +static int _stdcall DummyMessageBox(HWND h, LPCTSTR l1, LPCTSTR l2, UINT ui) { return 0; } @@ -474,7 +474,7 @@ void afsd_Main(DWORD argc, LPTSTR *argv) ServiceStatus.dwWaitHint -= 5000; SetServiceStatus(StatusHandle, &ServiceStatus); #endif - code = afsd_InitSMB(&reason, DummyMessageBox); + code = afsd_InitSMB(&reason, MessageBox); if (code != 0) { afsi_log("afsd_InitSMB failed: %s (code = %d)", reason, code); osi_panic(reason, __FILE__, __LINE__); diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c index c49bb7de3..3512ef51d 100644 --- a/src/WINNT/afsd/smb.c +++ b/src/WINNT/afsd/smb.c @@ -139,8 +139,10 @@ int smb_hideDotFiles; int smb_useV3; /* try to negotiate V3 */ #ifndef DJGPP +static showErrors = 1; /* MessageBox or something like it */ -int (WINAPI *smb_MBfunc)(HWND, LPCTSTR, LPCTSTR, UINT) = NULL; +int (_stdcall *smb_MBfunc)(HWND, LPCTSTR, LPCTSTR, UINT) = NULL; +extern HANDLE WaitToTerminate; #endif /* DJGPP */ /* GMT time info: @@ -400,7 +402,7 @@ void ShowUnixTime(char *FuncName, long unixTime) smb_LargeSearchTimeFromUnixTime(&ft, unixTime); if (!FileTimeToDosDateTime(&ft, &wDate, &wTime)) - osi_Log1(afsd_logp, "Failed to convert filetime to dos datetime: %d", GetLastError()); + osi_Log1(smb_logp, "Failed to convert filetime to dos datetime: %d", GetLastError()); else { int day, month, year, sec, min, hour; char msg[256]; @@ -414,7 +416,7 @@ void ShowUnixTime(char *FuncName, long unixTime) hour = ExtractBits(wTime, 11, 5); sprintf(msg, "%s = %02d-%02d-%04d %02d:%02d:%02d", FuncName, month, day, year, hour, min, sec); - osi_Log1(afsd_logp, "%s", osi_LogSaveString(afsd_logp, msg)); + osi_Log1(smb_logp, "%s", osi_LogSaveString(smb_logp, msg)); } } #endif /* DJGPP */ @@ -1674,7 +1676,7 @@ unsigned int smb_GetSMBParm(smb_packet_t *smbp, int parm) sprintf(s, "Bad SMB param %d out of %d, ncb len %d", parm, parmCount, smbp->ncb_length); - osi_Log0(afsd_logp, s); + osi_Log0(smb_logp, s); #endif /* !DJGPP */ osi_panic(s, __FILE__, __LINE__); } @@ -1709,7 +1711,7 @@ unsigned int smb_GetSMBOffsetParm(smb_packet_t *smbp, int parm, int offset) sprintf(s, "Bad SMB param %d offset %d out of %d, " "ncb len %d", parm, offset, parmCount, smbp->ncb_length); - osi_Log0(afsd_logp, s); + osi_Log0(smb_logp, s); #endif /* !DJGPP */ osi_panic(s, __FILE__, __LINE__); @@ -1907,7 +1909,7 @@ void smb_SendPacket(smb_vc_t *vcp, smb_packet_t *inp) #endif /* !DJGPP */ if (code != 0) - osi_Log1(afsd_logp, "SendPacket failure code %d", code); + osi_Log1(smb_logp, "SendPacket failure code %d", code); if (localNCB) FreeNCB(ncbp); @@ -2017,7 +2019,7 @@ void smb_MapNTError(long code, unsigned long *NTStatusp) } *NTStatusp = NTStatus; - osi_Log2(afsd_logp, "SMB SEND code %x as NT %x", code, NTStatus); + osi_Log2(smb_logp, "SMB SEND code %x as NT %x", code, NTStatus); } void smb_MapCoreError(long code, smb_vc_t *vcp, unsigned short *scodep, @@ -2170,7 +2172,7 @@ void smb_MapCoreError(long code, smb_vc_t *vcp, unsigned short *scodep, *scodep = error; *classp = class; - osi_Log3(afsd_logp, "SMB SEND code %x as SMB %d: %d", code, class, error); + osi_Log3(smb_logp, "SMB SEND code %x as SMB %d: %d", code, class, error); } long smb_SendCoreBadOp(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) @@ -2224,7 +2226,7 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp offset.HighPart = 0; /* too bad */ offset.LowPart = smb_GetSMBParm(inp, 1) | (smb_GetSMBParm(inp, 2) << 16); - osi_Log3(afsd_logp, "smb_ReceieveCoreReadRaw fd %d, off 0x%x, size 0x%x", + osi_Log3(smb_logp, "smb_ReceieveCoreReadRaw fd %d, off 0x%x, size 0x%x", fd, offset.LowPart, count); fidp = smb_FindFID(vcp, fd, 0); @@ -2307,7 +2309,7 @@ long smb_ReceiveCoreReadRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp code = Netbios(ncbp, dos_ncb); #endif /* !DJGPP */ if (code != 0) - osi_Log1(afsd_logp, "ReadRaw send failure code %d", code); + osi_Log1(smb_logp, "ReadRaw send failure code %d", code); if (rawBuf) { /* Give back raw buffer */ @@ -2349,14 +2351,14 @@ 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 */ - osi_Log1(afsd_logp, "SMB receive negotiate; %d + 1 ongoing ops", + osi_Log1(smb_logp, "SMB receive negotiate; %d + 1 ongoing ops", ongoingOps - 1); if (!isGateway) { if (active_vcp) { DWORD now = GetCurrentTime(); if (now - last_msg_time >= 30000 && now - last_msg_time <= 90000) { - osi_Log1(afsd_logp, + osi_Log1(smb_logp, "Setting dead_vcp %x", active_vcp); dead_vcp = active_vcp; dead_vcp->flags |= SMB_VCFLAG_ALREADYDEAD; @@ -2373,8 +2375,8 @@ long smb_ReceiveNegotiate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) v3ProtoIndex = -1; NTProtoIndex = -1; while(namex < dbytes) { - osi_Log1(afsd_logp, "Protocol %s", - osi_LogSaveString(afsd_logp, namep+1)); + osi_Log1(smb_logp, "Protocol %s", + osi_LogSaveString(smb_logp, namep+1)); strcpy(protocol_array[tcounter], namep+1); /* namep points at the first protocol, or really, a 0x02 @@ -2420,7 +2422,7 @@ long smb_ReceiveNegotiate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) (strcmp("LANMAN2.1", protocol_array[4]) == 0) && (strcmp("NT LM 0.12", protocol_array[5]) == 0)) { isWindows2000 = TRUE; - osi_Log0(afsd_logp, "Looks like a Windows 2000 client"); + osi_Log0(smb_logp, "Looks like a Windows 2000 client"); /* * HACK: for now - just negotiate a lower protocol till we * figure out which flag/flag2 or some other field @@ -2431,7 +2433,7 @@ long smb_ReceiveNegotiate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* Things to try (after looking at tcpdump output could be * setting flags and flags2 to 0x98 and 0xc853 like this * op->reb = 0x98; op->flg2 = 0xc853; - * osi_Log2(afsd_logp, "Flags:0x%x Flags2:0x%x", ip->reb, ip->flg2); + * osi_Log2(smb_logp, "Flags:0x%x Flags2:0x%x", ip->reb, ip->flg2); */ } } @@ -2590,7 +2592,7 @@ void smb_WaitingLocksDaemon() long smb_ReceiveCoreGetDiskAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) { - osi_Log0(afsd_logp, "SMB receive get disk attributes"); + osi_Log0(smb_logp, "SMB receive get disk attributes"); smb_SetSMBParm(outp, 0, 32000); smb_SetSMBParm(outp, 1, 64); @@ -2613,7 +2615,7 @@ long smb_ReceiveCoreTreeConnect(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * char *passwordp; cm_user_t *userp; - osi_Log0(afsd_logp, "SMB receive tree connect"); + osi_Log0(smb_logp, "SMB receive tree connect"); /* parse input parameters */ tp = smb_GetSMBData(inp, NULL); @@ -2646,7 +2648,7 @@ long smb_ReceiveCoreTreeConnect(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * smb_SetSMBParm(rsp, 1, newTid); smb_SetSMBDataLength(rsp, 0); - osi_Log1(afsd_logp, "SMB tree connect created ID %d", newTid); + osi_Log1(smb_logp, "SMB tree connect created ID %d", newTid); return 0; } @@ -2785,7 +2787,7 @@ long smb_ReceiveCoreSearchVolume(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t unsigned char initStatBlock[21]; int statLen; - osi_Log0(afsd_logp, "SMB receive search volume"); + osi_Log0(smb_logp, "SMB receive search volume"); /* pull pathname and stat block out of request */ tp = smb_GetSMBData(inp, NULL); @@ -2986,8 +2988,8 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou if (attribute & 0x8) return smb_ReceiveCoreSearchVolume(vcp, inp, outp); - osi_Log2(afsd_logp, "SMB receive search dir count %d [%s]", - maxCount, osi_LogSaveString(afsd_logp, pathp)); + osi_Log2(smb_logp, "SMB receive search dir count %d [%s]", + maxCount, osi_LogSaveString(smb_logp, pathp)); if (*pathp == 0) { /* null pathp, treat as root dir */ if (!(attribute & SMB_ATTR_DIRECTORY)) /* exclude dirs */ @@ -3029,7 +3031,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou starPattern = 1; } - osi_Log3(afsd_logp, "SMB dir search cookie 0x%x, connection %d, attr 0x%x", + osi_Log3(smb_logp, "SMB dir search cookie 0x%x, connection %d, attr 0x%x", nextCookie, dsp->cookie, attribute); userp = smb_GetUser(vcp, inp); @@ -3269,7 +3271,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou fid.vnode = ntohl(dep->fid.vnode); fid.unique = ntohl(dep->fid.unique); fileType = cm_FindFileType(&fid); - osi_Log2(afsd_logp, "smb_ReceiveCoreSearchDir: file %s " + osi_Log2(smb_logp, "smb_ReceiveCoreSearchDir: file %s " "has filetype %d", dep->name, fileType); if (fileType == CM_SCACHETYPE_DIRECTORY) @@ -3358,7 +3360,7 @@ long smb_ReceiveCoreSearchDir(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou if (code == 0 && dataLength < 21 && returnedNames == 0) code = CM_ERROR_NOFILES; - osi_Log2(afsd_logp, "SMB search dir done, %d names, code %d", + osi_Log2(smb_logp, "SMB search dir done, %d names, code %d", returnedNames, code); if (code != 0) { @@ -3409,8 +3411,8 @@ long smb_ReceiveCoreCheckPath(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou pathp = smb_GetSMBData(inp, NULL); pathp = smb_ParseASCIIBlock(pathp, NULL); - osi_Log1(afsd_logp, "SMB receive check path %s", - osi_LogSaveString(afsd_logp, pathp)); + osi_Log1(smb_logp, "SMB receive check path %s", + osi_LogSaveString(smb_logp, pathp)); if (!pathp) { return CM_ERROR_BADFD; @@ -3482,7 +3484,7 @@ long smb_ReceiveCoreSetFileAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_pack return CM_ERROR_BADSMB; } - osi_Log2(afsd_logp, "SMB receive setfile attributes time %d, attr 0x%x", + osi_Log2(smb_logp, "SMB receive setfile attributes time %d, attr 0x%x", dosTime, attribute); rootScp = cm_rootSCachep; @@ -3579,8 +3581,8 @@ long smb_ReceiveCoreGetFileAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_pack if (*pathp == 0) /* null path */ pathp = "\\"; - osi_Log1(afsd_logp, "SMB receive getfile attributes path %s", - osi_LogSaveString(afsd_logp, pathp)); + osi_Log1(smb_logp, "SMB receive getfile attributes path %s", + osi_LogSaveString(smb_logp, pathp)); rootScp = cm_rootSCachep; @@ -3692,7 +3694,7 @@ long smb_ReceiveCoreTreeDisconnect(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_ { smb_tid_t *tidp; - osi_Log0(afsd_logp, "SMB receive tree disconnect"); + osi_Log0(smb_logp, "SMB receive tree disconnect"); /* find the tree and free it */ tidp = smb_FindTID(vcp, ((smb_t *)inp)->tid, 0); @@ -3727,7 +3729,7 @@ long smb_ReceiveCoreOpen(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) pathp = smb_GetSMBData(inp, NULL); pathp = smb_ParseASCIIBlock(pathp, NULL); - osi_Log1(afsd_logp, "SMB receive open file [%s]", osi_LogSaveString(afsd_logp, pathp)); + osi_Log1(smb_logp, "SMB receive open file [%s]", osi_LogSaveString(smb_logp, pathp)); #ifdef DEBUG_VERBOSE { @@ -3968,7 +3970,7 @@ int smb_RenameProc(cm_scache_t *dscp, cm_dirEntry_t *dep, void *vrockp, osi_hype int match; char shortName[13]; - rockp = vrockp; + rockp = (smb_renameRock_t *) vrockp; if (rockp->vcp->flags & SMB_VCFLAG_USEV3) caseFold = CM_FLAG_CASEFOLD; @@ -4023,9 +4025,9 @@ long smb_ReceiveCoreRename(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) oldPathp = smb_ParseASCIIBlock(tp, &tp); newPathp = smb_ParseASCIIBlock(tp, &tp); - osi_Log2(afsd_logp, "smb rename %s to %s", - osi_LogSaveString(afsd_logp, oldPathp), - osi_LogSaveString(afsd_logp, newPathp)); + osi_Log2(smb_logp, "smb rename %s to %s", + osi_LogSaveString(smb_logp, oldPathp), + osi_LogSaveString(smb_logp, newPathp)); spacep = inp->spacep; smb_StripLastComponent(spacep->data, &oldLastNamep, oldPathp); @@ -4093,10 +4095,23 @@ long smb_ReceiveCoreRename(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* Check if the file already exists; if so return error */ code = cm_Lookup(newDscp,newLastNamep,CM_FLAG_CHECKPATH,userp,&req,&tmpscp); if((code != CM_ERROR_NOSUCHFILE) && (code != CM_ERROR_NOSUCHPATH) && (code != CM_ERROR_NOSUCHVOLUME) ) { - cm_ReleaseSCache(tmpscp); - return CM_ERROR_EXISTS; /* file exist, do not rename, also - * fixes move - */ + cm_ReleaseSCache(newDscp); + cm_ReleaseSCache(oldDscp); + cm_ReleaseUser(userp); + if (!code) + cm_ReleaseSCache(tmpscp); + /* Check if the old and the new names differ only in case. If so return + * success, else return CM_ERROR_EXISTS + */ + if(oldDscp == newDscp && !stricmp(oldLastNamep, newLastNamep)) { + osi_Log0(afsd_logp, "Rename: Old and new names are the same"); + code = 0; + } else { + /* file exist, do not rename, also fixes move */ + osi_Log0(afsd_logp, "Can't rename. Target already exists"); + code = CM_ERROR_EXISTS; + } + return code; } /* Now search the directory for the pattern, and do the appropriate rename when found */ @@ -4133,10 +4148,8 @@ long smb_ReceiveCoreRename(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) } cm_ReleaseUser(userp); - cm_ReleaseSCache(oldDscp); cm_ReleaseSCache(newDscp); - return code; } @@ -4258,7 +4271,7 @@ long smb_ReceiveCoreFlush(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) fid = smb_GetSMBParm(inp, 0); - osi_Log1(afsd_logp, "SMB flush fid %d", fid); + osi_Log1(smb_logp, "SMB flush fid %d", fid); fid = smb_ChainFID(fid, inp); fidp = smb_FindFID(vcp, fid, 0); @@ -4346,7 +4359,7 @@ long smb_ReceiveCoreClose(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) fid = smb_GetSMBParm(inp, 0); dosTime = smb_GetSMBParm(inp, 1) | (smb_GetSMBParm(inp, 2) << 16); - osi_Log1(afsd_logp, "SMB close fid %d", fid); + osi_Log1(smb_logp, "SMB close fid %d", fid); fid = smb_ChainFID(fid, inp); fidp = smb_FindFID(vcp, fid, 0); @@ -4829,7 +4842,7 @@ long smb_ReceiveCoreWrite(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) op = smb_GetSMBData(inp, NULL); op = smb_ParseDataBlock(op, NULL, &inDataBlockCount); - osi_Log3(afsd_logp, "smb_ReceiveCoreWrite fd %d, off 0x%x, size 0x%x", + osi_Log3(smb_logp, "smb_ReceiveCoreWrite fd %d, off 0x%x, size 0x%x", fd, offset.LowPart, count); fd = smb_ChainFID(fd, inp); @@ -4914,7 +4927,7 @@ void smb_CompleteWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, fd = smb_GetSMBParm(inp, 0); fidp = smb_FindFID(vcp, fd, 0); - osi_Log2(afsd_logp, "Completing Raw Write offset %x count %x", + osi_Log2(smb_logp, "Completing Raw Write offset %x count %x", rwcp->offset.LowPart, rwcp->count); userp = smb_GetUser(vcp, inp); @@ -4995,7 +5008,7 @@ long smb_ReceiveCoreWriteRaw(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out op = (char *) inp->data; op += smb_GetSMBParm(inp, 11); - osi_Log4(afsd_logp, + osi_Log4(smb_logp, "smb_ReceiveCoreWriteRaw fd %d, off 0x%x, size 0x%x, WriteMode 0x%x", fd, offset.LowPart, count, writeMode); @@ -5100,7 +5113,7 @@ long smb_ReceiveCoreRead(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) offset.HighPart = 0; /* too bad */ offset.LowPart = smb_GetSMBParm(inp, 2) | (smb_GetSMBParm(inp, 3) << 16); - osi_Log3(afsd_logp, "smb_ReceiveCoreRead fd %d, off 0x%x, size 0x%x", + osi_Log3(smb_logp, "smb_ReceiveCoreRead fd %d, off 0x%x, size 0x%x", fd, offset.LowPart, count); fd = smb_ChainFID(fd, inp); @@ -5314,7 +5327,7 @@ long smb_ReceiveCoreCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) if (!smb_IsLegalFilename(lastNamep)) return CM_ERROR_BADNTFILENAME; - osi_Log1(afsd_logp, "SMB receive create [%s]", osi_LogSaveString( afsd_logp, pathp )); + osi_Log1(smb_logp, "SMB receive create [%s]", osi_LogSaveString( smb_logp, pathp )); #ifdef DEBUG_VERBOSE { char *hexp; @@ -5472,7 +5485,6 @@ long smb_ReceiveCoreSeek(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, NCB *ncbp, raw_write_cont_t *rwcp) { - static showErrors = 0; smb_dispatch_t *dp; smb_t *smbp; unsigned long code = 0; @@ -5546,7 +5558,7 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, /* process each request in the packet; inCom, wctp and inCount * are already set up. */ - osi_Log2(afsd_logp, "SMB received op 0x%x lsn %d", inp->inCom, + osi_Log2(smb_logp, "SMB received op 0x%x lsn %d", inp->inCom, ncbp->ncb_lsn); /* now do the dispatch */ @@ -5580,10 +5592,10 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, rwcp); else { osi_LogEvent("AFS Dispatch %s",(myCrt_Dispatch(inp->inCom)),"vcp[%x] lana[%d] lsn[%d]",(int)vcp,vcp->lana,vcp->lsn); - osi_Log4(afsd_logp,"Dispatch %s vcp[%x] lana[%d] lsn[%d]",(myCrt_Dispatch(inp->inCom)),vcp,vcp->lana,vcp->lsn); + osi_Log4(smb_logp,"Dispatch %s vcp[%x] lana[%d] lsn[%d]",(myCrt_Dispatch(inp->inCom)),vcp,vcp->lana,vcp->lsn); code = (*(dp->procp)) (vcp, inp, outp); osi_LogEvent("AFS Dispatch return",NULL,"Code[%d]",(code==0)?0:code-CM_ERROR_BASE); - osi_Log1(afsd_logp,"Dispatch return code[%d]",(code==0)?0:code-CM_ERROR_BASE); + osi_Log1(smb_logp,"Dispatch return code[%d]",(code==0)?0:code-CM_ERROR_BASE); } if (oldGen != sessionGen) { @@ -5600,7 +5612,7 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, 1005, NULL, 1, ncbp->ncb_length, ptbuf, smbp); DeregisterEventSource(h); #else /* DJGPP */ - osi_Log1(afsd_logp, "Pkt straddled session startup, " + osi_Log1(smb_logp, "Pkt straddled session startup, " "ncb length %d", ncbp->ncb_length); #endif /* !DJGPP */ } @@ -5615,7 +5627,7 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, if (showErrors) { sprintf(tbuffer, "Received bad SMB req 0x%x", inp->inCom); code = (*smb_MBfunc)(NULL, tbuffer, "Cancel: don't show again", - MB_OKCANCEL); + MB_OKCANCEL|MB_SERVICE_NOTIFICATION); if (code == IDCANCEL) showErrors = 0; } #endif /* DJGPP */ @@ -5644,7 +5656,7 @@ void smb_DispatchPacket(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp, smb_LogPacket(inp); #endif /* NOTSERVICE */ #else /* DJGPP */ - osi_Log1(afsd_logp, "Invalid SMB message, length %d", + osi_Log1(smb_logp, "Invalid SMB message, length %d", ncbp->ncb_length); #endif /* !DJGPP */ @@ -5981,7 +5993,7 @@ void smb_Server(VOID *parmp) if (tod > EXPIREDATE) { (*smb_MBfunc)(NULL, "AFS demo expiration", "afsd dispatcher", - MB_OK|MB_ICONSTOP|MB_SETFOREGROUND); + MB_OK|MB_ICONSTOP|MB_SETFOREGROUND|MB_SERVICE_NOTIFICATION); trhd_Exit(1); } } @@ -6034,7 +6046,7 @@ void smb_Server(VOID *parmp) rc = ncbp->ncb_retcode; if (rc != NRC_PENDING && rc != NRC_GOODRET) - osi_Log1(afsd_logp, "NCBRECV failure code %d", rc); + osi_Log1(smb_logp, "NCBRECV failure code %d", rc); switch (rc) { case NRC_GOODRET: break; @@ -6062,11 +6074,11 @@ void smb_Server(VOID *parmp) */ if (vcp) { if (dead_vcp) - osi_Log1(afsd_logp, + osi_Log1(smb_logp, "dead_vcp already set, %x", dead_vcp); if (!dead_vcp && !(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { - osi_Log2(afsd_logp, + osi_Log2(smb_logp, "setting dead_vcp %x, user struct %x", vcp, vcp->usersp); dead_vcp = vcp; @@ -6179,7 +6191,7 @@ void smb_Server(VOID *parmp) } /* Also log in the trace log. */ - osi_Log4(afsd_logp, "Server: BAD VCP!" + osi_Log4(smb_logp, "Server: BAD VCP!" "LSNs[idx_session]=[%d]," "lanas[idx_session]=[%d]," "ncbp->ncb_lsn=[%d]," @@ -6370,7 +6382,7 @@ void smb_Listener(void *parmp) if (tod > EXPIREDATE) { (*smb_MBfunc)(NULL, "AFS demo expiration", "afsd listener", - MB_OK|MB_ICONSTOP|MB_SETFOREGROUND); + MB_OK|MB_ICONSTOP|MB_SETFOREGROUND|MB_SERVICE_NOTIFICATION); #ifndef DJGPP ExitThread(1); #else @@ -6402,7 +6414,11 @@ void smb_Listener(void *parmp) if (code != 0) { - /* terminate if shutdown flag is set */ +#ifndef DJGPP + char tbuffer[256]; +#endif + + /* terminate silently if shutdown flag is set */ if (smbShutdownFlag == 1) { #ifndef DJGPP ExitThread(1); @@ -6411,17 +6427,29 @@ void smb_Listener(void *parmp) #endif } + osi_Log2(smb_logp, + "NCBLISTEN lana=%d failed with code %d", + ncbp->ncb_lana_num, code); + osi_Log0(smb_logp, + "Client exiting due to network failure. Please restart client.\n"); + #ifndef DJGPP - osi_assert(0); + sprintf(tbuffer, + "Client exiting due to network failure. Please restart client.\n" + "NCBLISTEN lana=%d failed with code %d", + ncbp->ncb_lana_num, code); + if (showErrors) + code = (*smb_MBfunc)(NULL, tbuffer, "AFS Client Service: Fatal Error", + MB_OK|MB_SERVICE_NOTIFICATION); + osi_assert(tbuffer); + ExitThread(1); #else fprintf(stderr, "NCBLISTEN lana=%d failed with code %d\n", ncbp->ncb_lana_num, code); - osi_Log2(0, "NCBLISTEN lana=%d failed with code %d", - ncbp->ncb_lana_num, code); fprintf(stderr, "\nClient exiting due to network failure " "(possibly due to power-saving mode)\n"); fprintf(stderr, "Please restart client.\n"); - afs_exit(AFS_EXITCODE_NETWORK_FAILURE); + afs_exit(AFS_EXITCODE_NETWORK_FAILURE); #endif /* !DJGPP */ } @@ -6440,7 +6468,7 @@ void smb_Listener(void *parmp) if (strncmp(rname, cname, NCBNAMSZ) != 0) flags |= SMB_VCFLAG_REMOTECONN; - osi_Log1(afsd_logp, "New session lsn %d", ncbp->ncb_lsn); + osi_Log1(smb_logp, "New session lsn %d", ncbp->ncb_lsn); /* lock */ lock_ObtainMutex(&smb_ListenerLock); @@ -6470,7 +6498,7 @@ void smb_Listener(void *parmp) DeregisterEventSource(h); #else /* DJGPP */ afsi_log("NCBLISTEN completed, call from %s",rname); - osi_Log1(afsd_logp, "SMB session startup, %d ongoing ops", + osi_Log1(smb_logp, "SMB session startup, %d ongoing ops", ongoingOps); time(&now); fprintf(stderr, "%s: New session %d starting from host %s\n", @@ -6509,7 +6537,7 @@ void smb_Listener(void *parmp) /* Add new NCB for new session */ char eventName[MAX_PATH]; - osi_Log1(afsd_logp, "smb_Listener creating new session %d", i); + osi_Log1(smb_logp, "smb_Listener creating new session %d", i); InitNCBslot(numNCBs); numNCBs++; @@ -6743,7 +6771,7 @@ void smb_Init(osi_log_t *logp, char *snamep, int useV3, int LANadapt, if (tod > EXPIREDATE) { #ifndef DJGPP (*smb_MBfunc)(NULL, "AFS demo expiration", "afsd", - MB_OK|MB_ICONSTOP|MB_SETFOREGROUND); + MB_OK|MB_ICONSTOP|MB_SETFOREGROUND|MB_SERVICE_NOTIFICATION); exit(1); #else /* DJGPP */ fprintf(stderr, "AFS demo expiration\n"); @@ -7035,7 +7063,7 @@ void smb_Shutdown(void) /*fprintf(stderr, "returned from NCBHANGUP session %d LSN %d\n", i, LSNs[i]);*/ if (code == 0) code = ncbp->ncb_retcode; if (code != 0) { - osi_Log1(afsd_logp, "Netbios NCBHANGUP error code %d", code); + osi_Log1(smb_logp, "Netbios NCBHANGUP error code %d", code); fprintf(stderr, "Session %d Netbios NCBHANGUP error code %d", i, code); } } @@ -7089,7 +7117,7 @@ void smb_LogPacket(smb_packet_t *packet) if(!packet) return; - osi_Log0(afsd_logp, "*** SMB packet dump ***"); + osi_Log0(smb_logp, "*** SMB packet dump ***"); vp = (BYTE *) packet->data; @@ -7134,10 +7162,10 @@ void smb_LogPacket(smb_packet_t *packet) *cp = 0; - osi_Log0( afsd_logp, buf ); + osi_Log0( smb_logp, buf ); } - osi_Log0(afsd_logp, "*** End SMB packet dump ***"); + osi_Log0(smb_logp, "*** End SMB packet dump ***"); } diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c index ace589b29..b07a107ca 100644 --- a/src/WINNT/afsd/smb3.c +++ b/src/WINNT/afsd/smb3.c @@ -151,7 +151,7 @@ long smb_ReceiveV3SessionSetupX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * userp = unp->userp; newUid = (unsigned short)uidp->userID; /* For some reason these are different types!*/ osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"FindUserByName:Lana[%d],lsn[%d],userid[%d],name[%s]",vcp->lana,vcp->lsn,newUid,usern); - osi_Log3(afsd_logp,"smb_ReceiveV3SessionSetupX FindUserByName:Lana[%d],lsn[%d],userid[%d]",vcp->lana,vcp->lsn,newUid); + osi_Log3(smb_logp,"smb_ReceiveV3SessionSetupX FindUserByName:Lana[%d],lsn[%d],userid[%d]",vcp->lana,vcp->lsn,newUid); smb_ReleaseUID(uidp); } else { @@ -177,7 +177,7 @@ long smb_ReceiveV3SessionSetupX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * lock_ObtainMutex(&uidp->mx); uidp->unp = unp; osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d],TicketKTCName[%s]",(int)vcp,vcp->lana,vcp->lsn,newUid,usern); - osi_Log4(afsd_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); + osi_Log4(smb_logp,"smb_ReceiveV3SessionSetupX MakeNewUser:VCP[%x],Lana[%d],lsn[%d],userid[%d]",vcp,vcp->lana,vcp->lsn,newUid); lock_ReleaseMutex(&uidp->mx); smb_ReleaseUID(uidp); } @@ -187,8 +187,8 @@ long smb_ReceiveV3SessionSetupX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * /* Also to the next chained message */ ((smb_t *)inp)->uid = newUid; - osi_Log3(afsd_logp, "SMB3 session setup name %s creating ID %d%s", - osi_LogSaveString(afsd_logp, usern), newUid, osi_LogSaveString(afsd_logp, s1)); + osi_Log3(smb_logp, "SMB3 session setup name %s creating ID %d%s", + osi_LogSaveString(smb_logp, usern), newUid, osi_LogSaveString(smb_logp, s1)); smb_SetSMBParm(outp, 2, 0); smb_SetSMBDataLength(outp, 0); return 0; @@ -212,9 +212,9 @@ long smb_ReceiveV3UserLogoffX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou if (s2 == NULL) s2 = " "; if (s1 == NULL) {s1 = s2; s2 = " ";} - osi_Log4(afsd_logp, "SMB3 user logoffX uid %d name %s%s%s", + osi_Log4(smb_logp, "SMB3 user logoffX uid %d name %s%s%s", uidp->userID, - osi_LogSaveString(afsd_logp, + osi_LogSaveString(smb_logp, (uidp->unp) ? uidp->unp->name: " "), s1, s2); lock_ObtainMutex(&uidp->mx); @@ -226,7 +226,7 @@ long smb_ReceiveV3UserLogoffX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *ou lock_ReleaseMutex(&uidp->mx); } else - osi_Log0(afsd_logp, "SMB3 user logoffX"); + osi_Log0(smb_logp, "SMB3 user logoffX"); smb_SetSMBDataLength(outp, 0); return 0; @@ -245,7 +245,7 @@ long smb_ReceiveV3TreeConnectX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *o char *servicep; cm_user_t *userp; - osi_Log0(afsd_logp, "SMB3 receive tree connect"); + osi_Log0(smb_logp, "SMB3 receive tree connect"); /* parse input parameters */ tp = smb_GetSMBData(inp, NULL); @@ -291,7 +291,7 @@ long smb_ReceiveV3TreeConnectX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *o *tp++ = 0; smb_SetSMBDataLength(outp, 3); - osi_Log1(afsd_logp, "SMB3 tree connect created ID %d", newTid); + osi_Log1(smb_logp, "SMB3 tree connect created ID %d", newTid); return 0; } @@ -514,7 +514,7 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) HANDLE h; char *ptbuf[1]; - osi_Log0(afsd_logp, "TRANSACTION2 word count = 0"); + osi_Log0(smb_logp, "TRANSACTION2 word count = 0"); h = RegisterEventSource(NULL, AFS_DAEMON_EVENT_NAME); ptbuf[0] = "Transaction2 word count = 0"; @@ -522,7 +522,7 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) 1, inp->ncb_length, ptbuf, inp); DeregisterEventSource(h); #else /* DJGPP */ - osi_Log0(afsd_logp, "TRANSACTION2 word count = 0"); + osi_Log0(smb_logp, "TRANSACTION2 word count = 0"); #endif /* !DJGPP */ smb_SetSMBDataLength(outp, 0); @@ -553,7 +553,7 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) asp->maxReturnParms = smb_GetSMBParm(inp, 2); asp->maxReturnData = smb_GetSMBParm(inp, 3); - osi_Log3(afsd_logp, "SMB3 received T2 init packet total data %d, cur data %d, max return data %d", + osi_Log3(smb_logp, "SMB3 received T2 init packet total data %d, cur data %d, max return data %d", totalData, dataCount, asp->maxReturnData); } else { @@ -564,7 +564,7 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) parmCount = smb_GetSMBParm(inp, 2); dataCount = smb_GetSMBParm(inp, 5); - osi_Log2(afsd_logp, "SMB3 received T2 aux packet parms %d, data %d", + osi_Log2(smb_logp, "SMB3 received T2 aux packet parms %d, data %d", parmCount, dataCount); } @@ -591,12 +591,12 @@ long smb_ReceiveV3Tran2A(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* now dispatch it */ if ( asp->opcode >= 0 && asp->opcode < 20 && smb_tran2DispatchTable[asp->opcode].procp) { osi_LogEvent("AFS-Dispatch-2[%s]",myCrt_2Dispatch(asp->opcode),"vcp[%x] lana[%d] lsn[%d]",(int)vcp,vcp->lana,vcp->lsn); - osi_Log4(afsd_logp,"AFS Server - Dispatch-2 %s vcp[%x] lana[%d] lsn[%d]",myCrt_2Dispatch(asp->opcode),vcp,vcp->lana,vcp->lsn); + osi_Log4(smb_logp,"AFS Server - Dispatch-2 %s vcp[%x] lana[%d] lsn[%d]",myCrt_2Dispatch(asp->opcode),vcp,vcp->lana,vcp->lsn); code = (*smb_tran2DispatchTable[asp->opcode].procp)(vcp, asp, outp); } else { osi_LogEvent("AFS-Dispatch-2 [invalid]", NULL, "op[%x] vcp[%x] lana[%d] lsn[%d]", asp->opcode, vcp, vcp->lana, vcp->lsn); - osi_Log4(afsd_logp,"AFS Server - Dispatch-2 [INVALID] op[%x] vcp[%x] lana[%d] lsn[%d]", asp->opcode, vcp, vcp->lana, vcp->lsn); + osi_Log4(smb_logp,"AFS Server - Dispatch-2 [INVALID] op[%x] vcp[%x] lana[%d] lsn[%d]", asp->opcode, vcp, vcp->lana, vcp->lsn); code = CM_ERROR_BADOP; } @@ -734,7 +734,7 @@ long smb_ReceiveTran2Open(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t *op) userp = smb_GetTran2User(vcp, p); /* In the off chance that userp is NULL, we log and abandon */ if(!userp) { - osi_Log1(afsd_logp, "ReceiveTran2Open user [%d] not resolvable", p->uid); + osi_Log1(smb_logp, "ReceiveTran2Open user [%d] not resolvable", p->uid); smb_FreeTran2Packet(outp); return CM_ERROR_BADSMB; } @@ -940,7 +940,7 @@ long smb_ReceiveTran2QFSInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t * osi_hyper_t temp; static char FSname[6] = {'A', 0, 'F', 0, 'S', 0}; - osi_Log1(afsd_logp, "T2 QFSInfo type 0x%x", p->parmsp[0]); + osi_Log1(smb_logp, "T2 QFSInfo type 0x%x", p->parmsp[0]); switch (p->parmsp[0]) { case 1: responseSize = sizeof(qi.u.allocInfo); break; @@ -1129,13 +1129,13 @@ long smb_ReceiveTran2QPathInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t else if (infoLevel == 0x103) nbytesRequired = 4; else if (infoLevel == 0x108) nbytesRequired = 30; else { - osi_Log2(afsd_logp, "Bad Tran2 op 0x%x infolevel 0x%x", + osi_Log2(smb_logp, "Bad Tran2 op 0x%x infolevel 0x%x", p->opcode, infoLevel); smb_SendTran2Error(vcp, p, opx, CM_ERROR_INVAL); return 0; } - osi_Log2(afsd_logp, "T2 QPathInfo type 0x%x path %s", infoLevel, - osi_LogSaveString(afsd_logp, (char *)(&p->parmsp[3]))); + osi_Log2(smb_logp, "T2 QPathInfo type 0x%x path %s", infoLevel, + osi_LogSaveString(smb_logp, (char *)(&p->parmsp[3]))); outp = smb_GetTran2ResponsePacket(vcp, p, opx, 2, nbytesRequired); @@ -1157,7 +1157,7 @@ long smb_ReceiveTran2QPathInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t userp = smb_GetTran2User(vcp, p); if(!userp) { - osi_Log1(afsd_logp, "ReceiveTran2QPathInfo unable to resolve user [%d]", p->uid); + osi_Log1(smb_logp, "ReceiveTran2QPathInfo unable to resolve user [%d]", p->uid); smb_FreeTran2Packet(outp); return CM_ERROR_BADSMB; } @@ -1340,13 +1340,13 @@ long smb_ReceiveTran2QFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t else if (infoLevel == 0x103) nbytesRequired = 4; else if (infoLevel == 0x104) nbytesRequired = 6; else { - osi_Log2(afsd_logp, "Bad Tran2 op 0x%x infolevel 0x%x", + osi_Log2(smb_logp, "Bad Tran2 op 0x%x infolevel 0x%x", p->opcode, infoLevel); smb_SendTran2Error(vcp, p, opx, CM_ERROR_INVAL); smb_ReleaseFID(fidp); return 0; } - osi_Log2(afsd_logp, "T2 QFileInfo type 0x%x fid %d", infoLevel, fid); + osi_Log2(smb_logp, "T2 QFileInfo type 0x%x fid %d", infoLevel, fid); outp = smb_GetTran2ResponsePacket(vcp, p, opx, 2, nbytesRequired); @@ -1358,7 +1358,7 @@ long smb_ReceiveTran2QFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t userp = smb_GetTran2User(vcp, p); if(!userp) { - osi_Log1(afsd_logp, "ReceiveTran2QFileInfo unable to resolve user [%d]", p->uid); + osi_Log1(smb_logp, "ReceiveTran2QFileInfo unable to resolve user [%d]", p->uid); code = CM_ERROR_BADSMB; goto done; } @@ -1444,7 +1444,7 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet infoLevel = p->parmsp[1]; if (infoLevel > 0x104 || infoLevel < 0x101) { - osi_Log2(afsd_logp, "Bad Tran2 op 0x%x infolevel 0x%x", + osi_Log2(smb_logp, "Bad Tran2 op 0x%x infolevel 0x%x", p->opcode, infoLevel); smb_SendTran2Error(vcp, p, op, CM_ERROR_INVAL); smb_ReleaseFID(fidp); @@ -1463,7 +1463,7 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet return 0; } - osi_Log1(afsd_logp, "T2 SFileInfo type 0x%x", infoLevel); + osi_Log1(smb_logp, "T2 SFileInfo type 0x%x", infoLevel); outp = smb_GetTran2ResponsePacket(vcp, p, op, 2, 0); @@ -1472,7 +1472,7 @@ long smb_ReceiveTran2SetFileInfo(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet userp = smb_GetTran2User(vcp, p); if(!userp) { - osi_Log1(afsd_logp,"ReceiveTran2SetFileInfo unable to resolve user [%d]", p->uid); + osi_Log1(smb_logp,"ReceiveTran2SetFileInfo unable to resolve user [%d]", p->uid); code = CM_ERROR_BADSMB; goto done; } @@ -1629,7 +1629,7 @@ long smb_ApplyV3DirListPatches(cm_scache_t *dscp, * target of the symbolic link). Otherwise, * we'll just use the symlink anyway. */ - osi_Log2(afsd_logp, "symlink vp %x to vp %x", + osi_Log2(smb_logp, "symlink vp %x to vp %x", scp, targetScp); cm_ReleaseSCache(scp); scp = targetScp; @@ -1962,11 +1962,11 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t starPattern = 1; /* assume, since required a Find Next */ } - osi_Log4(afsd_logp, + osi_Log4(smb_logp, "T2 search dir attr 0x%x, info level %d, max count %d, flags 0x%x", attribute, infoLevel, maxCount, searchFlags); - osi_Log2(afsd_logp, "...T2 search op %d, nextCookie 0x%x", + osi_Log2(smb_logp, "...T2 search op %d, nextCookie 0x%x", p->opcode, nextCookie); if (infoLevel >= 0x101) @@ -1988,8 +1988,8 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t outp = smb_GetTran2ResponsePacket(vcp, p, opx, maxReturnParms, maxReturnData); - osi_Log1(afsd_logp, "T2 receive search dir %s", - osi_LogSaveString(afsd_logp, pathp)); + osi_Log1(smb_logp, "T2 receive search dir %s", + osi_LogSaveString(smb_logp, pathp)); /* bail out if request looks bad */ if (p->opcode == 1 && !pathp) { @@ -1998,12 +1998,12 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t return CM_ERROR_BADSMB; } - osi_Log2(afsd_logp, "T2 dir search cookie 0x%x, connection %d", + osi_Log2(smb_logp, "T2 dir search cookie 0x%x, connection %d", nextCookie, dsp->cookie); userp = smb_GetTran2User(vcp, p); if (!userp) { - osi_Log1(afsd_logp, "T2 dir search unable to resolve user [%d]", p->uid); + osi_Log1(smb_logp, "T2 dir search unable to resolve user [%d]", p->uid); smb_ReleaseDirSearch(dsp); smb_FreeTran2Packet(outp); return CM_ERROR_BADSMB; @@ -2257,7 +2257,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t fid.vnode = ntohl(dep->fid.vnode); fid.unique = ntohl(dep->fid.unique); fileType = cm_FindFileType(&fid); - /*osi_Log2(afsd_logp, "smb_ReceiveTran2SearchDir: file %s " + /*osi_Log2(smb_logp, "smb_ReceiveTran2SearchDir: file %s " "has filetype %d", dep->name, fileType);*/ if (fileType == CM_SCACHETYPE_DIRECTORY) @@ -2432,7 +2432,7 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t /* return # of bytes in the buffer */ outp->totalData = bytesInBuffer; - osi_Log2(afsd_logp, "T2 search dir done, %d names, code %d", + osi_Log2(smb_logp, "T2 search dir done, %d names, code %d", returnedNames, code); /* Return error code if unsuccessful on first request */ @@ -2466,7 +2466,7 @@ long smb_ReceiveV3FindClose(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp dirHandle = smb_GetSMBParm(inp, 0); - osi_Log1(afsd_logp, "SMB3 find close handle %d", dirHandle); + osi_Log1(smb_logp, "SMB3 find close handle %d", dirHandle); dsp = smb_FindDirSearch(dirHandle); @@ -2541,7 +2541,7 @@ long smb_ReceiveV3OpenX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) * (since IOCTL calls themselves aren't getting through). */ #ifdef NOTSERVICE - osi_Log0(afsd_logp, "IOCTL Open"); + osi_Log0(smb_logp, "IOCTL Open"); #endif fidp = smb_FindFID(vcp, 0, SMB_FLAG_CREATE); @@ -2656,8 +2656,8 @@ long smb_ReceiveV3OpenX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) } else { osi_assert(dscp != NULL); - osi_Log1(afsd_logp, "smb_ReceiveV3OpenX creating file %s", - osi_LogSaveString(afsd_logp, lastNamep)); + osi_Log1(smb_logp, "smb_ReceiveV3OpenX creating file %s", + osi_LogSaveString(smb_logp, lastNamep)); openAction = 2; /* created file */ setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; smb_UnixTimeFromDosUTime(&setAttr.clientModTime, dosTime); @@ -2747,7 +2747,7 @@ long smb_ReceiveV3OpenX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) lock_ReleaseMutex(&scp->mx); smb_SetSMBDataLength(outp, 0); - osi_Log1(afsd_logp, "SMB OpenX opening fid %d", fidp->fid); + osi_Log1(smb_logp, "SMB OpenX opening fid %d", fidp->fid); cm_ReleaseUser(userp); /* leave scp held since we put it in fidp->scp */ @@ -2986,9 +2986,9 @@ long smb_ReceiveV3SetAttributes(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t * attrs.clientModTime = unixTime; code = cm_SetAttr(scp, &attrs, userp, &req); - osi_Log1(afsd_logp, "SMB receive V3SetAttributes [fid=%ld]", fid); + osi_Log1(smb_logp, "SMB receive V3SetAttributes [fid=%ld]", fid); } else { - osi_Log1(afsd_logp, "**smb_UnixTimeFromSearchTime failed searchTime=%ld", searchTime); + osi_Log1(smb_logp, "**smb_UnixTimeFromSearchTime failed searchTime=%ld", searchTime); } } else code = 0; @@ -3014,7 +3014,7 @@ long smb_ReceiveV3ReadX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) offset.HighPart = 0; /* too bad */ offset.LowPart = smb_GetSMBParm(inp, 3) | (smb_GetSMBParm(inp, 4) << 16); - osi_Log3(afsd_logp, "smb_ReceiveV3Read fd %d, off 0x%x, size 0x%x", + osi_Log3(smb_logp, "smb_ReceiveV3Read fd %d, off 0x%x, size 0x%x", fd, offset.LowPart, count); fd = smb_ChainFID(fd, inp); @@ -3174,8 +3174,8 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) spacep = inp->spacep; smb_StripLastComponent(spacep->data, &lastNamep, realPathp); - osi_Log1(afsd_logp,"NTCreateX for [%s]",osi_LogSaveString(afsd_logp,realPathp)); - osi_Log4(afsd_logp,"NTCreateX da=[%x] ea=[%x] cd=[%x] co=[%x]", desiredAccess, extAttributes, createDisp, createOptions); + osi_Log1(smb_logp,"NTCreateX for [%s]",osi_LogSaveString(smb_logp,realPathp)); + osi_Log4(smb_logp,"NTCreateX da=[%x] ea=[%x] cd=[%x] co=[%x]", desiredAccess, extAttributes, createDisp, createOptions); if (lastNamep && strcmp(lastNamep, SMB_IOCTL_FILENAME) == 0) { /* special case magic file name for receiving IOCTL requests @@ -3224,7 +3224,7 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) #endif userp = smb_GetUser(vcp, inp); if (!userp) { - osi_Log1(afsd_logp, "NTCreateX Invalid user [%d]", ((smb_t *) inp)->uid); + osi_Log1(smb_logp, "NTCreateX Invalid user [%d]", ((smb_t *) inp)->uid); free(realPathp); return CM_ERROR_INVAL; } @@ -3236,7 +3236,7 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) else { baseFidp = smb_FindFID(vcp, baseFid, 0); if (!baseFidp) { - osi_Log1(afsd_logp, "NTCreateX Invalid base fid [%d]", baseFid); + osi_Log1(smb_logp, "NTCreateX Invalid base fid [%d]", baseFid); free(realPathp); cm_ReleaseUser(userp); return CM_ERROR_INVAL; @@ -3245,7 +3245,7 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) tidPathp = NULL; } - osi_Log1(afsd_logp, "NTCreateX tidPathp=[%s]", (tidPathp==NULL)?"null": osi_LogSaveString(afsd_logp,tidPathp)); + osi_Log1(smb_logp, "NTCreateX tidPathp=[%s]", (tidPathp==NULL)?"null": osi_LogSaveString(smb_logp,tidPathp)); /* compute open mode */ fidflags = 0; @@ -3298,7 +3298,7 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) if (baseFid != 0) smb_ReleaseFID(baseFidp); if (code) { - osi_Log0(afsd_logp,"NTCreateX parent not found"); + osi_Log0(smb_logp,"NTCreateX parent not found"); cm_ReleaseUser(userp); free(realPathp); return code; @@ -3382,8 +3382,8 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) } else if (realDirFlag == 0 || realDirFlag == -1) { osi_assert(dscp != NULL); - osi_Log1(afsd_logp, "smb_ReceiveNTCreateX creating file %s", - osi_LogSaveString(afsd_logp, lastNamep)); + osi_Log1(smb_logp, "smb_ReceiveNTCreateX creating file %s", + osi_LogSaveString(smb_logp, lastNamep)); openAction = 2; /* created file */ setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; setAttr.clientModTime = time(NULL); @@ -3423,8 +3423,8 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) /* create directory */ if ( !treeCreate ) treeStartp = lastNamep; osi_assert(dscp != NULL); - osi_Log1(afsd_logp, "smb_ReceiveNTCreateX creating directory [%s]", - osi_LogSaveString(afsd_logp, treeStartp)); + osi_Log1(smb_logp, "smb_ReceiveNTCreateX creating directory [%s]", + osi_LogSaveString(smb_logp, treeStartp)); openAction = 2; /* created directory */ setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; @@ -3555,8 +3555,8 @@ long smb_ReceiveNTCreateX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) lock_ReleaseMutex(&scp->mx); smb_SetSMBDataLength(outp, 0); - osi_Log2(afsd_logp, "SMB NT CreateX opening fid %d path %s", fidp->fid, - osi_LogSaveString(afsd_logp, realPathp)); + osi_Log2(smb_logp, "SMB NT CreateX opening fid %d path %s", fidp->fid, + osi_LogSaveString(smb_logp, realPathp)); smb_ReleaseFID(fidp); @@ -3656,9 +3656,9 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out nameLength = lparmp[11]; #ifdef DEBUG_VERBOSE - osi_Log4(afsd_logp,"NTTransCreate with da[%x],ea[%x],sa[%x],cd[%x]",desiredAccess,extAttributes,shareAccess,createDisp); - osi_Log2(afsd_logp,"... co[%x],sdl[%x],as[%x]",createOptions,sdLen,allocSize); - osi_Log1(afsd_logp,"... flags[%x]",flags); + osi_Log4(smb_logp,"NTTransCreate with da[%x],ea[%x],sa[%x],cd[%x]",desiredAccess,extAttributes,shareAccess,createDisp); + osi_Log2(smb_logp,"... co[%x],sdl[%x],as[%x]",createOptions,sdLen,allocSize); + osi_Log1(smb_logp,"... flags[%x]",flags); #endif /* mustBeDir is never set; createOptions directory bit seems to be @@ -3704,7 +3704,7 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out userp = smb_GetUser(vcp, inp); if(!userp) { - osi_Log1(afsd_logp, "NTTranCreate invalid user [%d]", ((smb_t *) inp)->uid); + osi_Log1(smb_logp, "NTTranCreate invalid user [%d]", ((smb_t *) inp)->uid); free(realPathp); return CM_ERROR_INVAL; } @@ -3716,7 +3716,7 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out else { baseFidp = smb_FindFID(vcp, baseFid, 0); if(!baseFidp) { - osi_Log1(afsd_logp, "NTTranCreate Invalid fid [%d]", baseFid); + osi_Log1(smb_logp, "NTTranCreate Invalid fid [%d]", baseFid); free(realPathp); cm_ReleaseUser(userp); return CM_ERROR_INVAL; @@ -3828,8 +3828,8 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out } else if (realDirFlag == 0 || realDirFlag == -1) { osi_assert(dscp != NULL); - osi_Log1(afsd_logp, "smb_ReceiveNTTranCreate creating file %s", - osi_LogSaveString(afsd_logp, lastNamep)); + osi_Log1(smb_logp, "smb_ReceiveNTTranCreate creating file %s", + osi_LogSaveString(smb_logp, lastNamep)); openAction = 2; /* created file */ setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; setAttr.clientModTime = time(NULL); @@ -3862,9 +3862,9 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out else { /* create directory */ osi_assert(dscp != NULL); - osi_Log1(afsd_logp, + osi_Log1(smb_logp, "smb_ReceiveNTTranCreate creating directory %s", - osi_LogSaveString(afsd_logp, lastNamep)); + osi_LogSaveString(smb_logp, lastNamep)); openAction = 2; /* created directory */ setAttr.mask = CM_ATTRMASK_CLIENTMODTIME; setAttr.clientModTime = time(NULL); @@ -4036,7 +4036,7 @@ long smb_ReceiveNTTranCreate(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *out lock_ReleaseMutex(&scp->mx); } - osi_Log1(afsd_logp, "SMB NTTranCreate opening fid %d", fidp->fid); + osi_Log1(smb_logp, "SMB NTTranCreate opening fid %d", fidp->fid); smb_ReleaseFID(fidp); @@ -4062,7 +4062,7 @@ long smb_ReceiveNTTranNotifyChange(smb_vc_t *vcp, smb_packet_t *inp, fidp = smb_FindFID(vcp, fid, 0); if (!fidp) { - osi_Log1(afsd_logp, "ERROR: NotifyChange given invalid fid [%d]", fid); + osi_Log1(smb_logp, "ERROR: NotifyChange given invalid fid [%d]", fid); return CM_ERROR_BADFD; } @@ -4073,8 +4073,8 @@ long smb_ReceiveNTTranNotifyChange(smb_vc_t *vcp, smb_packet_t *inp, smb_Directory_Watches = savedPacketp; lock_ReleaseMutex(&smb_Dir_Watch_Lock); - osi_Log4(afsd_logp, "Request for NotifyChange filter 0x%x fid %d wtree %d file %s", - filter, fid, watchtree, osi_LogSaveString(afsd_logp, fidp->NTopen_wholepathp)); + osi_Log4(smb_logp, "Request for NotifyChange filter 0x%x fid %d wtree %d file %s", + filter, fid, watchtree, osi_LogSaveString(smb_logp, fidp->NTopen_wholepathp)); scp = fidp->scp; lock_ObtainMutex(&scp->mx); @@ -4178,7 +4178,7 @@ long smb_ReceiveNTTransact(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) function = smb_GetSMBParm(inp, 18); - osi_Log1(afsd_logp, "SMB NT Transact function %d", function); + osi_Log1(smb_logp, "SMB NT Transact function %d", function); /* We can handle long names */ if (vcp->flags & SMB_VCFLAG_USENT) @@ -4259,9 +4259,9 @@ void smb_NotifyChange(DWORD action, DWORD notifyFilter, } smb_ReleaseFID(fidp); - osi_Log4(afsd_logp, + osi_Log4(smb_logp, "Sending Change Notification for fid %d filter 0x%x wtree %d file %s", - fid, filter, wtree, osi_LogSaveString(afsd_logp, filename)); + fid, filter, wtree, osi_LogSaveString(smb_logp, filename)); nextWatch = watch->nextp; if (watch == smb_Directory_Watches) @@ -4378,7 +4378,7 @@ long smb_ReceiveNTCancel(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) smb_fid_t *fidp; cm_scache_t *scp; - osi_Log0(afsd_logp, "SMB3 receive NT cancel"); + osi_Log0(smb_logp, "SMB3 receive NT cancel"); lock_ObtainMutex(&smb_Dir_Watch_Lock); watch = smb_Directory_Watches; @@ -4399,9 +4399,9 @@ long smb_ReceiveNTCancel(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) fidp = smb_FindFID(vcp, fid, 0); if (fidp) { - osi_Log3(afsd_logp, "Cancelling change notification for fid %d wtree %d file %s", + osi_Log3(smb_logp, "Cancelling change notification for fid %d wtree %d file %s", fid, watchtree, - osi_LogSaveString(afsd_logp, (fidp)?fidp->NTopen_wholepathp:"")); + osi_LogSaveString(smb_logp, (fidp)?fidp->NTopen_wholepathp:"")); scp = fidp->scp; lock_ObtainMutex(&scp->mx); @@ -4412,7 +4412,7 @@ long smb_ReceiveNTCancel(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp) lock_ReleaseMutex(&scp->mx); smb_ReleaseFID(fidp); } else { - osi_Log2(afsd_logp,"NTCancel unable to resolve fid [%d] in vcp[%x]", fid,vcp); + osi_Log2(smb_logp,"NTCancel unable to resolve fid [%d] in vcp[%x]", fid,vcp); } /* assume STATUS32; return 0xC0000120 (CANCELED) */ -- 2.39.5