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

Windows: cm_UpdateIFInfo consolidate syscfg_GetIFInfo calls

Browse Source 
Add a new function cm_UpdateIFInfo() that consolidates all of the
syscfg_GetIFInfo() call functionality into a single rountine.  Replace
all of the existing call sites.

It is safe to call cm_UpdateIFInfo() without holding cm_syscfgLock
during afsd initialization because no other threads have been created.

Change-Id: Ifd4ca4f4f698014852a26d2c95a523c3b2cc851f
Reviewed-on: http://gerrit.openafs.org/11443
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
This commit is contained in:
Jeffrey Altman 2014-09-04 09:04:42 -04:00
parent 092684e2bd
commit 95c3db9c7c
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/WINNT/afsd/afsd_init.c
View File

@ -533,11 +533,6 @@ afsd_InitCM(char **reasonP)
/*int freelanceEnabled;*/
WSADATA WSAjunk;
int i;
int cm_noIPAddr; /* number of client network interfaces */
int cm_IPAddr[CM_MAXINTERFACE_ADDR]; /* client's IP address in host order */
int cm_SubnetMask[CM_MAXINTERFACE_ADDR];/* client's subnet mask in host order*/
int cm_NetMtu[CM_MAXINTERFACE_ADDR]; /* client's MTU sizes */
int cm_NetFlags[CM_MAXINTERFACE_ADDR]; /* network flags */
DWORD dwPriority;
OSVERSIONINFO osVersion;
@ -1444,11 +1439,7 @@ afsd_InitCM(char **reasonP)
cacheBlocks = ((afs_uint64)cacheSize * 1024) / blockSize;
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
code = syscfg_GetIFInfo(&cm_noIPAddr,
cm_IPAddr, cm_SubnetMask,
cm_NetMtu, cm_NetFlags);
code = cm_UpdateIFInfo();
if ( (cm_noIPAddr <= 0) || (code <= 0 ) )
afsi_log("syscfg_GetIFInfo error code %d", code);
else

18
src/WINNT/afsd/cm_callback.c
View File

@ -948,14 +948,9 @@ SRXAFSCB_WhoAreYou(struct rx_call *callp, struct interfaceAddr* addr)
lock_ObtainRead(&cm_syscfgLock);
if (cm_LanAdapterChangeDetected) {
lock_ConvertRToW(&cm_syscfgLock);
if (cm_LanAdapterChangeDetected) {
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
code = syscfg_GetIFInfo(&cm_noIPAddr,
cm_IPAddr, cm_SubnetMask,
cm_NetMtu, cm_NetFlags);
cm_LanAdapterChangeDetected = 0;
}
if (cm_LanAdapterChangeDetected) {
code = cm_UpdateIFInfo();
}
lock_ConvertWToR(&cm_syscfgLock);
}
@ -1255,12 +1250,7 @@ SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
if (cm_LanAdapterChangeDetected) {
lock_ConvertRToW(&cm_syscfgLock);
if (cm_LanAdapterChangeDetected) {
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
code = syscfg_GetIFInfo(&cm_noIPAddr,
cm_IPAddr, cm_SubnetMask,
cm_NetMtu, cm_NetFlags);
cm_LanAdapterChangeDetected = 0;
code = cm_UpdateIFInfo();
}
lock_ConvertWToR(&cm_syscfgLock);
}

23
src/WINNT/afsd/cm_server.c
View File

@ -874,25 +874,32 @@ void cm_SetServerNoInlineBulk(cm_server_t * serverp, int no)
lock_ReleaseMutex(&serverp->mx);
}
afs_int32 cm_UpdateIFInfo(void)
{
afs_int32 code;
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
code = syscfg_GetIFInfo(&cm_noIPAddr,
cm_IPAddr, cm_SubnetMask,
cm_NetMtu, cm_NetFlags);
cm_LanAdapterChangeDetected = 0;
return code;
}
void cm_SetServerIPRank(cm_server_t * serverp)
{
unsigned long serverAddr; /* in host byte order */
unsigned long myAddr, myNet, mySubnet;/* in host byte order */
unsigned long netMask;
int i;
long code;
afs_int32 code;
lock_ObtainRead(&cm_syscfgLock);
if (cm_LanAdapterChangeDetected) {
lock_ConvertRToW(&cm_syscfgLock);
if (cm_LanAdapterChangeDetected) {
/* get network related info */
cm_noIPAddr = CM_MAXINTERFACE_ADDR;
code = syscfg_GetIFInfo(&cm_noIPAddr,
cm_IPAddr, cm_SubnetMask,
cm_NetMtu, cm_NetFlags);
cm_LanAdapterChangeDetected = 0;
}
code = cm_UpdateIFInfo();
}
lock_ConvertWToR(&cm_syscfgLock);
}

2
src/WINNT/afsd/cm_server.h
View File

@ -123,6 +123,8 @@ extern void cm_RankUpServers();
extern void cm_SetServerIPRank(cm_server_t * serverp);
extern afs_int32 cm_UpdateIFInfo(void);
extern void cm_InsertServerList(cm_serverRef_t** list,cm_serverRef_t* element);
extern long cm_ChangeRankServer(cm_serverRef_t** list, cm_server_t* server);