*
* 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);
+
+ tsp->ipRank = ipRank;
/* Insert the vlserver into a sorted list, sorted by server rank */
tsrp = cm_NewServerRef(tsp, 0);
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);
cp->timeout = time(0) + 7200;
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;
afs_uint32 hash;
cm_cell_rock_t rock;
+ size_t len;
+
+ if (namep == NULL || !namep[0] || !strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH))
+ return NULL;
- if (!strcmp(namep,SMB_IOCTL_FILENAME_NOSLASH))
+ /*
+ * Strip off any trailing dots at the end of the cell name.
+ * Failure to do so results in an undesireable alias as the
+ * result of DNS AFSDB record lookups where a trailing dot
+ * has special meaning.
+ */
+ strncpy(name, namep, CELL_MAXNAMELEN);
+ for (len = strlen(namep); len > 0 && namep[len-1] == '.'; len--) {
+ name[len-1] = '\0';
+ }
+ if (len == 0)
return NULL;
+ namep = name;
hash = CM_CELL_NAME_HASH(namep);
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) {
strncpy(cp->name, fullname, CELL_MAXNAMELEN);
cp->name[CELL_MAXNAMELEN-1] = '\0';
+ strncpy(cp->linkedName, linkedName, CELL_MAXNAMELEN);
+ cp->linkedName[CELL_MAXNAMELEN-1] = '\0';
+
cm_AddCellToNameHashTable(cp);
cm_AddCellToIDHashTable(cp);
lock_ReleaseMutex(&cp->mx);
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;
}
}
}
+ for (cellp = cm_data.freeCellsp; cellp; cellp=cellp->freeNextp, count++) {
+ if ( count != 0 && cellp == cm_data.freeCellsp ||
+ count > 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 ) {
afsi_log("cm_ValidateCell failure: count != cm_data.currentCells");
fprintf(stderr, "cm_ValidateCell failure: count != cm_data.currentCells\n");
- return -3;
+ return -4;
}
return 0;