/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
* ALL RIGHTS RESERVED
*/
+#include <afsconfig.h>
#include <afs/param.h>
-#ifdef UKERNEL
-#include "../afs/sysincludes.h"
-#include "../afs/afsutil.h"
-#else /* UKERNEL */
-#include <stdio.h>
-#include <sys/types.h>
+
+#include <roken.h>
+
#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <stdlib.h>
#include <direct.h>
#else
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include <ctype.h>
#endif
-#include <errno.h>
-#include "afsutil.h"
-#endif /* UKERNEL */
+#include "afsutil.h"
/* also parse a.b.c.d addresses */
-struct hostent *hostutil_GetHostByName(ahost)
-register char *ahost; {
- register int tc;
+struct hostent *
+hostutil_GetHostByName(char *ahost)
+{
+ int tc;
static struct hostent thostent;
static char *addrp[2];
static char addr[4];
- register char *ptr = ahost;
- afs_uint32 tval, numeric=0;
- int dots=0;
+ char *ptr = ahost;
+ afs_uint32 tval, numeric = 0;
+ int dots = 0;
- tc = *ahost; /* look at the first char */
+ tc = *ahost; /* look at the first char */
if (tc >= '0' && tc <= '9') {
numeric = 1;
- while (tc = *ptr++) {
+ while ((tc = *ptr++)) {
if (tc == '.') {
if (dots >= 3) {
numeric = 0;
} else if (tc > '9' || tc < '0') {
numeric = 0;
break;
- }
+ }
}
}
if (numeric) {
- tc = *ahost; /* look at the first char */
/* decimal address, return fake hostent with only hostaddr field good */
tval = 0;
dots = 0;
- bzero(addr, sizeof(addr));
- while (tc = *ahost++) {
+ memset(addr, 0, sizeof(addr));
+ while ((tc = *ahost++)) {
if (tc == '.') {
- if (dots >= 3) return (struct hostent *) 0; /* too many dots */
+ if (dots >= 3)
+ return NULL; /* too many dots */
addr[dots++] = tval;
tval = 0;
- }
- else if (tc > '9' || tc < '0') return (struct hostent *) 0;
+ } else if (tc > '9' || tc < '0')
+ return NULL;
else {
tval *= 10;
tval += tc - '0';
#ifdef h_addr
/* 4.3 system */
addrp[0] = addr;
- addrp[1] = (char *) 0;
+ addrp[1] = NULL;
thostent.h_addr_list = &addrp[0];
#else /* h_addr */
/* 4.2 and older systems */
thostent.h_addr = addr;
#endif /* h_addr */
return &thostent;
- }
- else {
+ } else {
#ifdef AFS_NT40_ENV
- if (afs_winsockInit()<0)
- return (struct hostent *)0;
+ if (afs_winsockInit() < 0)
+ return NULL;
#endif
return gethostbyname(ahost);
}
/* Translate an internet address into a nice printable string. The
* variable addr is in network byte order.
*/
-char *hostutil_GetNameByINet(addr)
- afs_uint32 addr;
+char *
+hostutil_GetNameByINet(afs_uint32 addr)
{
- struct hostent *th;
- static char tbuffer[256];
+ struct hostent *th;
+ static char tbuffer[256];
#ifdef AFS_NT40_ENV
- if (afs_winsockInit()<0)
- return (char *)0;
+ if (afs_winsockInit() < 0)
+ return NULL;
#endif
- th = gethostbyaddr((void *)&addr, sizeof(addr), AF_INET);
- if (th) {
- strcpy(tbuffer, th->h_name);
- } else {
- addr = ntohl(addr);
- sprintf(tbuffer, "%d.%d.%d.%d",
- ((addr>>24) & 0xff), ((addr>>16) & 0xff),
- ((addr>>8) & 0xff), ( addr & 0xff));
- }
-
+ th = gethostbyaddr((void *)&addr, sizeof(addr), AF_INET);
+ if (th && strlen(th->h_name) < sizeof(tbuffer)) {
+ strlcpy(tbuffer, th->h_name, sizeof(tbuffer));
+ } else {
+ addr = ntohl(addr);
+ sprintf(tbuffer, "%d.%d.%d.%d", (int)((addr >> 24) & 0xff),
+ (int)((addr >> 16) & 0xff), (int)((addr >> 8) & 0xff),
+ (int)(addr & 0xff));
+ }
+
return tbuffer;
}
-/* the parameter is a pointer to a buffer containing a string of
-** bytes of the form
+/* the parameter is a pointer to a buffer containing a string of
+** bytes of the form
** w.x.y.z # machineName
-** returns the network interface in network byte order
+** returns the network interface in network byte order
*/
+
+#define MAXBYTELEN 32
afs_uint32
-extractAddr(line, maxSize)
-char* line;
-int maxSize;
+extractAddr(char *line, int maxSize)
{
- char byte1[32], byte2[32], byte3[32], byte4[32];
- int i=0;
- char* endPtr;
- afs_uint32 val1, val2, val3, val4;
- afs_uint32 val=0;
-
- /* skip empty spaces */
- while ( isspace(*line) && maxSize )
- {
- line++;
- maxSize--;
- }
-
- /* skip empty lines */
- if ( !maxSize || !*line ) return AFS_IPINVALIDIGNORE;
-
- while ( ( *line != '.' ) && maxSize) /* extract first byte */
- {
- if ( !isdigit(*line) ) return AFS_IPINVALID;
- if ( i > 31 ) return AFS_IPINVALID; /* no space */
- byte1[i++] = *line++;
- maxSize--;
- }
- if ( !maxSize ) return AFS_IPINVALID;
- byte1[i] = 0;
-
- i=0, line++;
- while ( ( *line != '.' ) && maxSize) /* extract second byte */
- {
- if ( !isdigit(*line) ) return AFS_IPINVALID;
- if ( i > 31 ) return AFS_IPINVALID; /* no space */
- byte2[i++] = *line++;
- maxSize--;
- }
- if ( !maxSize ) return AFS_IPINVALID;
- byte2[i] = 0;
-
- i=0, line++;
- while ( ( *line != '.' ) && maxSize)
- {
- if ( !isdigit(*line) ) return AFS_IPINVALID;
- if ( i > 31 ) return AFS_IPINVALID; /* no space */
- byte3[i++] = *line++;
- maxSize--;
- }
- if ( !maxSize ) return AFS_IPINVALID;
- byte3[i] = 0;
-
- i=0, line++;
- while ( *line && !isspace(*line) && maxSize)
- {
- if ( !isdigit(*line) ) return AFS_IPINVALID;
- if ( i > 31 ) return AFS_IPINVALID; /* no space */
- byte4[i++] = *line++;
- maxSize--;
- }
- if ( !maxSize ) return AFS_IPINVALID;
- byte4[i] = 0;
-
- errno=0;
- val1 = strtol(byte1, &endPtr, 10);
- if (( val1== 0 ) && ( errno != 0 || byte1 == endPtr))
- return AFS_IPINVALID;
-
- errno=0;
- val2 = strtol(byte2, &endPtr, 10);
- if (( val2== 0 ) && ( errno !=0 || byte2 == endPtr))/* no conversion */
- return AFS_IPINVALID;
-
- errno=0;
- val3 = strtol(byte3, &endPtr, 10);
- if (( val3== 0 ) && ( errno !=0 || byte3 == endPtr))/* no conversion */
- return AFS_IPINVALID;
-
- errno=0;
- val4 = strtol(byte4, &endPtr, 10);
- if (( val4== 0 ) && ( errno !=0 || byte4 == endPtr))/* no conversion */
- return AFS_IPINVALID;
-
- val = ( val1 << 24 ) | ( val2 << 16 ) | ( val3 << 8 ) | val4;
- val = htonl(val);
- return val;
-}
+ char byte1[MAXBYTELEN], byte2[MAXBYTELEN];
+ char byte3[MAXBYTELEN], byte4[MAXBYTELEN];
+ int i = 0;
+ char *endPtr;
+ afs_uint32 val1, val2, val3, val4;
+ afs_uint32 val = 0;
-/*
-** converts a 4byte IP address into a static string (e.g. w.x.y.z)
-** On Solaris, if we pass a 4 byte integer directly into inet_ntoa(), it
-** causes a memory fault.
-*/
-char* afs_inet_ntoa(afs_uint32 addr)
-{
- struct in_addr temp;
- temp.s_addr = addr;
- return (char *) inet_ntoa(temp);
+ /* skip empty spaces */
+ while (isspace(*line) && maxSize) {
+ line++;
+ maxSize--;
+ }
+
+ /* skip empty lines */
+ if (!maxSize || !*line)
+ return AFS_IPINVALIDIGNORE;
+
+ while ((*line != '.') && maxSize) { /* extract first byte */
+ if (!isdigit(*line))
+ return AFS_IPINVALID;
+ if (i >= MAXBYTELEN-1)
+ return AFS_IPINVALID; /* no space */
+ byte1[i++] = *line++;
+ maxSize--;
+ }
+ if (!maxSize)
+ return AFS_IPINVALID;
+ byte1[i] = 0;
+
+ i = 0, line++;
+ while ((*line != '.') && maxSize) { /* extract second byte */
+ if (!isdigit(*line))
+ return AFS_IPINVALID;
+ if (i >= MAXBYTELEN-1)
+ return AFS_IPINVALID; /* no space */
+ byte2[i++] = *line++;
+ maxSize--;
+ }
+ if (!maxSize)
+ return AFS_IPINVALID;
+ byte2[i] = 0;
+
+ i = 0, line++;
+ while ((*line != '.') && maxSize) {
+ if (!isdigit(*line))
+ return AFS_IPINVALID;
+ if (i >= MAXBYTELEN-1)
+ return AFS_IPINVALID; /* no space */
+ byte3[i++] = *line++;
+ maxSize--;
+ }
+ if (!maxSize)
+ return AFS_IPINVALID;
+ byte3[i] = 0;
+
+ i = 0, line++;
+ while (*line && !isspace(*line) && maxSize) {
+ if (!isdigit(*line))
+ return AFS_IPINVALID;
+ if (i >= MAXBYTELEN-1)
+ return AFS_IPINVALID; /* no space */
+ byte4[i++] = *line++;
+ maxSize--;
+ }
+ if (!maxSize)
+ return AFS_IPINVALID;
+ byte4[i] = 0;
+
+ errno = 0;
+ val1 = strtol(byte1, &endPtr, 10);
+ if ((val1 == 0) && (errno != 0 || byte1 == endPtr))
+ return AFS_IPINVALID;
+
+ errno = 0;
+ val2 = strtol(byte2, &endPtr, 10);
+ if ((val2 == 0) && (errno != 0 || byte2 == endPtr)) /* no conversion */
+ return AFS_IPINVALID;
+
+ errno = 0;
+ val3 = strtol(byte3, &endPtr, 10);
+ if ((val3 == 0) && (errno != 0 || byte3 == endPtr)) /* no conversion */
+ return AFS_IPINVALID;
+
+ errno = 0;
+ val4 = strtol(byte4, &endPtr, 10);
+ if ((val4 == 0) && (errno != 0 || byte4 == endPtr)) /* no conversion */
+ return AFS_IPINVALID;
+
+ val = (val1 << 24) | (val2 << 16) | (val3 << 8) | val4;
+ val = htonl(val);
+ return val;
}
-/* same as above, but to a non-static buffer, must be freed by called */
-char* afs_inet_ntoa_r(afs_uint32 addr, char *buf)
+/* same as inet_ntoa, but to a non-static buffer, must be freed by called */
+char *
+afs_inet_ntoa_r(afs_uint32 addr, char *buf)
{
int temp;
temp = ntohl(addr);
- sprintf(buf, "%d.%d.%d.%d",
- (temp >> 24 ) & 0xff,
- (temp >> 16 ) & 0xff,
- (temp >> 8 ) & 0xff,
- (temp ) & 0xff);
+ sprintf(buf, "%d.%d.%d.%d", (temp >> 24) & 0xff, (temp >> 16) & 0xff,
+ (temp >> 8) & 0xff, (temp) & 0xff);
return buf;
}
* Always succeeds. Never attempt to deallocate directory string.
*/
-char *gettmpdir(void)
+char *
+gettmpdir(void)
{
char *tmpdirp = NULL;
-
+
#ifdef AFS_NT40_ENV
static char *saveTmpDir = NULL;
if (saveTmpDir == NULL) {
/* initialize global temporary directory string */
- char *dirp = (char *)malloc(MAX_PATH);
+ char *dirp = malloc(MAX_PATH+1);
int freeDirp = 1;
if (dirp != NULL) {
- DWORD pathLen = GetTempPath(MAX_PATH, dirp);
+ DWORD pathLen = GetTempPath(MAX_PATH+1, dirp);
if (pathLen == 0 || pathLen > MAX_PATH) {
/* can't get tmp path; get cur work dir */
/* Have a valid dir path; check that actually exists. */
DWORD fileAttr = GetFileAttributes(dirp);
- if ((fileAttr == 0xFFFFFFFF) ||
- ((fileAttr & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
+ if ((fileAttr == 0xFFFFFFFF)
+ || ((fileAttr & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
free(dirp);
dirp = NULL;
}
}
- } /* dirp != NULL */
-
+ }
+
if (dirp != NULL) {
FilepathNormalize(dirp);
} else {
freeDirp = 0;
}
- /* atomically initialize shared buffer pointer IF still null */
-
-#if 0
- if (InterlockedCompareExchange(&saveTmpDir, dirp, NULL) != NULL) {
- /* shared buffer pointer already initialized by another thread */
- if (freeDirp) {
- free(dirp);
- }
- } /* interlock xchng */
-#endif
-
- /* Above is what we really want to do, but Windows 95 does not have
- * InterlockedCompareExchange(). So we just atomically swap
- * the buffer pointer values but we do NOT deallocate the
- * previously installed buffer, if any, in case it is in use.
- */
- InterlockedExchange((LPLONG)&saveTmpDir, (LONG)dirp);
-
- } /* if (!saveTmpDir) */
-
+ /* atomically initialize shared buffer pointer IF still null */
+ if (InterlockedCompareExchangePointer(&saveTmpDir, dirp, NULL) != NULL) {
+ /* shared buffer pointer already initialized by another thread */
+ if (freeDirp)
+ free(dirp);
+ }
+ }
+ /* if (!saveTmpDir) */
tmpdirp = saveTmpDir;
#else
tmpdirp = "/tmp";
#endif /* AFS_NT40_ENV */
-
+
return tmpdirp;
}
-
-
git://git.openafs.org / openafs.git / blobdiff