ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-24 15:06:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ran gindent to clean up formatting

Browse Source
This commit is contained in:
Bryan Stansell 2020-10-18 23:31:04 -07:00
parent 0d64aad812
commit 5be57261e8
No known key found for this signature in database
GPG Key ID: 28E4B7253029E7F6
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conserver/access.c
View File

@ -67,9 +67,9 @@ AddrCmp(struct in_addr *addr, char *pattern)
in_addr_t hostaddr, pattern_addr, netmask; in_addr_t hostaddr, pattern_addr, netmask;
char *p, *slash_posn; char *p, *slash_posn;
static STRING *buf = (STRING *)0; static STRING *buf = (STRING *)0;
# if HAVE_INET_ATON #if HAVE_INET_ATON
struct in_addr inetaddr; struct in_addr inetaddr;
# endif #endif
if (buf == (STRING *)0) if (buf == (STRING *)0)
buf = AllocString(); buf = AllocString();
@ -82,15 +82,15 @@ AddrCmp(struct in_addr *addr, char *pattern)
} else } else
p = pattern; p = pattern;
# if HAVE_INET_ATON #if HAVE_INET_ATON
if (inet_aton(p, &inetaddr) == 0) if (inet_aton(p, &inetaddr) == 0)
return 1; return 1;
pattern_addr = inetaddr.s_addr; pattern_addr = inetaddr.s_addr;
# else #else
pattern_addr = inet_addr(p); pattern_addr = inet_addr(p);
if (pattern_addr == (in_addr_t) (-1)) if (pattern_addr == (in_addr_t) (-1))
return 1; /* malformed address */ return 1; /* malformed address */
# endif #endif
if (slash_posn) { if (slash_posn) {
/* convert explicit netmask */ /* convert explicit netmask */
@ -165,7 +165,9 @@ AccType(INADDR_STYPE *addr, char **peername)
CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho, CONDDEBUG((1, "AccType(): who=%s, trust=%c", pACtmp->pcwho,
pACtmp->ctrust)); pACtmp->ctrust));
if (addr->ss_family == AF_INET && pACtmp->isCIDR != 0) { if (addr->ss_family == AF_INET && pACtmp->isCIDR != 0) {
if (AddrCmp(&(((struct sockaddr_in *)addr)->sin_addr), pACtmp->pcwho) == 0) { if (AddrCmp
(&(((struct sockaddr_in *)addr)->sin_addr),
pACtmp->pcwho) == 0) {
ret = pACtmp->ctrust; ret = pACtmp->ctrust;
goto common_ret; goto common_ret;
} }

2
conserver/cutil.c
View File

@ -3096,7 +3096,7 @@ void
Sleep(useconds_t usec) Sleep(useconds_t usec)
{ {
#ifdef HAVE_NANOSLEEP #ifdef HAVE_NANOSLEEP
struct timespec ts = {0, usec * 1000}; struct timespec ts = { 0, usec * 1000 };
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
#else #else
usleep(usec); usleep(usec);