ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-01-12 16:02:55 +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

26
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 */
@ -164,13 +164,15 @@ AccType(INADDR_STYPE *addr, char **peername)
for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) { for (pACtmp = pACList; pACtmp != (ACCESS *)0; pACtmp = pACtmp->pACnext) {
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
ret = pACtmp->ctrust; (&(((struct sockaddr_in *)addr)->sin_addr),
goto common_ret; pACtmp->pcwho) == 0) {
} ret = pACtmp->ctrust;
continue; goto common_ret;
} }
continue;
}
if (strstr(ipaddr, pACtmp->pcwho) != NULL) { if (strstr(ipaddr, pACtmp->pcwho) != NULL) {
CONDDEBUG((1, "AccType(): match for ip=%s", ipaddr)); CONDDEBUG((1, "AccType(): match for ip=%s", ipaddr));

4
conserver/consent.c
View File

@ -885,7 +885,7 @@ ConsInit(CONSENT *pCE)
#if HAVE_SETSOCKOPT #if HAVE_SETSOCKOPT
int one = 1; int one = 1;
#endif #endif
Sleep(100000); /* Not all terminal servers can keep up */ Sleep(100000); /* Not all terminal servers can keep up */
#if USE_IPV6 #if USE_IPV6
# if HAVE_MEMSET # if HAVE_MEMSET
@ -933,7 +933,7 @@ ConsInit(CONSENT *pCE)
ret = connect(cofile, rp->ai_addr, rp->ai_addrlen); ret = connect(cofile, rp->ai_addr, rp->ai_addrlen);
if (ret == 0 || errno == EINPROGRESS) if (ret == 0 || errno == EINPROGRESS)
goto success; goto success;
fail: fail:
close(cofile); close(cofile);

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);

2
conserver/group.c
View File

@ -5250,7 +5250,7 @@ Spawn(GRPENT *pGE, int msfd)
* possibly opens another socket to the port. this really is only * possibly opens another socket to the port. this really is only
* an issue if you use the same port with -p and -b, i think. * an issue if you use the same port with -p and -b, i think.
*/ */
Sleep(750000); /* pause 0.75 sec to throttle startup a bit */ Sleep(750000); /* pause 0.75 sec to throttle startup a bit */
pGE->pid = pid; pGE->pid = pid;
return; return;
case 0: case 0:

12
console/console.c
View File

@ -1473,11 +1473,11 @@ CallUp(CONSFILE *pcf, char *pcMaster, char *pcMach, char *pcHow,
FilePrint(pcf, FLAGFALSE, "%c%c=", chAttn, chEsc); FilePrint(pcf, FLAGFALSE, "%c%c=", chAttn, chEsc);
r = ReadReply(pcf, FLAGFALSE); r = ReadReply(pcf, FLAGFALSE);
if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0) { if (strncmp(r, "[unknown", 8) != 0 && strncmp(r, "[up]", 4) != 0) {
FileWrite(cfstdout, FLAGFALSE, r, -1); FileWrite(cfstdout, FLAGFALSE, r, -1);
if (config->exitdown == FLAGTRUE) { if (config->exitdown == FLAGTRUE) {
Error("Console is not 'up'. Exiting. (-k)"); Error("Console is not 'up'. Exiting. (-k)");
Bye(EX_UNAVAILABLE); Bye(EX_UNAVAILABLE);
} }
} }
/* try to grok the version of the server */ /* try to grok the version of the server */
@ -2041,7 +2041,7 @@ main(int argc, char **argv)
pcCmd = "info"; pcCmd = "info";
break; break;
case 'k': case 'k':
optConf->exitdown = FLAGTRUE; optConf->exitdown = FLAGTRUE;
break; break;