Page MenuHomeFreeBSD
Differential D11056

svn cp rubygem-jquery-ui-rails-rails4 rubygem-jquery-ui-rails-rails5
ClosedPublic
Actions

Authored by dvl on Jun 5 2017, 1:01 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 3:41 PM
Unknown Object (File)
Feb 22 2025, 7:04 PM
Unknown Object (File)
Feb 22 2025, 4:28 AM
Unknown Object (File)
Feb 9 2025, 10:36 AM
Unknown Object (File)
Jan 27 2025, 8:58 AM
Unknown Object (File)
Jan 25 2025, 7:25 PM
Unknown Object (File)
Jan 24 2025, 7:19 PM
Unknown Object (File)
Jan 18 2025, 5:47 PM
View All 83 Files
Subscribers
jbeich
mat

Details

Reviewers
xmj
swills
Commits
rP442620: Add an svn cp of rubygem-jquery-ui-rails-rails4

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 9668
Build 10108: arc lint + arc unit

Event Timeline

dvl created this revision.Jun 5 2017, 1:01 PM
Herald added a subscriber: mat. · View Herald TranscriptJun 5 2017, 1:01 PM
Harbormaster completed remote builds in B9667: Diff 29214.Jun 5 2017, 1:01 PM
xmj added inline comments.Jun 5 2017, 1:07 PM
www/rubygem-jquery-ui-rails-rails5/Makefile
14

rubygem-railties5 is at 5.1.1.

dvl updated this revision to Diff 29215.Jun 5 2017, 1:12 PM

use the right RUN_DEPENDS

Harbormaster completed remote builds in B9668: Diff 29215.Jun 5 2017, 1:12 PM
dvl updated this revision to Diff 29216.Jun 5 2017, 1:20 PM

Fix the RUN_DEPENDS

Harbormaster completed remote builds in B9669: Diff 29216.Jun 5 2017, 1:20 PM
swills accepted this revision.Jun 5 2017, 1:52 PM

Looks correct to me

This revision is now accepted and ready to land.Jun 5 2017, 1:52 PM
Closed by commit rP442620: Add an svn cp of rubygem-jquery-ui-rails-rails4 (authored by dvl). · Explain WhyJun 5 2017, 1:58 PM
This revision was automatically updated to reflect the committed changes.
jbeich added a subscriber: jbeich.Jul 22 2017, 11:23 AM

rP446377 pruned the port as it wasn't connected to the bulk build via www/Makefile.

Revision Contents
Changeset List

PathSize
www/
1 line
rubygem-jquery-ui-rails-rails5
rubygem-jquery-ui-rails-rails4
rubygem-jquery-ui-rails-rails5/
4 lines

Diff 29215

View Options

www/Makefile

Show First 20 Lines • Show All 358 Lines • ▼ Show 20 Lines
close_filed(struct filed *f) close_filed(struct filed *f)
{ {
if (f == NULL || f->f_file == -1) if (f == NULL || f->f_file == -1)
return; return;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW:
if (f->f_addr != NULL) { if (f->f_addr_fds != NULL) {
markjUnsubmitted
Done
Inline Actions

Hopefully f->f_addr_fds == NULL implies f->f_num_addr_fds == 0, in which case there's no need to check this condition explicitly.

markj: Hopefully `f->f_addr_fds == NULL` implies `f->f_num_addr_fds == 0`, in which case there's no…
jfreeAuthorUnsubmitted
Done
Inline Actions

Yes. f->f_addr_fds == NULL does imply f->f_num_addr_fds == 0

jfree: Yes. `f->f_addr_fds == NULL` does imply `f->f_num_addr_fds == 0`
freeaddrinfo(f->f_addr); for (size_t i = 0; i < f->f_num_addr_fds; ++i)
f->f_addr = NULL; close(f->f_addr_fds[i]);
free(f->f_addr_fds);
f->f_addr_fds = NULL;
f->f_num_addr_fds = 0;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case F_FILE: case F_FILE:
case F_TTY: case F_TTY:
case F_CONSOLE: case F_CONSOLE:
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
case F_PIPE: case F_PIPE:
▲ Show 20 Lines • Show All 1,359 Lines • ▼ Show 20 Lines while (il->totalsize > size) {
} }
} }
} }
#endif #endif
static void static void
fprintlog_write(struct filed *f, struct iovlist *il, int flags) fprintlog_write(struct filed *f, struct iovlist *il, int flags)
{ {
struct msghdr msghdr;
struct addrinfo *r;
struct socklist *sl;
const char *msgret; const char *msgret;
ssize_t lsent;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW: {
int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions

I'd suggest writing sockfd = f->f_addr_fds[0] here.

markj: I'd suggest writing `sockfd = f->f_addr_fds[0]` here.
socklen_t len = sizeof(domain);
size_t lsent;
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &domain,
&len) < 0)
err(1, "getsockopt");
dprintf(" %s", f->f_hname); dprintf(" %s", f->f_hname);
switch (f->f_addr->ai_family) { switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
dprintf(":%d\n", struct sockaddr_in sin;
ntohs(satosin(f->f_addr->ai_addr)->sin_port));
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin.sin_port));
markjUnsubmitted
Done
Inline Actions

The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's a no-op unless debug printing is enabled. IMO it would be better to avoid this extra work unless Debug is true.

