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

STABLE14-windows-shell-ext-server-status-20051002

Browse Source 
Fix the server status dialog to properly call CheckServers and
fix CheckServers to properly construct the data structure for the
pioctl call.


(cherry picked from commit c0013b2513b206edded080f0a4cea6e7e96ab281)
This commit is contained in:
Jeffrey Altman 2005-10-02 10:08:18 +00:00
parent df35acd30e
commit 1167dafbd3
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/WINNT/client_exp/gui2fs.cpp
View File

@ -1546,7 +1546,6 @@ BOOL RemoveMount(CStringArray& files)
register LONG code = 0; register LONG code = 0;
struct ViceIoctl blob; struct ViceIoctl blob;
char tbuffer[1024]; char tbuffer[1024];
char lsbuffer[1024];
register char *tp; register char *tp;
char szCurItem[1024]; char szCurItem[1024];
BOOL error = FALSE; BOOL error = FALSE;
@ -1739,30 +1738,24 @@ BOOL CheckServers(const CString& strCellName, WHICH_CELLS nCellsToCheck, BOOL bF
blob.out_size = MAXSIZE; blob.out_size = MAXSIZE;
blob.out = space; blob.out = space;
memset(space, 0, sizeof(LONG)); /* so we assure zero when nothing is copied back */ memset(space, 0, sizeof(afs_int32)); /* so we assure zero when nothing is copied back */
/* prepare flags for checkservers command */
if (nCellsToCheck == LOCAL_CELL)
temp = 2; /* default to checking local cell only */
else if (nCellsToCheck == ALL_CELLS)
temp &= ~2; /* turn off local cell check */
if (nCellsToCheck == SPECIFIC_CELL) {
temp = 2;
GetCellName(PCCHAR(strCellName), &info);
strcpy(checkserv.tbuffer,info.name);
checkserv.tsize = strlen(info.name) + 1;
} else {
if (nCellsToCheck != ALL_CELLS)
temp = 2;
strcpy(checkserv.tbuffer, "\0");
checkserv.tsize = 0;
}
if (bFast) if (bFast)
temp |= 1; /* set fast flag */ temp |= 1; /* set fast flag */
checkserv.magic = 0x12345678; /* XXX */ checkserv.magic = 0x12345678; /* XXX */
checkserv.tflags = temp; checkserv.tflags = temp;
/* now copy in optional cell name, if specified */
if (nCellsToCheck == SPECIFIC_CELL) {
GetCellName(PCCHAR(strCellName), &info);
strcpy(checkserv.tbuffer,info.name);
checkserv.tsize = strlen(info.name) + 1;
} else {
strcpy(checkserv.tbuffer, "\0");
checkserv.tsize = 0;
}
checkserv.tinterval = -1; /* don't change current interval */ checkserv.tinterval = -1; /* don't change current interval */
code = pioctl(0, VIOCCKSERV, &blob, 1); code = pioctl(0, VIOCCKSERV, &blob, 1);

8
src/WINNT/client_exp/server_status_dlg.cpp
View File

@ -34,7 +34,7 @@ CServerStatusDlg::CServerStatusDlg() : CDialog()
//{{AFX_DATA_INIT(CServerStatusDlg) //{{AFX_DATA_INIT(CServerStatusDlg)
m_bFast = FALSE; m_bFast = FALSE;
m_nCell = -1; m_nCell = LOCAL_CELL;
//}}AFX_DATA_INIT //}}AFX_DATA_INIT
} }
@ -76,7 +76,7 @@ BOOL CServerStatusDlg::OnInitDialog()
CDialog::OnInitDialog(); CDialog::OnInitDialog();
m_CellName.EnableWindow(FALSE); m_CellName.EnableWindow(FALSE);
m_nCell = 0; m_nCell = LOCAL_CELL;
UpdateData(FALSE); UpdateData(FALSE);
@ -93,19 +93,21 @@ void CServerStatusDlg::OnShowStatus()
void CServerStatusDlg::OnSpecifiedCell() void CServerStatusDlg::OnSpecifiedCell()
{ {
m_nCell = SPECIFIC_CELL;
m_CellName.EnableWindow(TRUE); m_CellName.EnableWindow(TRUE);
CheckEnableShowStatus(); CheckEnableShowStatus();
} }
void CServerStatusDlg::OnLocalCell() void CServerStatusDlg::OnLocalCell()
{ {
m_nCell = LOCAL_CELL;
m_CellName.EnableWindow(FALSE); m_CellName.EnableWindow(FALSE);
m_ShowStatus.EnableWindow(TRUE); m_ShowStatus.EnableWindow(TRUE);
} }
void CServerStatusDlg::OnAllCells() void CServerStatusDlg::OnAllCells()
{ {
m_nCell = ALL_CELLS;
m_CellName.EnableWindow(FALSE); m_CellName.EnableWindow(FALSE);
m_ShowStatus.EnableWindow(TRUE); m_ShowStatus.EnableWindow(TRUE);
} }