#include <malloc.h>
#include <osi.h>
#include <string.h>
+#define STRSAFE_NO_DEPRECATE
+#include <strsafe.h>
#include "afsd.h"
*
* At the present time the return value is ignored by the caller.
*/
-long cm_AddCellProc(void *rockp, struct sockaddr_in *addrp, char *hostnamep)
+long cm_AddCellProc(void *rockp, struct sockaddr_in *addrp, char *hostnamep, unsigned short ipRank)
{
cm_server_t *tsp;
cm_serverRef_t *tsrp;
}
}
else
- tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp, probe ? 0 : CM_FLAG_NOPROBE);
+ tsp = cm_NewServer(addrp, CM_SERVER_VLDB, cellp, NULL, probe ? 0 : CM_FLAG_NOPROBE);
+
+ if (ipRank)
+ tsp->ipRank = ipRank;
/* Insert the vlserver into a sorted list, sorted by server rank */
tsrp = cm_NewServerRef(tsp, 0);
/* if it's from DNS, see if it has expired
* and check to make sure we have a valid set of volume servers
- * this function must be called with a Write Lock on cm_cellLock
+ * this function must not be called with a lock on cm_cellLock
*/
cm_cell_t *cm_UpdateCell(cm_cell_t * cp, afs_uint32 flags)
{
long code = 0;
cm_cell_rock_t rock;
+ afs_uint32 mxheld = 0;
if (cp == NULL)
return NULL;
lock_ObtainMutex(&cp->mx);
+ mxheld = 1;
if ((cp->vlServersp == NULL
#ifdef AFS_FREELANCE_CLIENT
&& !(cp->flags & CM_CELLFLAG_FREELANCE)
#endif
) || (time(0) > cp->timeout)
-#ifdef AFS_AFSDB_ENV
|| (cm_dnsEnabled && (cp->flags & CM_CELLFLAG_DNS) &&
((cp->flags & CM_CELLFLAG_VLSERVER_INVALID)))
-#endif
)
{
lock_ReleaseMutex(&cp->mx);
+ mxheld = 0;
/* must empty cp->vlServersp */
- if (cp->vlServersp) {
+ if (cp->vlServersp)
cm_FreeServerList(&cp->vlServersp, CM_FREESERVERLIST_DELETE);
- cp->vlServersp = NULL;
- }
rock.cellp = cp;
rock.flags = flags;
- code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, &rock);
+ code = cm_SearchCellRegistry(1, cp->name, NULL, cp->linkedName, cm_AddCellProc, &rock);
+ if (code && code != CM_ERROR_FORCE_DNS_LOOKUP)
+ code = cm_SearchCellFileEx(cp->name, NULL, cp->linkedName, cm_AddCellProc, &rock);
if (code == 0) {
lock_ObtainMutex(&cp->mx);
+ mxheld = 1;
cp->timeout = time(0) + 7200;
- lock_ReleaseMutex(&cp->mx);
}
-#ifdef AFS_AFSDB_ENV
else {
if (cm_dnsEnabled) {
int ttl;
code = cm_SearchCellByDNS(cp->name, NULL, &ttl, cm_AddCellProc, &rock);
if (code == 0) { /* got cell from DNS */
lock_ObtainMutex(&cp->mx);
+ mxheld = 1;
cp->flags |= CM_CELLFLAG_DNS;
cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID;
cp->timeout = time(0) + ttl;
- lock_ReleaseMutex(&cp->mx);
#ifdef DEBUG
fprintf(stderr, "cell %s: ttl=%d\n", cp->name, ttl);
#endif
* current entry alone
*/
lock_ObtainMutex(&cp->mx);
+ mxheld = 1;
cp->flags |= CM_CELLFLAG_VLSERVER_INVALID;
- lock_ReleaseMutex(&cp->mx);
}
}
}
-#endif /* AFS_AFSDB_ENV */
- } else {
- lock_ReleaseMutex(&cp->mx);
}
+
+ if (code == 0)
+ cm_RandomizeServer(&cp->vlServersp);
+
+ if (mxheld)
+ lock_ReleaseMutex(&cp->mx);
+
return code ? NULL : cp;
}
void cm_FreeCell(cm_cell_t *cellp)
{
+ lock_AssertWrite(&cm_cellLock);
+
if (cellp->vlServersp)
cm_FreeServerList(&cellp->vlServersp, CM_FREESERVERLIST_DELETE);
cellp->name[0] = '\0';
cm_cell_t *cp, *cp2;
long code;
char fullname[CELL_MAXNAMELEN]="";
+ char linkedName[CELL_MAXNAMELEN]="";
char name[CELL_MAXNAMELEN]="";
int hasWriteLock = 0;
int hasMutex = 0;
cm_cell_rock_t rock;
size_t len;
- if (namep == NULL || !namep[0] || !strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH))
+ if (namep == NULL || !namep[0] || !strcmp(namep,CM_IOCTL_FILENAME_NOSLASH))
return NULL;
/*
}
if (cp) {
+ lock_ReleaseWrite(&cm_cellLock);
lock_ObtainMutex(&cp->mx);
+ lock_ObtainWrite(&cm_cellLock);
cm_AddCellToNameHashTable(cp);
cm_AddCellToIDHashTable(cp);
lock_ReleaseMutex(&cp->mx);
rock.cellp = cp;
rock.flags = flags;
- code = cm_SearchCellFile(namep, fullname, cm_AddCellProc, &rock);
+ code = cm_SearchCellRegistry(1, namep, fullname, linkedName, cm_AddCellProc, &rock);
+ if (code && code != CM_ERROR_FORCE_DNS_LOOKUP)
+ code = cm_SearchCellFileEx(namep, fullname, linkedName, cm_AddCellProc, &rock);
if (code) {
- osi_Log3(afsd_logp,"in cm_GetCell_gen cm_SearchCellFile(%s) returns code= %d fullname= %s",
- osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname));
+ osi_Log4(afsd_logp,"in cm_GetCell_gen cm_SearchCellFileEx(%s) returns code= %d fullname= %s linkedName= %s",
+ osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname),
+ osi_LogSaveString(afsd_logp,linkedName));
-#ifdef AFS_AFSDB_ENV
if (cm_dnsEnabled) {
int ttl;
if ( code ) {
osi_Log3(afsd_logp,"in cm_GetCell_gen cm_SearchCellByDNS(%s) returns code= %d fullname= %s",
osi_LogSaveString(afsd_logp,namep), code, osi_LogSaveString(afsd_logp,fullname));
+ lock_ObtainMutex(&cp->mx);
+ lock_ObtainWrite(&cm_cellLock);
+ hasWriteLock = 1;
+ cm_RemoveCellFromIDHashTable(cp);
+ cm_RemoveCellFromNameHashTable(cp);
+ lock_ReleaseMutex(&cp->mx);
cm_FreeCell(cp);
cp = NULL;
goto done;
}
}
else
-#endif
{
+ lock_ObtainMutex(&cp->mx);
+ lock_ObtainWrite(&cm_cellLock);
+ hasWriteLock = 1;
+ cm_RemoveCellFromIDHashTable(cp);
+ cm_RemoveCellFromNameHashTable(cp);
+ lock_ReleaseMutex(&cp->mx);
cm_FreeCell(cp);
cp = NULL;
goto done;
* we should use it instead of completing the allocation
* of a new cm_cell_t
*/
+ lock_ObtainRead(&cm_cellLock);
hash = CM_CELL_NAME_HASH(fullname);
for (cp2 = cm_data.cellNameHashTablep[hash]; cp2; cp2=cp2->nameNextp) {
if (cm_stricmp_utf8(fullname, cp2->name) == 0) {
}
if (cp2) {
- if (hasMutex) {
- lock_ReleaseMutex(&cp->mx);
- hasMutex = 0;
+ if (!hasMutex) {
+ lock_ObtainMutex(&cp->mx);
+ hasMutex = 1;
}
+ lock_ConvertRToW(&cm_cellLock);
+ hasWriteLock = 1;
+ cm_RemoveCellFromIDHashTable(cp);
+ cm_RemoveCellFromNameHashTable(cp);
+ lock_ReleaseMutex(&cp->mx);
+ hasMutex = 0;
cm_FreeCell(cp);
cp = cp2;
goto done;
}
+ lock_ReleaseRead(&cm_cellLock);
/* randomise among those vlservers having the same rank*/
cm_RandomizeServer(&cp->vlServersp);
if (!hasMutex)
lock_ObtainMutex(&cp->mx);
+
/* copy in name */
strncpy(cp->name, fullname, CELL_MAXNAMELEN);
cp->name[CELL_MAXNAMELEN-1] = '\0';
+ strncpy(cp->linkedName, linkedName, CELL_MAXNAMELEN);
+ cp->linkedName[CELL_MAXNAMELEN-1] = '\0';
+
+ lock_ObtainWrite(&cm_cellLock);
+ hasWriteLock = 1;
cm_AddCellToNameHashTable(cp);
- cm_AddCellToIDHashTable(cp);
+ cm_AddCellToIDHashTable(cp);
lock_ReleaseMutex(&cp->mx);
hasMutex = 0;
newnamep[0] = '\0';
}
}
+
+ if (cp && cp->linkedName[0]) {
+ cm_cell_t * linkedCellp = NULL;
+
+ if (!strcmp(cp->name, cp->linkedName)) {
+ cp->linkedName[0] = '\0';
+ } else if (!(flags & CM_FLAG_NOMOUNTCHASE)) {
+ linkedCellp = cm_GetCell(cp->linkedName, CM_FLAG_CREATE|CM_FLAG_NOPROBE|CM_FLAG_NOMOUNTCHASE);
+
+ lock_ObtainWrite(&cm_cellLock);
+ if (!linkedCellp ||
+ (linkedCellp->linkedName[0] && strcmp(cp->name, linkedCellp->linkedName))) {
+ cp->linkedName[0] = '\0';
+ } else {
+ strncpy(linkedCellp->linkedName, cp->name, CELL_MAXNAMELEN);
+ linkedCellp->linkedName[CELL_MAXNAMELEN-1]='\0';
+ }
+ lock_ReleaseWrite(&cm_cellLock);
+ }
+ }
return cp;
}
cm_ValidateCell(void)
{
cm_cell_t * cellp;
- afs_uint32 count;
+ afs_uint32 count1, count2;
- for (cellp = cm_data.allCellsp, count = 0; cellp; cellp=cellp->allNextp, count++) {
+ for (cellp = cm_data.allCellsp, count1 = 0; cellp; cellp=cellp->allNextp, count1++) {
if ( cellp->magic != CM_CELL_MAGIC ) {
afsi_log("cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC");
fprintf(stderr, "cm_ValidateCell failure: cellp->magic != CM_CELL_MAGIC\n");
return -1;
}
- if ( count != 0 && cellp == cm_data.allCellsp ||
- count > cm_data.maxCells ) {
+ if ( count1 != 0 && cellp == cm_data.allCellsp ||
+ count1 > cm_data.maxCells ) {
afsi_log("cm_ValidateCell failure: cm_data.allCellsp infinite loop");
fprintf(stderr, "cm_ValidateCell failure: cm_data.allCellsp infinite loop\n");
return -2;
}
}
- for (cellp = cm_data.freeCellsp; cellp; cellp=cellp->freeNextp, count++) {
- if ( count != 0 && cellp == cm_data.freeCellsp ||
- count > cm_data.maxCells ) {
+ for (cellp = cm_data.freeCellsp, count2 = 0; cellp; cellp=cellp->freeNextp, count2++) {
+ if ( count2 != 0 && cellp == cm_data.freeCellsp ||
+ count2 > cm_data.maxCells ) {
afsi_log("cm_ValidateCell failure: cm_data.freeCellsp infinite loop");
fprintf(stderr, "cm_ValidateCell failure: cm_data.freeCellsp infinite loop\n");
return -3;
}
}
- if ( count != cm_data.currentCells ) {
+ if ( (count1 + count2) != cm_data.currentCells ) {
afsi_log("cm_ValidateCell failure: count != cm_data.currentCells");
fprintf(stderr, "cm_ValidateCell failure: count != cm_data.currentCells\n");
return -4;
lock_InitializeMutex(&cellp->mx, "cm_cell_t mutex", LOCK_HIERARCHY_CELL);
+ lock_ObtainMutex(&cellp->mx);
+ lock_ObtainWrite(&cm_cellLock);
+
/* copy in name */
strncpy(cellp->name, "Freelance.Local.Cell", CELL_MAXNAMELEN); /*safe*/
cellp->name[CELL_MAXNAMELEN-1] = '\0';
cellp->vlServersp = NULL;
cellp->flags = CM_CELLFLAG_FREELANCE;
- lock_ObtainMutex(&cellp->mx);
cm_AddCellToNameHashTable(cellp);
- cm_AddCellToIDHashTable(cellp);
+ cm_AddCellToIDHashTable(cellp);
+ lock_ReleaseWrite(&cm_cellLock);
lock_ReleaseMutex(&cellp->mx);
#endif
} else {
+ lock_ObtainRead(&cm_cellLock);
for (cellp = cm_data.allCellsp; cellp; cellp=cellp->allNextp) {
lock_InitializeMutex(&cellp->mx, "cm_cell_t mutex", LOCK_HIERARCHY_CELL);
cellp->vlServersp = NULL;
cellp->flags |= CM_CELLFLAG_VLSERVER_INVALID;
}
+ lock_ReleaseRead(&cm_cellLock);
}
osi_EndOnce(&once);
{
int i;
+ lock_AssertWrite(&cm_cellLock);
+ lock_AssertMutex(&cellp->mx);
+
if (cellp->flags & CM_CELLFLAG_IN_NAMEHASH)
return;
cm_cell_t *tcellp;
int i;
+ lock_AssertWrite(&cm_cellLock);
+ lock_AssertMutex(&cellp->mx);
+
if (cellp->flags & CM_CELLFLAG_IN_NAMEHASH) {
/* hash it out first */
i = CM_CELL_NAME_HASH(cellp->name);
{
int i;
+ lock_AssertWrite(&cm_cellLock);
+ lock_AssertMutex(&cellp->mx);
+
if (cellp->flags & CM_CELLFLAG_IN_IDHASH)
return;
cm_cell_t *tcellp;
int i;
+ lock_AssertWrite(&cm_cellLock);
+ lock_AssertMutex(&cellp->mx);
+
if (cellp->flags & CM_CELLFLAG_IN_IDHASH) {
/* hash it out first */
i = CM_CELL_ID_HASH(cellp->cellID);
}
}
+long
+cm_CreateCellWithInfo( char * cellname,
+ char * linked_cellname,
+ unsigned short vlport,
+ afs_uint32 host_count,
+ char *hostname[],
+ afs_uint32 flags)
+{
+ afs_uint32 code = 0;
+ cm_cell_rock_t rock;
+ struct hostent *thp;
+ struct sockaddr_in vlSockAddr;
+ afs_uint32 i, j;
+
+ rock.cellp = cm_GetCell(cellname, CM_FLAG_CREATE | CM_FLAG_NOPROBE);
+ rock.flags = 0;
+
+ cm_FreeServerList(&rock.cellp->vlServersp, CM_FREESERVERLIST_DELETE);
+
+ if (!(flags & CM_CELLFLAG_DNS)) {
+ for (i = 0; i < host_count; i++) {
+ thp = gethostbyname(hostname[i]);
+ if (thp) {
+ int foundAddr = 0;
+ for (j=0 ; thp->h_addr_list[j]; j++) {
+ if (thp->h_addrtype != AF_INET)
+ continue;
+ memcpy(&vlSockAddr.sin_addr.s_addr,
+ thp->h_addr_list[j],
+ sizeof(long));
+ vlSockAddr.sin_port = htons(vlport ? vlport : 7003);
+ vlSockAddr.sin_family = AF_INET;
+ cm_AddCellProc(&rock, &vlSockAddr, hostname[i], CM_FLAG_NOPROBE);
+ }
+ }
+ }
+ lock_ObtainMutex(&rock.cellp->mx);
+ rock.cellp->flags &= ~CM_CELLFLAG_DNS;
+ } else if (cm_dnsEnabled) {
+ int ttl;
+
+ code = cm_SearchCellByDNS(rock.cellp->name, NULL, &ttl, cm_AddCellProc, &rock);
+ lock_ObtainMutex(&rock.cellp->mx);
+ if (code == 0) { /* got cell from DNS */
+ rock.cellp->flags |= CM_CELLFLAG_DNS;
+ rock.cellp->timeout = time(0) + ttl;
+#ifdef DEBUG
+ fprintf(stderr, "cell %s: ttl=%d\n", rock.cellp->name, ttl);
+#endif
+ }
+ } else {
+ lock_ObtainMutex(&rock.cellp->mx);
+ rock.cellp->flags &= ~CM_CELLFLAG_DNS;
+ }
+ rock.cellp->flags |= CM_CELLFLAG_VLSERVER_INVALID;
+ StringCbCopy(rock.cellp->linkedName, CELL_MAXNAMELEN, linked_cellname);
+ lock_ReleaseMutex(&rock.cellp->mx);
+
+ if (rock.cellp->vlServersp)
+ cm_RandomizeServer(&rock.cellp->vlServersp);
+
+ return code;
+}