markj: The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's…
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
dprintf(":%d\n", struct sockaddr_in6 sin6;
ntohs(satosin6(f->f_addr->ai_addr)->sin6_port));
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin6.sin6_port));
break; break;
}
#endif #endif
default: default:
dprintf("\n"); dprintf("\n");
} }
#if defined(INET) || defined(INET6) #if defined(INET) || defined(INET6)
/* Truncate messages to maximum forward length. */ /* Truncate messages to maximum forward length. */
iovlist_truncate(il, MaxForwardLen); iovlist_truncate(il, MaxForwardLen);
#endif #endif
for (size_t i = 0; i < f->f_num_addr_fds; ++i) {
int targetfd = f->f_addr_fds[i];
lsent = 0; lsent = 0;
for (r = f->f_addr; r; r = r->ai_next) { for (size_t j = 0; j < il->iovcnt; ++j) {
memset(&msghdr, 0, sizeof(msghdr)); struct iovec *iov = il->iov + j;
msghdr.msg_name = r->ai_addr; ssize_t bytes;
msghdr.msg_namelen = r->ai_addrlen;
msghdr.msg_iov = il->iov; bytes = send(targetfd, iov->iov_base,
msghdr.msg_iovlen = il->iovcnt; iov->iov_len, 0);
markjUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

markj: Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having…
jfreeAuthorUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

Ah! I could've sworn I checked syscalls.master and didn't see CAPENABLED on sendmsg() before doing this. I guess I didn't. I will definitely use sendmsg() then.

jfree: > Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid…
STAILQ_FOREACH(sl, &shead, next) { if (bytes < 0)
if (sl->sl_socket < 0)
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, &msghdr, 0);
if (lsent == (ssize_t)il->totalsize)
break; break;
lsent += bytes;
} }
if (lsent == (ssize_t)il->totalsize && !send_to_all)
/*
* If we failed to send all of our data to the target
* or the -A option was specified, then resend to the
* next socket in our list.
*/
if (lsent == il->totalsize && !send_to_all)
break; break;
} }
dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize); dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize);
if (lsent != (ssize_t)il->totalsize) { if (lsent != il->totalsize) {
int e = errno; int e = errno;
logerror("sendto"); logerror("sendto");
errno = e; errno = e;
switch (errno) { switch (errno) {
case ENOBUFS: case ENOBUFS:
case ENETDOWN: case ENETDOWN:
case ENETUNREACH: case ENETUNREACH:
case EHOSTUNREACH: case EHOSTUNREACH:
Show All 10 Lines if (lsent != il->totalsize) {
/* case ECONNREFUSED: */ /* case ECONNREFUSED: */
default: default:
dprintf("removing entry: errno=%d\n", e); dprintf("removing entry: errno=%d\n", e);
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
} }
} }
break; break;
}
case F_FILE: case F_FILE:
dprintf(" %s\n", f->f_fname); dprintf(" %s\n", f->f_fname);
iovlist_append(il, "\n"); iovlist_append(il, "\n");
if (writev(f->f_file, il->iov, il->iovcnt) < 0) { if (writev(f->f_file, il->iov, il->iovcnt) < 0) {
/* /*
* If writev(2) fails for potentially transient errors * If writev(2) fails for potentially transient errors
* like the filesystem being full, ignore it. * like the filesystem being full, ignore it.
▲ Show 20 Lines • Show All 812 Lines • ▼ Show 20 Lines STAILQ_FOREACH(f, &fhead, next) {
printf("%s", f->f_fname); printf("%s", f->f_fname);
break; break;
case F_CONSOLE: case F_CONSOLE:
case F_TTY: case F_TTY:
printf("%s%s", _PATH_DEV, f->f_fname); printf("%s%s", _PATH_DEV, f->f_fname);
break; break;
case F_FORW: case F_FORW: {
switch (f->f_addr->ai_family) { int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions
case F_FORW: {
- int domain, sockfd = *f->f_addr_fds;
+ int domain, sockfd = f->f_addr_fds[0];
socklen_t len = sizeof(domain);
markj:
socklen_t len = sizeof(domain);
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN,
&domain, &len) < 0)
err(1, "getsockopt");
switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
port = ntohs(satosin(f->f_addr->ai_addr)->sin_port); struct sockaddr_in sin;
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
port = ntohs(sin.sin_port);
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
port = ntohs(satosin6(f->f_addr->ai_addr)->sin6_port); struct sockaddr_in6 sin6;
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
port = ntohs(sin6.sin6_port);
break; break;
}
#endif #endif
default: default:
port = 0; port = 0;
} }
if (port != 514) { if (port != 514) {
printf("%s:%d", f->f_hname, port); printf("%s:%d", f->f_hname, port);
} else { } else {
printf("%s", f->f_hname); printf("%s", f->f_hname);
} }
break; break;
}
case F_PIPE: case F_PIPE:
printf("%s", f->f_pname); printf("%s", f->f_pname);
break; break;
case F_USERS: case F_USERS:
for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++) for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++)
printf("%s, ", f->f_uname[i]); printf("%s, ", f->f_uname[i]);
▲ Show 20 Lines • Show All 261 Lines • ▼ Show 20 Lines while (*p == ',' || *p == ' ')
p++; p++;
} }
return (q); return (q);
} }
static void static void
parse_action(const char *p, struct filed *f) parse_action(const char *p, struct filed *f)
{ {
struct addrinfo hints, *res; struct addrinfo *ai, hints, *res;
int error, i; int error, i;
const char *q; const char *q;
bool syncfile; bool syncfile;
if (*p == '-') { if (*p == '-') {
syncfile = false; syncfile = false;
p++; p++;
} else } else
Show All 38 Lines hints = (struct addrinfo){
.ai_family = family, .ai_family = family,
.ai_socktype = SOCK_DGRAM .ai_socktype = SOCK_DGRAM
}; };
error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res); error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res);
if (error) { if (error) {
dprintf("%s\n", gai_strerror(error)); dprintf("%s\n", gai_strerror(error));
break; break;
} }
f->f_addr = res;
for (ai = res; ai != NULL; ai = ai->ai_next)
++f->f_num_addr_fds;
f->f_addr_fds = malloc(f->f_num_addr_fds *
sizeof(*f->f_addr_fds));
markjUnsubmitted
Done
Inline Actions

It'd be nicer to use calloc() here IMO.

markj: It'd be nicer to use calloc() here IMO.
if (f->f_addr_fds == NULL)
err(1, "malloc failed");
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
int *sockp = f->f_addr_fds + i;
markjUnsubmitted
Done
Inline Actions
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
- int *sockp = f->f_addr_fds + i;
+ int *sockp = &f->f_addr_fds[i];
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
markj:
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
if (*sockp < 0)
err(1, "socket");
if (connect(*sockp, ai->ai_addr, ai->ai_addrlen) < 0)
err(1, "connect");
/* Make it a write-only socket. */
if (shutdown(*sockp, SHUT_RD) < 0)
err(1, "shutdown");
}
f->f_type = F_FORW; f->f_type = F_FORW;
break; break;
case '/': case '/':
if ((f->f_file = open(p, logflags, 0600)) < 0) { if ((f->f_file = open(p, logflags, 0600)) < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
dprintf("%s\n", p); dprintf("%s\n", p);
break; break;
▲ Show 20 Lines • Show All 754 Lines • Show Last 20 Lines
View Options

www/rubygem-jquery-ui-rails-rails4

Show First 20 Lines • Show All 358 Lines • ▼ Show 20 Lines
close_filed(struct filed *f) close_filed(struct filed *f)
{ {
if (f == NULL || f->f_file == -1) if (f == NULL || f->f_file == -1)
return; return;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW:
if (f->f_addr != NULL) { if (f->f_addr_fds != NULL) {
markjUnsubmitted
Done
Inline Actions

Hopefully f->f_addr_fds == NULL implies f->f_num_addr_fds == 0, in which case there's no need to check this condition explicitly.

markj: Hopefully `f->f_addr_fds == NULL` implies `f->f_num_addr_fds == 0`, in which case there's no…
jfreeAuthorUnsubmitted
Done
Inline Actions

Yes. f->f_addr_fds == NULL does imply f->f_num_addr_fds == 0

jfree: Yes. `f->f_addr_fds == NULL` does imply `f->f_num_addr_fds == 0`
freeaddrinfo(f->f_addr); for (size_t i = 0; i < f->f_num_addr_fds; ++i)
f->f_addr = NULL; close(f->f_addr_fds[i]);
free(f->f_addr_fds);
f->f_addr_fds = NULL;
f->f_num_addr_fds = 0;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case F_FILE: case F_FILE:
case F_TTY: case F_TTY:
case F_CONSOLE: case F_CONSOLE:
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
case F_PIPE: case F_PIPE:
▲ Show 20 Lines • Show All 1,359 Lines • ▼ Show 20 Lines while (il->totalsize > size) {
} }
} }
} }
#endif #endif
static void static void
fprintlog_write(struct filed *f, struct iovlist *il, int flags) fprintlog_write(struct filed *f, struct iovlist *il, int flags)
{ {
struct msghdr msghdr;
struct addrinfo *r;
struct socklist *sl;
const char *msgret; const char *msgret;
ssize_t lsent;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW: {
int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions

I'd suggest writing sockfd = f->f_addr_fds[0] here.

markj: I'd suggest writing `sockfd = f->f_addr_fds[0]` here.
socklen_t len = sizeof(domain);
size_t lsent;
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &domain,
&len) < 0)
err(1, "getsockopt");
dprintf(" %s", f->f_hname); dprintf(" %s", f->f_hname);
switch (f->f_addr->ai_family) { switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
dprintf(":%d\n", struct sockaddr_in sin;
ntohs(satosin(f->f_addr->ai_addr)->sin_port));
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin.sin_port));
markjUnsubmitted
Done
Inline Actions

The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's a no-op unless debug printing is enabled. IMO it would be better to avoid this extra work unless Debug is true.

markj: The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's…
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
dprintf(":%d\n", struct sockaddr_in6 sin6;
ntohs(satosin6(f->f_addr->ai_addr)->sin6_port));
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin6.sin6_port));
break; break;
}
#endif #endif
default: default:
dprintf("\n"); dprintf("\n");
} }
#if defined(INET) || defined(INET6) #if defined(INET) || defined(INET6)
/* Truncate messages to maximum forward length. */ /* Truncate messages to maximum forward length. */
iovlist_truncate(il, MaxForwardLen); iovlist_truncate(il, MaxForwardLen);
#endif #endif
for (size_t i = 0; i < f->f_num_addr_fds; ++i) {
int targetfd = f->f_addr_fds[i];
lsent = 0; lsent = 0;
for (r = f->f_addr; r; r = r->ai_next) { for (size_t j = 0; j < il->iovcnt; ++j) {
memset(&msghdr, 0, sizeof(msghdr)); struct iovec *iov = il->iov + j;
msghdr.msg_name = r->ai_addr; ssize_t bytes;
msghdr.msg_namelen = r->ai_addrlen;
msghdr.msg_iov = il->iov; bytes = send(targetfd, iov->iov_base,
msghdr.msg_iovlen = il->iovcnt; iov->iov_len, 0);
markjUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

markj: Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having…
jfreeAuthorUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

Ah! I could've sworn I checked syscalls.master and didn't see CAPENABLED on sendmsg() before doing this. I guess I didn't. I will definitely use sendmsg() then.

jfree: > Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid…
STAILQ_FOREACH(sl, &shead, next) { if (bytes < 0)
if (sl->sl_socket < 0)
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, &msghdr, 0);
if (lsent == (ssize_t)il->totalsize)
break; break;
lsent += bytes;
} }
if (lsent == (ssize_t)il->totalsize && !send_to_all)
/*
* If we failed to send all of our data to the target
* or the -A option was specified, then resend to the
* next socket in our list.
*/
if (lsent == il->totalsize && !send_to_all)
break; break;
} }
dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize); dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize);
if (lsent != (ssize_t)il->totalsize) { if (lsent != il->totalsize) {
int e = errno; int e = errno;
logerror("sendto"); logerror("sendto");
errno = e; errno = e;
switch (errno) { switch (errno) {
case ENOBUFS: case ENOBUFS:
case ENETDOWN: case ENETDOWN:
case ENETUNREACH: case ENETUNREACH:
case EHOSTUNREACH: case EHOSTUNREACH:
Show All 10 Lines if (lsent != il->totalsize) {
/* case ECONNREFUSED: */ /* case ECONNREFUSED: */
default: default:
dprintf("removing entry: errno=%d\n", e); dprintf("removing entry: errno=%d\n", e);
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
} }
} }
break; break;
}
case F_FILE: case F_FILE:
dprintf(" %s\n", f->f_fname); dprintf(" %s\n", f->f_fname);
iovlist_append(il, "\n"); iovlist_append(il, "\n");
if (writev(f->f_file, il->iov, il->iovcnt) < 0) { if (writev(f->f_file, il->iov, il->iovcnt) < 0) {
/* /*
* If writev(2) fails for potentially transient errors * If writev(2) fails for potentially transient errors
* like the filesystem being full, ignore it. * like the filesystem being full, ignore it.
▲ Show 20 Lines • Show All 812 Lines • ▼ Show 20 Lines STAILQ_FOREACH(f, &fhead, next) {
printf("%s", f->f_fname); printf("%s", f->f_fname);
break; break;
case F_CONSOLE: case F_CONSOLE:
case F_TTY: case F_TTY:
printf("%s%s", _PATH_DEV, f->f_fname); printf("%s%s", _PATH_DEV, f->f_fname);
break; break;
case F_FORW: case F_FORW: {
switch (f->f_addr->ai_family) { int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions
case F_FORW: {
- int domain, sockfd = *f->f_addr_fds;
+ int domain, sockfd = f->f_addr_fds[0];
socklen_t len = sizeof(domain);
markj:
socklen_t len = sizeof(domain);
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN,
&domain, &len) < 0)
err(1, "getsockopt");
switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
port = ntohs(satosin(f->f_addr->ai_addr)->sin_port); struct sockaddr_in sin;
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
port = ntohs(sin.sin_port);
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
port = ntohs(satosin6(f->f_addr->ai_addr)->sin6_port); struct sockaddr_in6 sin6;
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
port = ntohs(sin6.sin6_port);
break; break;
}
#endif #endif
default: default:
port = 0; port = 0;
} }
if (port != 514) { if (port != 514) {
printf("%s:%d", f->f_hname, port); printf("%s:%d", f->f_hname, port);
} else { } else {
printf("%s", f->f_hname); printf("%s", f->f_hname);
} }
break; break;
}
case F_PIPE: case F_PIPE:
printf("%s", f->f_pname); printf("%s", f->f_pname);
break; break;
case F_USERS: case F_USERS:
for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++) for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++)
printf("%s, ", f->f_uname[i]); printf("%s, ", f->f_uname[i]);
▲ Show 20 Lines • Show All 261 Lines • ▼ Show 20 Lines while (*p == ',' || *p == ' ')
p++; p++;
} }
return (q); return (q);
} }
static void static void
parse_action(const char *p, struct filed *f) parse_action(const char *p, struct filed *f)
{ {
struct addrinfo hints, *res; struct addrinfo *ai, hints, *res;
int error, i; int error, i;
const char *q; const char *q;
bool syncfile; bool syncfile;
if (*p == '-') { if (*p == '-') {
syncfile = false; syncfile = false;
p++; p++;
} else } else
Show All 38 Lines hints = (struct addrinfo){
.ai_family = family, .ai_family = family,
.ai_socktype = SOCK_DGRAM .ai_socktype = SOCK_DGRAM
}; };
error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res); error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res);
if (error) { if (error) {
dprintf("%s\n", gai_strerror(error)); dprintf("%s\n", gai_strerror(error));
break; break;
} }
f->f_addr = res;
for (ai = res; ai != NULL; ai = ai->ai_next)
++f->f_num_addr_fds;
f->f_addr_fds = malloc(f->f_num_addr_fds *
sizeof(*f->f_addr_fds));
markjUnsubmitted
Done
Inline Actions

It'd be nicer to use calloc() here IMO.

markj: It'd be nicer to use calloc() here IMO.
if (f->f_addr_fds == NULL)
err(1, "malloc failed");
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
int *sockp = f->f_addr_fds + i;
markjUnsubmitted
Done
Inline Actions
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
- int *sockp = f->f_addr_fds + i;
+ int *sockp = &f->f_addr_fds[i];
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
markj:
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
if (*sockp < 0)
err(1, "socket");
if (connect(*sockp, ai->ai_addr, ai->ai_addrlen) < 0)
err(1, "connect");
/* Make it a write-only socket. */
if (shutdown(*sockp, SHUT_RD) < 0)
err(1, "shutdown");
}
f->f_type = F_FORW; f->f_type = F_FORW;
break; break;
case '/': case '/':
if ((f->f_file = open(p, logflags, 0600)) < 0) { if ((f->f_file = open(p, logflags, 0600)) < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
dprintf("%s\n", p); dprintf("%s\n", p);
break; break;
▲ Show 20 Lines • Show All 754 Lines • Show Last 20 Lines
View Options

www/rubygem-jquery-ui-rails-rails5/

Show First 20 Lines • Show All 358 Lines • ▼ Show 20 Lines
close_filed(struct filed *f) close_filed(struct filed *f)
{ {
if (f == NULL || f->f_file == -1) if (f == NULL || f->f_file == -1)
return; return;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW:
if (f->f_addr != NULL) { if (f->f_addr_fds != NULL) {
markjUnsubmitted
Done
Inline Actions

Hopefully f->f_addr_fds == NULL implies f->f_num_addr_fds == 0, in which case there's no need to check this condition explicitly.

markj: Hopefully `f->f_addr_fds == NULL` implies `f->f_num_addr_fds == 0`, in which case there's no…
jfreeAuthorUnsubmitted
Done
Inline Actions

Yes. f->f_addr_fds == NULL does imply f->f_num_addr_fds == 0

jfree: Yes. `f->f_addr_fds == NULL` does imply `f->f_num_addr_fds == 0`
freeaddrinfo(f->f_addr); for (size_t i = 0; i < f->f_num_addr_fds; ++i)
f->f_addr = NULL; close(f->f_addr_fds[i]);
free(f->f_addr_fds);
f->f_addr_fds = NULL;
f->f_num_addr_fds = 0;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case F_FILE: case F_FILE:
case F_TTY: case F_TTY:
case F_CONSOLE: case F_CONSOLE:
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
case F_PIPE: case F_PIPE:
▲ Show 20 Lines • Show All 1,359 Lines • ▼ Show 20 Lines while (il->totalsize > size) {
} }
} }
} }
#endif #endif
static void static void
fprintlog_write(struct filed *f, struct iovlist *il, int flags) fprintlog_write(struct filed *f, struct iovlist *il, int flags)
{ {
struct msghdr msghdr;
struct addrinfo *r;
struct socklist *sl;
const char *msgret; const char *msgret;
ssize_t lsent;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW: {
int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions

I'd suggest writing sockfd = f->f_addr_fds[0] here.

markj: I'd suggest writing `sockfd = f->f_addr_fds[0]` here.
socklen_t len = sizeof(domain);
size_t lsent;
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &domain,
&len) < 0)
err(1, "getsockopt");
dprintf(" %s", f->f_hname); dprintf(" %s", f->f_hname);
switch (f->f_addr->ai_family) { switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
dprintf(":%d\n", struct sockaddr_in sin;
ntohs(satosin(f->f_addr->ai_addr)->sin_port));
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin.sin_port));
markjUnsubmitted
Done
Inline Actions

The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's a no-op unless debug printing is enabled. IMO it would be better to avoid this extra work unless Debug is true.

markj: The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's…
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
dprintf(":%d\n", struct sockaddr_in6 sin6;
ntohs(satosin6(f->f_addr->ai_addr)->sin6_port));
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin6.sin6_port));
break; break;
}
#endif #endif
default: default:
dprintf("\n"); dprintf("\n");
} }
#if defined(INET) || defined(INET6) #if defined(INET) || defined(INET6)
/* Truncate messages to maximum forward length. */ /* Truncate messages to maximum forward length. */
iovlist_truncate(il, MaxForwardLen); iovlist_truncate(il, MaxForwardLen);
#endif #endif
for (size_t i = 0; i < f->f_num_addr_fds; ++i) {
int targetfd = f->f_addr_fds[i];
lsent = 0; lsent = 0;
for (r = f->f_addr; r; r = r->ai_next) { for (size_t j = 0; j < il->iovcnt; ++j) {
memset(&msghdr, 0, sizeof(msghdr)); struct iovec *iov = il->iov + j;
msghdr.msg_name = r->ai_addr; ssize_t bytes;
msghdr.msg_namelen = r->ai_addrlen;
msghdr.msg_iov = il->iov; bytes = send(targetfd, iov->iov_base,
msghdr.msg_iovlen = il->iovcnt; iov->iov_len, 0);
markjUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

markj: Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having…
jfreeAuthorUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

Ah! I could've sworn I checked syscalls.master and didn't see CAPENABLED on sendmsg() before doing this. I guess I didn't. I will definitely use sendmsg() then.

jfree: > Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid…
STAILQ_FOREACH(sl, &shead, next) { if (bytes < 0)
if (sl->sl_socket < 0)
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, &msghdr, 0);
if (lsent == (ssize_t)il->totalsize)
break; break;
lsent += bytes;
} }
if (lsent == (ssize_t)il->totalsize && !send_to_all)
/*
* If we failed to send all of our data to the target
* or the -A option was specified, then resend to the
* next socket in our list.
*/
if (lsent == il->totalsize && !send_to_all)
break; break;
} }
dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize); dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize);
if (lsent != (ssize_t)il->totalsize) { if (lsent != il->totalsize) {
int e = errno; int e = errno;
logerror("sendto"); logerror("sendto");
errno = e; errno = e;
switch (errno) { switch (errno) {
case ENOBUFS: case ENOBUFS:
case ENETDOWN: case ENETDOWN:
case ENETUNREACH: case ENETUNREACH:
case EHOSTUNREACH: case EHOSTUNREACH:
Show All 10 Lines if (lsent != il->totalsize) {
/* case ECONNREFUSED: */ /* case ECONNREFUSED: */
default: default:
dprintf("removing entry: errno=%d\n", e); dprintf("removing entry: errno=%d\n", e);
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
} }
} }
break; break;
}
case F_FILE: case F_FILE:
dprintf(" %s\n", f->f_fname); dprintf(" %s\n", f->f_fname);
iovlist_append(il, "\n"); iovlist_append(il, "\n");
if (writev(f->f_file, il->iov, il->iovcnt) < 0) { if (writev(f->f_file, il->iov, il->iovcnt) < 0) {
/* /*
* If writev(2) fails for potentially transient errors * If writev(2) fails for potentially transient errors
* like the filesystem being full, ignore it. * like the filesystem being full, ignore it.
▲ Show 20 Lines • Show All 812 Lines • ▼ Show 20 Lines STAILQ_FOREACH(f, &fhead, next) {
printf("%s", f->f_fname); printf("%s", f->f_fname);
break; break;
case F_CONSOLE: case F_CONSOLE:
case F_TTY: case F_TTY:
printf("%s%s", _PATH_DEV, f->f_fname); printf("%s%s", _PATH_DEV, f->f_fname);
break; break;
case F_FORW: case F_FORW: {
switch (f->f_addr->ai_family) { int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions
case F_FORW: {
- int domain, sockfd = *f->f_addr_fds;
+ int domain, sockfd = f->f_addr_fds[0];
socklen_t len = sizeof(domain);
markj:
socklen_t len = sizeof(domain);
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN,
&domain, &len) < 0)
err(1, "getsockopt");
switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
port = ntohs(satosin(f->f_addr->ai_addr)->sin_port); struct sockaddr_in sin;
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
port = ntohs(sin.sin_port);
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
port = ntohs(satosin6(f->f_addr->ai_addr)->sin6_port); struct sockaddr_in6 sin6;
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
port = ntohs(sin6.sin6_port);
break; break;
}
#endif #endif
default: default:
port = 0; port = 0;
} }
if (port != 514) { if (port != 514) {
printf("%s:%d", f->f_hname, port); printf("%s:%d", f->f_hname, port);
} else { } else {
printf("%s", f->f_hname); printf("%s", f->f_hname);
} }
break; break;
}
case F_PIPE: case F_PIPE:
printf("%s", f->f_pname); printf("%s", f->f_pname);
break; break;
case F_USERS: case F_USERS:
for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++) for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++)
printf("%s, ", f->f_uname[i]); printf("%s, ", f->f_uname[i]);
▲ Show 20 Lines • Show All 261 Lines • ▼ Show 20 Lines while (*p == ',' || *p == ' ')
p++; p++;
} }
return (q); return (q);
} }
static void static void
parse_action(const char *p, struct filed *f) parse_action(const char *p, struct filed *f)
{ {
struct addrinfo hints, *res; struct addrinfo *ai, hints, *res;
int error, i; int error, i;
const char *q; const char *q;
bool syncfile; bool syncfile;
if (*p == '-') { if (*p == '-') {
syncfile = false; syncfile = false;
p++; p++;
} else } else
Show All 38 Lines hints = (struct addrinfo){
.ai_family = family, .ai_family = family,
.ai_socktype = SOCK_DGRAM .ai_socktype = SOCK_DGRAM
}; };
error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res); error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res);
if (error) { if (error) {
dprintf("%s\n", gai_strerror(error)); dprintf("%s\n", gai_strerror(error));
break; break;
} }
f->f_addr = res;
for (ai = res; ai != NULL; ai = ai->ai_next)
++f->f_num_addr_fds;
f->f_addr_fds = malloc(f->f_num_addr_fds *
sizeof(*f->f_addr_fds));
markjUnsubmitted
Done
Inline Actions

It'd be nicer to use calloc() here IMO.

markj: It'd be nicer to use calloc() here IMO.
if (f->f_addr_fds == NULL)
err(1, "malloc failed");
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
int *sockp = f->f_addr_fds + i;
markjUnsubmitted
Done
Inline Actions
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
- int *sockp = f->f_addr_fds + i;
+ int *sockp = &f->f_addr_fds[i];
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
markj:
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
if (*sockp < 0)
err(1, "socket");
if (connect(*sockp, ai->ai_addr, ai->ai_addrlen) < 0)
err(1, "connect");
/* Make it a write-only socket. */
if (shutdown(*sockp, SHUT_RD) < 0)
err(1, "shutdown");
}
f->f_type = F_FORW; f->f_type = F_FORW;
break; break;
case '/': case '/':
if ((f->f_file = open(p, logflags, 0600)) < 0) { if ((f->f_file = open(p, logflags, 0600)) < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
dprintf("%s\n", p); dprintf("%s\n", p);
break; break;
▲ Show 20 Lines • Show All 754 Lines • Show Last 20 Lines
View Options

www/rubygem-jquery-ui-rails-rails5/Makefile

Show First 20 Lines • Show All 358 Lines • ▼ Show 20 Lines
close_filed(struct filed *f) close_filed(struct filed *f)
{ {
if (f == NULL || f->f_file == -1) if (f == NULL || f->f_file == -1)
return; return;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW:
if (f->f_addr != NULL) { if (f->f_addr_fds != NULL) {
markjUnsubmitted
Done
Inline Actions

Hopefully f->f_addr_fds == NULL implies f->f_num_addr_fds == 0, in which case there's no need to check this condition explicitly.

markj: Hopefully `f->f_addr_fds == NULL` implies `f->f_num_addr_fds == 0`, in which case there's no…
jfreeAuthorUnsubmitted
Done
Inline Actions

Yes. f->f_addr_fds == NULL does imply f->f_num_addr_fds == 0

jfree: Yes. `f->f_addr_fds == NULL` does imply `f->f_num_addr_fds == 0`
freeaddrinfo(f->f_addr); for (size_t i = 0; i < f->f_num_addr_fds; ++i)
f->f_addr = NULL; close(f->f_addr_fds[i]);
free(f->f_addr_fds);
f->f_addr_fds = NULL;
f->f_num_addr_fds = 0;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case F_FILE: case F_FILE:
case F_TTY: case F_TTY:
case F_CONSOLE: case F_CONSOLE:
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
case F_PIPE: case F_PIPE:
▲ Show 20 Lines • Show All 1,359 Lines • ▼ Show 20 Lines while (il->totalsize > size) {
} }
} }
} }
#endif #endif
static void static void
fprintlog_write(struct filed *f, struct iovlist *il, int flags) fprintlog_write(struct filed *f, struct iovlist *il, int flags)
{ {
struct msghdr msghdr;
struct addrinfo *r;
struct socklist *sl;
const char *msgret; const char *msgret;
ssize_t lsent;
switch (f->f_type) { switch (f->f_type) {
case F_FORW: case F_FORW: {
int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions

I'd suggest writing sockfd = f->f_addr_fds[0] here.

markj: I'd suggest writing `sockfd = f->f_addr_fds[0]` here.
socklen_t len = sizeof(domain);
size_t lsent;
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN, &domain,
&len) < 0)
err(1, "getsockopt");
dprintf(" %s", f->f_hname); dprintf(" %s", f->f_hname);
switch (f->f_addr->ai_family) { switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
dprintf(":%d\n", struct sockaddr_in sin;
ntohs(satosin(f->f_addr->ai_addr)->sin_port));
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin.sin_port));
markjUnsubmitted
Done
Inline Actions

The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's a no-op unless debug printing is enabled. IMO it would be better to avoid this extra work unless Debug is true.

markj: The new getsockopt() and getpeername() calls are only needed to implement dprintf(), but that's…
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
dprintf(":%d\n", struct sockaddr_in6 sin6;
ntohs(satosin6(f->f_addr->ai_addr)->sin6_port));
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
dprintf(":%d\n", ntohs(sin6.sin6_port));
break; break;
}
#endif #endif
default: default:
dprintf("\n"); dprintf("\n");
} }
#if defined(INET) || defined(INET6) #if defined(INET) || defined(INET6)
/* Truncate messages to maximum forward length. */ /* Truncate messages to maximum forward length. */
iovlist_truncate(il, MaxForwardLen); iovlist_truncate(il, MaxForwardLen);
#endif #endif
for (size_t i = 0; i < f->f_num_addr_fds; ++i) {
int targetfd = f->f_addr_fds[i];
lsent = 0; lsent = 0;
for (r = f->f_addr; r; r = r->ai_next) { for (size_t j = 0; j < il->iovcnt; ++j) {
memset(&msghdr, 0, sizeof(msghdr)); struct iovec *iov = il->iov + j;
msghdr.msg_name = r->ai_addr; ssize_t bytes;
msghdr.msg_namelen = r->ai_addrlen;
msghdr.msg_iov = il->iov; bytes = send(targetfd, iov->iov_base,
msghdr.msg_iovlen = il->iovcnt; iov->iov_len, 0);
markjUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

markj: Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having…
jfreeAuthorUnsubmitted
Done
Inline Actions

Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid having to loop over the iovec), so long as msghdr.msg_name = NULL. That would be cleaner IMO.

Ah! I could've sworn I checked syscalls.master and didn't see CAPENABLED on sendmsg() before doing this. I guess I didn't. I will definitely use sendmsg() then.

jfree: > Sorry I didn't catch this before - I believe you can still use sendmsg() (so as to avoid…
STAILQ_FOREACH(sl, &shead, next) { if (bytes < 0)
if (sl->sl_socket < 0)
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, &msghdr, 0);
if (lsent == (ssize_t)il->totalsize)
break; break;
lsent += bytes;
} }
if (lsent == (ssize_t)il->totalsize && !send_to_all)
/*
* If we failed to send all of our data to the target
* or the -A option was specified, then resend to the
* next socket in our list.
*/
if (lsent == il->totalsize && !send_to_all)
break; break;
} }
dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize); dprintf("lsent/totalsize: %zd/%zu\n", lsent, il->totalsize);
if (lsent != (ssize_t)il->totalsize) { if (lsent != il->totalsize) {
int e = errno; int e = errno;
logerror("sendto"); logerror("sendto");
errno = e; errno = e;
switch (errno) { switch (errno) {
case ENOBUFS: case ENOBUFS:
case ENETDOWN: case ENETDOWN:
case ENETUNREACH: case ENETUNREACH:
case EHOSTUNREACH: case EHOSTUNREACH:
Show All 10 Lines if (lsent != il->totalsize) {
/* case ECONNREFUSED: */ /* case ECONNREFUSED: */
default: default:
dprintf("removing entry: errno=%d\n", e); dprintf("removing entry: errno=%d\n", e);
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
break; break;
} }
} }
break; break;
}
case F_FILE: case F_FILE:
dprintf(" %s\n", f->f_fname); dprintf(" %s\n", f->f_fname);
iovlist_append(il, "\n"); iovlist_append(il, "\n");
if (writev(f->f_file, il->iov, il->iovcnt) < 0) { if (writev(f->f_file, il->iov, il->iovcnt) < 0) {
/* /*
* If writev(2) fails for potentially transient errors * If writev(2) fails for potentially transient errors
* like the filesystem being full, ignore it. * like the filesystem being full, ignore it.
▲ Show 20 Lines • Show All 812 Lines • ▼ Show 20 Lines STAILQ_FOREACH(f, &fhead, next) {
printf("%s", f->f_fname); printf("%s", f->f_fname);
break; break;
case F_CONSOLE: case F_CONSOLE:
case F_TTY: case F_TTY:
printf("%s%s", _PATH_DEV, f->f_fname); printf("%s%s", _PATH_DEV, f->f_fname);
break; break;
case F_FORW: case F_FORW: {
switch (f->f_addr->ai_family) { int domain, sockfd = *f->f_addr_fds;
markjUnsubmitted
Done
Inline Actions
case F_FORW: {
- int domain, sockfd = *f->f_addr_fds;
+ int domain, sockfd = f->f_addr_fds[0];
socklen_t len = sizeof(domain);
markj:
socklen_t len = sizeof(domain);
if (getsockopt(sockfd, SOL_SOCKET, SO_DOMAIN,
&domain, &len) < 0)
err(1, "getsockopt");
switch (domain) {
#ifdef INET #ifdef INET
case AF_INET: case AF_INET: {
port = ntohs(satosin(f->f_addr->ai_addr)->sin_port); struct sockaddr_in sin;
len = sizeof(sin);
if (getpeername(sockfd, (struct sockaddr *)&sin, &len) < 0)
err(1, "getpeername");
port = ntohs(sin.sin_port);
break; break;
}
#endif #endif
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6: {
port = ntohs(satosin6(f->f_addr->ai_addr)->sin6_port); struct sockaddr_in6 sin6;
len = sizeof(sin6);
if (getpeername(sockfd, (struct sockaddr *)&sin6, &len) < 0)
err(1, "getpeername");
port = ntohs(sin6.sin6_port);
break; break;
}
#endif #endif
default: default:
port = 0; port = 0;
} }
if (port != 514) { if (port != 514) {
printf("%s:%d", f->f_hname, port); printf("%s:%d", f->f_hname, port);
} else { } else {
printf("%s", f->f_hname); printf("%s", f->f_hname);
} }
break; break;
}
case F_PIPE: case F_PIPE:
printf("%s", f->f_pname); printf("%s", f->f_pname);
break; break;
case F_USERS: case F_USERS:
for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++) for (i = 0; i < MAXUNAMES && *f->f_uname[i]; i++)
printf("%s, ", f->f_uname[i]); printf("%s, ", f->f_uname[i]);
▲ Show 20 Lines • Show All 261 Lines • ▼ Show 20 Lines while (*p == ',' || *p == ' ')
p++; p++;
} }
return (q); return (q);
} }
static void static void
parse_action(const char *p, struct filed *f) parse_action(const char *p, struct filed *f)
{ {
struct addrinfo hints, *res; struct addrinfo *ai, hints, *res;
int error, i; int error, i;
const char *q; const char *q;
bool syncfile; bool syncfile;
if (*p == '-') { if (*p == '-') {
syncfile = false; syncfile = false;
p++; p++;
} else } else
Show All 38 Lines hints = (struct addrinfo){
.ai_family = family, .ai_family = family,
.ai_socktype = SOCK_DGRAM .ai_socktype = SOCK_DGRAM
}; };
error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res); error = getaddrinfo(f->f_hname, p ? p : "syslog", &hints, &res);
if (error) { if (error) {
dprintf("%s\n", gai_strerror(error)); dprintf("%s\n", gai_strerror(error));
break; break;
} }
f->f_addr = res;
for (ai = res; ai != NULL; ai = ai->ai_next)
++f->f_num_addr_fds;
f->f_addr_fds = malloc(f->f_num_addr_fds *
sizeof(*f->f_addr_fds));
markjUnsubmitted
Done
Inline Actions

It'd be nicer to use calloc() here IMO.

markj: It'd be nicer to use calloc() here IMO.
if (f->f_addr_fds == NULL)
err(1, "malloc failed");
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
int *sockp = f->f_addr_fds + i;
markjUnsubmitted
Done
Inline Actions
for (ai = res, i = 0; ai != NULL; ai = ai->ai_next, ++i) {
- int *sockp = f->f_addr_fds + i;
+ int *sockp = &f->f_addr_fds[i];
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
markj:
*sockp = socket(ai->ai_family, ai->ai_socktype, 0);
if (*sockp < 0)
err(1, "socket");
if (connect(*sockp, ai->ai_addr, ai->ai_addrlen) < 0)
err(1, "connect");
/* Make it a write-only socket. */
if (shutdown(*sockp, SHUT_RD) < 0)
err(1, "shutdown");
}
f->f_type = F_FORW; f->f_type = F_FORW;
break; break;
case '/': case '/':
if ((f->f_file = open(p, logflags, 0600)) < 0) { if ((f->f_file = open(p, logflags, 0600)) < 0) {
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
dprintf("%s\n", p); dprintf("%s\n", p);
break; break;
▲ Show 20 Lines • Show All 754 Lines • Show Last 20 Lines