Page MenuHomeFreeBSD
Differential D15791

Build framework changes for OpenSSL 1.1
AbandonedPublic
Actions

Authored by brnrd on Jun 13 2018, 3:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 10:52 AM
Unknown Object (File)
Mar 5 2025, 4:49 PM
Unknown Object (File)
Feb 20 2025, 1:58 PM
Unknown Object (File)
Feb 19 2025, 6:13 AM
Unknown Object (File)
Jan 31 2025, 8:49 PM
Unknown Object (File)
Jan 31 2025, 8:38 PM
Unknown Object (File)
Jan 25 2025, 7:10 PM
Unknown Object (File)
Jan 24 2025, 2:00 PM
View All 58 Files
Subscribers
imp

Details

Reviewers
gordon
jkim
bdrewery
Summary

Changes to the build-framework only (for now)

This does currently _not_ include:

  • Update of crypto/openssl
  • Updated manpages
  • Updated asm files

See also: FreeBSD Wiki page documenting updating OpenSSL in base

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 17280
Build 17117: arc lint + arc unit

Event Timeline

brnrd created this revision.Jun 13 2018, 3:38 PM
Herald added a subscriber: imp. · View Herald TranscriptJun 13 2018, 3:38 PM
Harbormaster completed remote builds in B17235: Diff 43711.Jun 13 2018, 3:38 PM
brnrd edited the summary of this revision. (Show Details)Jun 13 2018, 3:41 PM
brnrd updated this revision to Diff 43779.Jun 14 2018, 6:54 PM

Buildable libcrypto/libssl/openssl

Does require the generated files in crypto/openssl

Harbormaster completed remote builds in B17280: Diff 43779.Jun 14 2018, 6:54 PM
bdrewery added a comment.Jun 19 2018, 6:08 PM

Seems fine. What generated files are you talking about exactly?

secure/lib/libcrypto/Makefile.inc
7

I think date needs bump?

brnrd marked an inline comment as done.Jun 20 2018, 11:05 AM
brnrd added inline comments.
secure/lib/libcrypto/Makefile.inc
7

I thought so too, but 1.0.2o and 1.1.0h were security fix releases on the same date for 1.0.2 and 1.1.0 branches. See the OpenSSL download page as well.

brnrd marked an inline comment as done.Jun 20 2018, 11:09 AM
In D15791#336576, @bdrewery wrote:

Seems fine. What generated files are you talking about exactly?

The build needs the following generated files that are dependent on architecture and OS
{{{
include/openssl/opensslconf.h
crypto/include/internal/bn_conf.h
crypto/include/internal/dso_conf.h
}}}
See also [[ https://wiki.freebsd.org/OpenSSL/Base/OpenSSL/Base/Update | Generate .h files on the FreeBSD wiki page ]]. That page contains more detail on the process than this review.

brnrd abandoned this revision.Mar 14 2023, 6:26 PM

Revision Contents
Changeset List

PathSize
secure/
lib/
libcrypto/
227 lines
66 lines
11 lines
libssl/
29 lines
usr.bin/
openssl/
12 lines

Diff 43779

View Options

secure/lib/libcrypto/Makefile

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" };
static size_t default_numprotos = nitems(default_protos); static size_t default_numprotos = nitems(default_protos);
static int *protos; /* protocols to use */ static int *protos; /* protocols to use */
static size_t numprotos; /* allocated size of protos[] */ static size_t numprotos; /* allocated size of protos[] */
static int *ports; static int *ports;
#define INT_BIT (sizeof(int)*CHAR_BIT) #define INT_BIT (sizeof(int)*CHAR_BIT)
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) #define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) #define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr { struct addr {
struct sockaddr_storage address; struct sockaddr_storage address;
struct addr *next; struct addr *next;
}; };
struct sock { struct sock {
void *socket; void *socket;
void *pcb; void *pcb;
int shown; int shown;
int vflag; int vflag;
int family; int family;
int proto; int proto;
int state; int state;
const char *protoname; const char *protoname;
struct addr *laddr; struct addr *laddr;
struct addr *faddr; struct addr *faddr;
struct sock *next; struct sock *next;
}; };
#define HASHSIZE 1009 #define HASHSIZE 1009
static struct sock *sockhash[HASHSIZE]; static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles; static struct xfile *xfiles;
static int nxfiles; static int nxfiles;
static int static int
xprintf(const char *fmt, ...) xprintf(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
va_start(ap, fmt); va_start(ap, fmt);
len = vprintf(fmt, ap); len = vprintf(fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) if (len < 0)
err(1, "printf()"); err(1, "printf()");
return (len); return (len);
} }
static int static int
get_proto_type(const char *proto) get_proto_type(const char *proto)
{ {
struct protoent *pent; struct protoent *pent;
if (strlen(proto) == 0) if (strlen(proto) == 0)
return (0); return (0);
pent = getprotobyname(proto); pent = getprotobyname(proto);
if (pent == NULL) { if (pent == NULL) {
warn("getprotobyname"); warn("getprotobyname");
return (-1); return (-1);
} }
return (pent->p_proto); return (pent->p_proto);
} }
static void static void
init_protos(int num) init_protos(int num)
{ {
int proto_count = 0; int proto_count = 0;
if (num > 0) { if (num > 0) {
vangyzenUnsubmitted
Not Done
Inline Actions

style(9) was recently changed to permit the braces that were here. I personally prefer the braces, especially in cases like this, where the else has braces.

vangyzen: `style(9)` was recently changed to permit the braces that were here. I personally prefer the…
proto_count = num; proto_count = num;
} else { } else {
/* Find the maximum number of possible protocols. */ /* Find the maximum number of possible protocols. */
while (getprotoent() != NULL) while (getprotoent() != NULL)
proto_count++; proto_count++;
endprotoent(); endprotoent();
} }
if ((protos = malloc(sizeof(int) * proto_count)) == NULL) if ((protos = malloc(sizeof(int) * proto_count)) == NULL)
err(1, "malloc"); err(1, "malloc");
numprotos = proto_count; numprotos = proto_count;
} }
static int static int
parse_protos(char *protospec) parse_protos(char *protospec)
{ {
char *prot; char *prot;
int proto_type, proto_index; int proto_type, proto_index;
if (protospec == NULL) if (protospec == NULL)
return (-1); return (-1);
init_protos(0); init_protos(0);
proto_index = 0; proto_index = 0;
while ((prot = strsep(&protospec, ",")) != NULL) { while ((prot = strsep(&protospec, ",")) != NULL) {
if (strlen(prot) == 0) if (strlen(prot) == 0)
continue; continue;
proto_type = get_proto_type(prot); proto_type = get_proto_type(prot);
if (proto_type != -1) if (proto_type != -1)
protos[proto_index++] = proto_type; protos[proto_index++] = proto_type;
} }
numprotos = proto_index; numprotos = proto_index;
return (proto_index); return (proto_index);
} }
static void static void
parse_ports(const char *portspec) parse_ports(const char *portspec)
{ {
const char *p, *q; const char *p, *q;
int port, end; int port, end;
if (ports == NULL) if (ports == NULL)
if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Lines while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf + offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) if ((laddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1, "address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
if (sock->laddr == NULL) { if (sock->laddr == NULL) {
if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->laddr =
calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->laddr->address.ss_family = sock->family; sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->laddr->address.ss_len = sizeof(struct sockaddr_in); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in);
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure if style(9) covers this. I think the prevailing style would put sizeof at the beginning of the next line. Personally, I would prefer that. Ditto three times below.

vangyzen: I'm not sure if `style(9)` covers this. I think the prevailing style would put `sizeof` at the…
else else
sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in6);
local_all_loopback = 0; local_all_loopback = 0;
} }
if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->faddr->address.ss_family = sock->family; sock->faddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->faddr->address.ss_len = sizeof(struct sockaddr_in); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in);
else else
sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in6);
no_stcb = 1; no_stcb = 1;
while (offset < len) { while (offset < len) {
xstcb = (struct xsctp_tcb *)(void *)(buf + offset); xstcb = (struct xsctp_tcb *)(void *)(buf + offset);
offset += sizeof(struct xsctp_tcb); offset += sizeof(struct xsctp_tcb);
if (no_stcb) { if (no_stcb) {
if (opt_l && if (opt_l && (sock->vflag & vflag) &&
ngieUnsubmitted
Not Done
Inline Actions

(... vflag) != 0?

ngie: `(... vflag) != 0`?
(sock->vflag & vflag) &&
(!opt_L || !local_all_loopback) && (!opt_L || !local_all_loopback) &&
((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) ||
(xstcb->last == 1))) { (xstcb->last == 1))) {
hash = (int)((uintptr_t)sock->socket % HASHSIZE); hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
if (xstcb->last == 1) if (xstcb->last == 1)
break; break;
Show All 16 Lines while (offset < len) {
} else { } else {
sock->family = AF_INET; sock->family = AF_INET;
sock->vflag = INP_IPV4; sock->vflag = INP_IPV4;
} }
} }
prev_laddr = NULL; prev_laddr = NULL;
local_all_loopback = 1; local_all_loopback = 1;
while (offset < len) { while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) laddr = calloc(1, sizeof(struct addr));
if (laddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

I would prefer to separate the assignment and the comparison instead of wrapping the line, but this is fine.

vangyzen: I would prefer to separate the assignment and the comparison instead of wrapping the line, but…
vangyzenUnsubmitted
Not Done
Inline Actions

I should have been more clear. I'm sorry. I meant:

laddr = calloc(...);
if (laddr == NULL) {
vangyzen: I should have been more clear. I'm sorry. I meant: ``` laddr = calloc(...); if (laddr ==…
err(1, "malloc()"); err(1, "malloc()");
gargaAuthorUnsubmitted
Not Done
Inline Actions

err() call should point to "calloc()" here. There are other places I see the same issue. I'll submit a separate review

garga: err() call should point to "calloc()" here. There are other places I see the same issue. I'll…
allanjudeUnsubmitted
Not Done
Inline Actions

calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine

allanjude: calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
prev_faddr = NULL; prev_faddr = NULL;
foreign_all_loopback = 1; foreign_all_loopback = 1;
while (offset < len) { while (offset < len) {
xraddr = (struct xsctp_raddr *)(void *)(buf + offset); xraddr = (struct xsctp_raddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_raddr); offset += sizeof(struct xsctp_raddr);
if (xraddr->last == 1) if (xraddr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((faddr = calloc(1, sizeof(struct addr))) == NULL) faddr = calloc(1, sizeof(struct addr));
if (faddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

Ditto line 459.

vangyzen: Ditto line 459.
err(1, "malloc()"); err(1, "malloc()");
switch (xraddr->address.sa.sa_family) { switch (xraddr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xraddr->address.sin.sin_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET,
AF_INET,
&xraddr->address.sin.sin_addr, &xraddr->address.sin.sin_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xraddr->address.sin6.sin6_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET6,
AF_INET6,
&xraddr->address.sin6.sin6_addr, &xraddr->address.sin6.sin6_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xraddr->address.sa.sa_family); xraddr->address.sa.sa_family);
} }
faddr->next = NULL; faddr->next = NULL;
if (prev_faddr == NULL) if (prev_faddr == NULL)
sock->faddr = faddr; sock->faddr = faddr;
else else
prev_faddr->next = faddr; prev_faddr->next = faddr;
prev_faddr = faddr; prev_faddr = faddr;
} }
if (opt_c) { if (opt_c) {
if ((sock->vflag & vflag) && if ((sock->vflag & vflag) &&
(!opt_L || (!opt_L ||
!(local_all_loopback || foreign_all_loopback))) { !(local_all_loopback ||
hash = (int)((uintptr_t)sock->socket % HASHSIZE); foreign_all_loopback))) {
hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
} }
xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines default:
errx(1, "protocol %d not supported", proto); errx(1, "protocol %d not supported", proto);
} }
if ((inp->inp_vflag & vflag) == 0) if ((inp->inp_vflag & vflag) == 0)
continue; continue;
if (inp->inp_vflag & INP_IPV4) { if (inp->inp_vflag & INP_IPV4) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (opt_L && if (opt_L &&
(__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) ||
__IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr)))
continue; continue;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
} else if (inp->inp_vflag & INP_IPV6) { } else if (inp->inp_vflag & INP_IPV6) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
if (opt_L && if (opt_L &&
(IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) || (IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) ||
IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr))) IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr)))
continue; continue;
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Lines case AF_INET6:
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
if (faddr != NULL) if (faddr != NULL)
pos += printaddr(&faddr->address); pos += printaddr(&faddr->address);
break; break;
case AF_UNIX: case AF_UNIX:
if ((laddr == NULL) || (faddr == NULL)) if ((laddr == NULL) || (faddr == NULL))
errx(1, "laddr = %p or faddr = %p is NULL", errx(1, "laddr = %p or faddr = %p is NULL",
(void *)laddr, (void *)faddr); (void *)laddr, (void *)faddr);
/* server */ /* server */
if (laddr->address.ss_len > 0) { if (laddr->address.ss_len > 0) {
pos += printaddr(&laddr->address); pos += printaddr(&laddr->address);
break; break;
} }
/* client */ /* client */
p = *(void **)&(faddr->address); p = *(void **)&(faddr->address);
if (p == NULL) { if (p == NULL) {
pos += xprintf("(not connected)"); pos += xprintf("(not connected)");
break; break;
} }
pos += xprintf("-> "); pos += xprintf("-> ");
for (hash = 0; hash < HASHSIZE; ++hash) { for (hash = 0; hash < HASHSIZE; ++hash) {
for (s_tmp = sockhash[hash]; for (s_tmp = sockhash[hash];
s_tmp != NULL; s_tmp != NULL;
s_tmp = s_tmp->next) s_tmp = s_tmp->next)
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure that style(9) requires this. I personally prefer the old way.

vangyzen: I'm not sure that `style(9)` requires this. I personally prefer the old way.
ngieUnsubmitted
Not Done
Inline Actions

It does.

ngie: It does.
if (s_tmp->pcb == p) if (s_tmp->pcb == p)
break; break;
if (s_tmp != NULL) if (s_tmp != NULL)
break; break;
} }
if (s_tmp == NULL || if (s_tmp == NULL || s_tmp->laddr == NULL ||
s_tmp->laddr == NULL ||
s_tmp->laddr->address.ss_len == 0) s_tmp->laddr->address.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(&s_tmp->laddr->address); pos += printaddr(&s_tmp->laddr->address);
break; break;
default: default:
abort(); abort();
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines for (pindex = 0; pindex < default_numprotos; pindex++) {
prot = getprotobyname(pname); prot = getprotobyname(pname);
if (prot == NULL) if (prot == NULL)
err(1, "getprotobyname: %s", pname); err(1, "getprotobyname: %s", pname);
protos[pindex] = prot->p_proto; protos[pindex] = prot->p_proto;
} }
numprotos = pindex; numprotos = pindex;
return (pindex); return (pindex);
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n"); "usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n");
exit(1); exit(1);
} }
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines
View Options

secure/lib/libcrypto/Makefile.asm

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" };
static size_t default_numprotos = nitems(default_protos); static size_t default_numprotos = nitems(default_protos);
static int *protos; /* protocols to use */ static int *protos; /* protocols to use */
static size_t numprotos; /* allocated size of protos[] */ static size_t numprotos; /* allocated size of protos[] */
static int *ports; static int *ports;
#define INT_BIT (sizeof(int)*CHAR_BIT) #define INT_BIT (sizeof(int)*CHAR_BIT)
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) #define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) #define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr { struct addr {
struct sockaddr_storage address; struct sockaddr_storage address;
struct addr *next; struct addr *next;
}; };
struct sock { struct sock {
void *socket; void *socket;
void *pcb; void *pcb;
int shown; int shown;
int vflag; int vflag;
int family; int family;
int proto; int proto;
int state; int state;
const char *protoname; const char *protoname;
struct addr *laddr; struct addr *laddr;
struct addr *faddr; struct addr *faddr;
struct sock *next; struct sock *next;
}; };
#define HASHSIZE 1009 #define HASHSIZE 1009
static struct sock *sockhash[HASHSIZE]; static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles; static struct xfile *xfiles;
static int nxfiles; static int nxfiles;
static int static int
xprintf(const char *fmt, ...) xprintf(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
va_start(ap, fmt); va_start(ap, fmt);
len = vprintf(fmt, ap); len = vprintf(fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) if (len < 0)
err(1, "printf()"); err(1, "printf()");
return (len); return (len);
} }
static int static int
get_proto_type(const char *proto) get_proto_type(const char *proto)
{ {
struct protoent *pent; struct protoent *pent;
if (strlen(proto) == 0) if (strlen(proto) == 0)
return (0); return (0);
pent = getprotobyname(proto); pent = getprotobyname(proto);
if (pent == NULL) { if (pent == NULL) {
warn("getprotobyname"); warn("getprotobyname");
return (-1); return (-1);
} }
return (pent->p_proto); return (pent->p_proto);
} }
static void static void
init_protos(int num) init_protos(int num)
{ {
int proto_count = 0; int proto_count = 0;
if (num > 0) { if (num > 0) {
vangyzenUnsubmitted
Not Done
Inline Actions

style(9) was recently changed to permit the braces that were here. I personally prefer the braces, especially in cases like this, where the else has braces.

vangyzen: `style(9)` was recently changed to permit the braces that were here. I personally prefer the…
proto_count = num; proto_count = num;
} else { } else {
/* Find the maximum number of possible protocols. */ /* Find the maximum number of possible protocols. */
while (getprotoent() != NULL) while (getprotoent() != NULL)
proto_count++; proto_count++;
endprotoent(); endprotoent();
} }
if ((protos = malloc(sizeof(int) * proto_count)) == NULL) if ((protos = malloc(sizeof(int) * proto_count)) == NULL)
err(1, "malloc"); err(1, "malloc");
numprotos = proto_count; numprotos = proto_count;
} }
static int static int
parse_protos(char *protospec) parse_protos(char *protospec)
{ {
char *prot; char *prot;
int proto_type, proto_index; int proto_type, proto_index;
if (protospec == NULL) if (protospec == NULL)
return (-1); return (-1);
init_protos(0); init_protos(0);
proto_index = 0; proto_index = 0;
while ((prot = strsep(&protospec, ",")) != NULL) { while ((prot = strsep(&protospec, ",")) != NULL) {
if (strlen(prot) == 0) if (strlen(prot) == 0)
continue; continue;
proto_type = get_proto_type(prot); proto_type = get_proto_type(prot);
if (proto_type != -1) if (proto_type != -1)
protos[proto_index++] = proto_type; protos[proto_index++] = proto_type;
} }
numprotos = proto_index; numprotos = proto_index;
return (proto_index); return (proto_index);
} }
static void static void
parse_ports(const char *portspec) parse_ports(const char *portspec)
{ {
const char *p, *q; const char *p, *q;
int port, end; int port, end;
if (ports == NULL) if (ports == NULL)
if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Lines while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf + offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) if ((laddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1, "address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
if (sock->laddr == NULL) { if (sock->laddr == NULL) {
if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->laddr =
calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->laddr->address.ss_family = sock->family; sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->laddr->address.ss_len = sizeof(struct sockaddr_in); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in);
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure if style(9) covers this. I think the prevailing style would put sizeof at the beginning of the next line. Personally, I would prefer that. Ditto three times below.

vangyzen: I'm not sure if `style(9)` covers this. I think the prevailing style would put `sizeof` at the…
else else
sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in6);
local_all_loopback = 0; local_all_loopback = 0;
} }
if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->faddr->address.ss_family = sock->family; sock->faddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->faddr->address.ss_len = sizeof(struct sockaddr_in); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in);
else else
sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in6);
no_stcb = 1; no_stcb = 1;
while (offset < len) { while (offset < len) {
xstcb = (struct xsctp_tcb *)(void *)(buf + offset); xstcb = (struct xsctp_tcb *)(void *)(buf + offset);
offset += sizeof(struct xsctp_tcb); offset += sizeof(struct xsctp_tcb);
if (no_stcb) { if (no_stcb) {
if (opt_l && if (opt_l && (sock->vflag & vflag) &&
ngieUnsubmitted
Not Done
Inline Actions

(... vflag) != 0?

ngie: `(... vflag) != 0`?
(sock->vflag & vflag) &&
(!opt_L || !local_all_loopback) && (!opt_L || !local_all_loopback) &&
((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) ||
(xstcb->last == 1))) { (xstcb->last == 1))) {
hash = (int)((uintptr_t)sock->socket % HASHSIZE); hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
if (xstcb->last == 1) if (xstcb->last == 1)
break; break;
Show All 16 Lines while (offset < len) {
} else { } else {
sock->family = AF_INET; sock->family = AF_INET;
sock->vflag = INP_IPV4; sock->vflag = INP_IPV4;
} }
} }
prev_laddr = NULL; prev_laddr = NULL;
local_all_loopback = 1; local_all_loopback = 1;
while (offset < len) { while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) laddr = calloc(1, sizeof(struct addr));
if (laddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

I would prefer to separate the assignment and the comparison instead of wrapping the line, but this is fine.

vangyzen: I would prefer to separate the assignment and the comparison instead of wrapping the line, but…
vangyzenUnsubmitted
Not Done
Inline Actions

I should have been more clear. I'm sorry. I meant:

laddr = calloc(...);
if (laddr == NULL) {
vangyzen: I should have been more clear. I'm sorry. I meant: ``` laddr = calloc(...); if (laddr ==…
err(1, "malloc()"); err(1, "malloc()");
gargaAuthorUnsubmitted
Not Done
Inline Actions

err() call should point to "calloc()" here. There are other places I see the same issue. I'll submit a separate review

garga: err() call should point to "calloc()" here. There are other places I see the same issue. I'll…
allanjudeUnsubmitted
Not Done
Inline Actions

calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine

allanjude: calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
prev_faddr = NULL; prev_faddr = NULL;
foreign_all_loopback = 1; foreign_all_loopback = 1;
while (offset < len) { while (offset < len) {
xraddr = (struct xsctp_raddr *)(void *)(buf + offset); xraddr = (struct xsctp_raddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_raddr); offset += sizeof(struct xsctp_raddr);
if (xraddr->last == 1) if (xraddr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((faddr = calloc(1, sizeof(struct addr))) == NULL) faddr = calloc(1, sizeof(struct addr));
if (faddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

Ditto line 459.

vangyzen: Ditto line 459.
err(1, "malloc()"); err(1, "malloc()");
switch (xraddr->address.sa.sa_family) { switch (xraddr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xraddr->address.sin.sin_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET,
AF_INET,
&xraddr->address.sin.sin_addr, &xraddr->address.sin.sin_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xraddr->address.sin6.sin6_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET6,
AF_INET6,
&xraddr->address.sin6.sin6_addr, &xraddr->address.sin6.sin6_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xraddr->address.sa.sa_family); xraddr->address.sa.sa_family);
} }
faddr->next = NULL; faddr->next = NULL;
if (prev_faddr == NULL) if (prev_faddr == NULL)
sock->faddr = faddr; sock->faddr = faddr;
else else
prev_faddr->next = faddr; prev_faddr->next = faddr;
prev_faddr = faddr; prev_faddr = faddr;
} }
if (opt_c) { if (opt_c) {
if ((sock->vflag & vflag) && if ((sock->vflag & vflag) &&
(!opt_L || (!opt_L ||
!(local_all_loopback || foreign_all_loopback))) { !(local_all_loopback ||
hash = (int)((uintptr_t)sock->socket % HASHSIZE); foreign_all_loopback))) {
hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
} }
xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines default:
errx(1, "protocol %d not supported", proto); errx(1, "protocol %d not supported", proto);
} }
if ((inp->inp_vflag & vflag) == 0) if ((inp->inp_vflag & vflag) == 0)
continue; continue;
if (inp->inp_vflag & INP_IPV4) { if (inp->inp_vflag & INP_IPV4) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (opt_L && if (opt_L &&
(__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) ||
__IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr)))
continue; continue;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
} else if (inp->inp_vflag & INP_IPV6) { } else if (inp->inp_vflag & INP_IPV6) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
if (opt_L && if (opt_L &&
(IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) || (IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) ||
IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr))) IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr)))
continue; continue;
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Lines case AF_INET6:
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
if (faddr != NULL) if (faddr != NULL)
pos += printaddr(&faddr->address); pos += printaddr(&faddr->address);
break; break;
case AF_UNIX: case AF_UNIX:
if ((laddr == NULL) || (faddr == NULL)) if ((laddr == NULL) || (faddr == NULL))
errx(1, "laddr = %p or faddr = %p is NULL", errx(1, "laddr = %p or faddr = %p is NULL",
(void *)laddr, (void *)faddr); (void *)laddr, (void *)faddr);
/* server */ /* server */
if (laddr->address.ss_len > 0) { if (laddr->address.ss_len > 0) {
pos += printaddr(&laddr->address); pos += printaddr(&laddr->address);
break; break;
} }
/* client */ /* client */
p = *(void **)&(faddr->address); p = *(void **)&(faddr->address);
if (p == NULL) { if (p == NULL) {
pos += xprintf("(not connected)"); pos += xprintf("(not connected)");
break; break;
} }
pos += xprintf("-> "); pos += xprintf("-> ");
for (hash = 0; hash < HASHSIZE; ++hash) { for (hash = 0; hash < HASHSIZE; ++hash) {
for (s_tmp = sockhash[hash]; for (s_tmp = sockhash[hash];
s_tmp != NULL; s_tmp != NULL;
s_tmp = s_tmp->next) s_tmp = s_tmp->next)
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure that style(9) requires this. I personally prefer the old way.

vangyzen: I'm not sure that `style(9)` requires this. I personally prefer the old way.
ngieUnsubmitted
Not Done
Inline Actions

It does.

ngie: It does.
if (s_tmp->pcb == p) if (s_tmp->pcb == p)
break; break;
if (s_tmp != NULL) if (s_tmp != NULL)
break; break;
} }
if (s_tmp == NULL || if (s_tmp == NULL || s_tmp->laddr == NULL ||
s_tmp->laddr == NULL ||
s_tmp->laddr->address.ss_len == 0) s_tmp->laddr->address.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(&s_tmp->laddr->address); pos += printaddr(&s_tmp->laddr->address);
break; break;
default: default:
abort(); abort();
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines for (pindex = 0; pindex < default_numprotos; pindex++) {
prot = getprotobyname(pname); prot = getprotobyname(pname);
if (prot == NULL) if (prot == NULL)
err(1, "getprotobyname: %s", pname); err(1, "getprotobyname: %s", pname);
protos[pindex] = prot->p_proto; protos[pindex] = prot->p_proto;
} }
numprotos = pindex; numprotos = pindex;
return (pindex); return (pindex);
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n"); "usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n");
exit(1); exit(1);
} }
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines
View Options

secure/lib/libcrypto/Makefile.inc

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" };
static size_t default_numprotos = nitems(default_protos); static size_t default_numprotos = nitems(default_protos);
static int *protos; /* protocols to use */ static int *protos; /* protocols to use */
static size_t numprotos; /* allocated size of protos[] */ static size_t numprotos; /* allocated size of protos[] */
static int *ports; static int *ports;
#define INT_BIT (sizeof(int)*CHAR_BIT) #define INT_BIT (sizeof(int)*CHAR_BIT)
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) #define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) #define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr { struct addr {
struct sockaddr_storage address; struct sockaddr_storage address;
struct addr *next; struct addr *next;
}; };
struct sock { struct sock {
void *socket; void *socket;
void *pcb; void *pcb;
int shown; int shown;
int vflag; int vflag;
int family; int family;
int proto; int proto;
int state; int state;
const char *protoname; const char *protoname;
struct addr *laddr; struct addr *laddr;
struct addr *faddr; struct addr *faddr;
struct sock *next; struct sock *next;
}; };
#define HASHSIZE 1009 #define HASHSIZE 1009
static struct sock *sockhash[HASHSIZE]; static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles; static struct xfile *xfiles;
static int nxfiles; static int nxfiles;
static int static int
xprintf(const char *fmt, ...) xprintf(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
va_start(ap, fmt); va_start(ap, fmt);
len = vprintf(fmt, ap); len = vprintf(fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) if (len < 0)
err(1, "printf()"); err(1, "printf()");
return (len); return (len);
} }
static int static int
get_proto_type(const char *proto) get_proto_type(const char *proto)
{ {
struct protoent *pent; struct protoent *pent;
if (strlen(proto) == 0) if (strlen(proto) == 0)
return (0); return (0);
pent = getprotobyname(proto); pent = getprotobyname(proto);
if (pent == NULL) { if (pent == NULL) {
warn("getprotobyname"); warn("getprotobyname");
return (-1); return (-1);
} }
return (pent->p_proto); return (pent->p_proto);
} }
static void static void
init_protos(int num) init_protos(int num)
{ {
int proto_count = 0; int proto_count = 0;
if (num > 0) { if (num > 0) {
vangyzenUnsubmitted
Not Done
Inline Actions

style(9) was recently changed to permit the braces that were here. I personally prefer the braces, especially in cases like this, where the else has braces.

vangyzen: `style(9)` was recently changed to permit the braces that were here. I personally prefer the…
proto_count = num; proto_count = num;
} else { } else {
/* Find the maximum number of possible protocols. */ /* Find the maximum number of possible protocols. */
while (getprotoent() != NULL) while (getprotoent() != NULL)
proto_count++; proto_count++;
endprotoent(); endprotoent();
} }
if ((protos = malloc(sizeof(int) * proto_count)) == NULL) if ((protos = malloc(sizeof(int) * proto_count)) == NULL)
err(1, "malloc"); err(1, "malloc");
numprotos = proto_count; numprotos = proto_count;
} }
static int static int
parse_protos(char *protospec) parse_protos(char *protospec)
{ {
char *prot; char *prot;
int proto_type, proto_index; int proto_type, proto_index;
if (protospec == NULL) if (protospec == NULL)
return (-1); return (-1);
init_protos(0); init_protos(0);
proto_index = 0; proto_index = 0;
while ((prot = strsep(&protospec, ",")) != NULL) { while ((prot = strsep(&protospec, ",")) != NULL) {
if (strlen(prot) == 0) if (strlen(prot) == 0)
continue; continue;
proto_type = get_proto_type(prot); proto_type = get_proto_type(prot);
if (proto_type != -1) if (proto_type != -1)
protos[proto_index++] = proto_type; protos[proto_index++] = proto_type;
} }
numprotos = proto_index; numprotos = proto_index;
return (proto_index); return (proto_index);
} }
static void static void
parse_ports(const char *portspec) parse_ports(const char *portspec)
{ {
const char *p, *q; const char *p, *q;
int port, end; int port, end;
if (ports == NULL) if (ports == NULL)
if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Lines while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf + offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) if ((laddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1, "address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
if (sock->laddr == NULL) { if (sock->laddr == NULL) {
if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->laddr =
calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->laddr->address.ss_family = sock->family; sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->laddr->address.ss_len = sizeof(struct sockaddr_in); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in);
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure if style(9) covers this. I think the prevailing style would put sizeof at the beginning of the next line. Personally, I would prefer that. Ditto three times below.

vangyzen: I'm not sure if `style(9)` covers this. I think the prevailing style would put `sizeof` at the…
else else
sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in6);
local_all_loopback = 0; local_all_loopback = 0;
} }
if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->faddr->address.ss_family = sock->family; sock->faddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->faddr->address.ss_len = sizeof(struct sockaddr_in); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in);
else else
sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in6);
no_stcb = 1; no_stcb = 1;
while (offset < len) { while (offset < len) {
xstcb = (struct xsctp_tcb *)(void *)(buf + offset); xstcb = (struct xsctp_tcb *)(void *)(buf + offset);
offset += sizeof(struct xsctp_tcb); offset += sizeof(struct xsctp_tcb);
if (no_stcb) { if (no_stcb) {
if (opt_l && if (opt_l && (sock->vflag & vflag) &&
ngieUnsubmitted
Not Done
Inline Actions

(... vflag) != 0?

ngie: `(... vflag) != 0`?
(sock->vflag & vflag) &&
(!opt_L || !local_all_loopback) && (!opt_L || !local_all_loopback) &&
((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) ||
(xstcb->last == 1))) { (xstcb->last == 1))) {
hash = (int)((uintptr_t)sock->socket % HASHSIZE); hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
if (xstcb->last == 1) if (xstcb->last == 1)
break; break;
Show All 16 Lines while (offset < len) {
} else { } else {
sock->family = AF_INET; sock->family = AF_INET;
sock->vflag = INP_IPV4; sock->vflag = INP_IPV4;
} }
} }
prev_laddr = NULL; prev_laddr = NULL;
local_all_loopback = 1; local_all_loopback = 1;
while (offset < len) { while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) laddr = calloc(1, sizeof(struct addr));
if (laddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

I would prefer to separate the assignment and the comparison instead of wrapping the line, but this is fine.

vangyzen: I would prefer to separate the assignment and the comparison instead of wrapping the line, but…
vangyzenUnsubmitted
Not Done
Inline Actions

I should have been more clear. I'm sorry. I meant:

laddr = calloc(...);
if (laddr == NULL) {
vangyzen: I should have been more clear. I'm sorry. I meant: ``` laddr = calloc(...); if (laddr ==…
err(1, "malloc()"); err(1, "malloc()");
gargaAuthorUnsubmitted
Not Done
Inline Actions

err() call should point to "calloc()" here. There are other places I see the same issue. I'll submit a separate review

garga: err() call should point to "calloc()" here. There are other places I see the same issue. I'll…
allanjudeUnsubmitted
Not Done
Inline Actions

calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine

allanjude: calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
prev_faddr = NULL; prev_faddr = NULL;
foreign_all_loopback = 1; foreign_all_loopback = 1;
while (offset < len) { while (offset < len) {
xraddr = (struct xsctp_raddr *)(void *)(buf + offset); xraddr = (struct xsctp_raddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_raddr); offset += sizeof(struct xsctp_raddr);
if (xraddr->last == 1) if (xraddr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((faddr = calloc(1, sizeof(struct addr))) == NULL) faddr = calloc(1, sizeof(struct addr));
if (faddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

Ditto line 459.

vangyzen: Ditto line 459.
err(1, "malloc()"); err(1, "malloc()");
switch (xraddr->address.sa.sa_family) { switch (xraddr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xraddr->address.sin.sin_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET,
AF_INET,
&xraddr->address.sin.sin_addr, &xraddr->address.sin.sin_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xraddr->address.sin6.sin6_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET6,
AF_INET6,
&xraddr->address.sin6.sin6_addr, &xraddr->address.sin6.sin6_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xraddr->address.sa.sa_family); xraddr->address.sa.sa_family);
} }
faddr->next = NULL; faddr->next = NULL;
if (prev_faddr == NULL) if (prev_faddr == NULL)
sock->faddr = faddr; sock->faddr = faddr;
else else
prev_faddr->next = faddr; prev_faddr->next = faddr;
prev_faddr = faddr; prev_faddr = faddr;
} }
if (opt_c) { if (opt_c) {
if ((sock->vflag & vflag) && if ((sock->vflag & vflag) &&
(!opt_L || (!opt_L ||
!(local_all_loopback || foreign_all_loopback))) { !(local_all_loopback ||
hash = (int)((uintptr_t)sock->socket % HASHSIZE); foreign_all_loopback))) {
hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
} }
xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines default:
errx(1, "protocol %d not supported", proto); errx(1, "protocol %d not supported", proto);
} }
if ((inp->inp_vflag & vflag) == 0) if ((inp->inp_vflag & vflag) == 0)
continue; continue;
if (inp->inp_vflag & INP_IPV4) { if (inp->inp_vflag & INP_IPV4) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (opt_L && if (opt_L &&
(__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) ||
__IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr)))
continue; continue;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
} else if (inp->inp_vflag & INP_IPV6) { } else if (inp->inp_vflag & INP_IPV6) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
if (opt_L && if (opt_L &&
(IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) || (IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) ||
IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr))) IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr)))
continue; continue;
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Lines case AF_INET6:
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
if (faddr != NULL) if (faddr != NULL)
pos += printaddr(&faddr->address); pos += printaddr(&faddr->address);
break; break;
case AF_UNIX: case AF_UNIX:
if ((laddr == NULL) || (faddr == NULL)) if ((laddr == NULL) || (faddr == NULL))
errx(1, "laddr = %p or faddr = %p is NULL", errx(1, "laddr = %p or faddr = %p is NULL",
(void *)laddr, (void *)faddr); (void *)laddr, (void *)faddr);
/* server */ /* server */
if (laddr->address.ss_len > 0) { if (laddr->address.ss_len > 0) {
pos += printaddr(&laddr->address); pos += printaddr(&laddr->address);
break; break;
} }
/* client */ /* client */
p = *(void **)&(faddr->address); p = *(void **)&(faddr->address);
if (p == NULL) { if (p == NULL) {
pos += xprintf("(not connected)"); pos += xprintf("(not connected)");
break; break;
} }
pos += xprintf("-> "); pos += xprintf("-> ");
for (hash = 0; hash < HASHSIZE; ++hash) { for (hash = 0; hash < HASHSIZE; ++hash) {
for (s_tmp = sockhash[hash]; for (s_tmp = sockhash[hash];
s_tmp != NULL; s_tmp != NULL;
s_tmp = s_tmp->next) s_tmp = s_tmp->next)
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure that style(9) requires this. I personally prefer the old way.

vangyzen: I'm not sure that `style(9)` requires this. I personally prefer the old way.
ngieUnsubmitted
Not Done
Inline Actions

It does.

ngie: It does.
if (s_tmp->pcb == p) if (s_tmp->pcb == p)
break; break;
if (s_tmp != NULL) if (s_tmp != NULL)
break; break;
} }
if (s_tmp == NULL || if (s_tmp == NULL || s_tmp->laddr == NULL ||
s_tmp->laddr == NULL ||
s_tmp->laddr->address.ss_len == 0) s_tmp->laddr->address.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(&s_tmp->laddr->address); pos += printaddr(&s_tmp->laddr->address);
break; break;
default: default:
abort(); abort();
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines for (pindex = 0; pindex < default_numprotos; pindex++) {
prot = getprotobyname(pname); prot = getprotobyname(pname);
if (prot == NULL) if (prot == NULL)
err(1, "getprotobyname: %s", pname); err(1, "getprotobyname: %s", pname);
protos[pindex] = prot->p_proto; protos[pindex] = prot->p_proto;
} }
numprotos = pindex; numprotos = pindex;
return (pindex); return (pindex);
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n"); "usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n");
exit(1); exit(1);
} }
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines
View Options

secure/lib/libssl/Makefile

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" };
static size_t default_numprotos = nitems(default_protos); static size_t default_numprotos = nitems(default_protos);
static int *protos; /* protocols to use */ static int *protos; /* protocols to use */
static size_t numprotos; /* allocated size of protos[] */ static size_t numprotos; /* allocated size of protos[] */
static int *ports; static int *ports;
#define INT_BIT (sizeof(int)*CHAR_BIT) #define INT_BIT (sizeof(int)*CHAR_BIT)
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) #define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) #define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr { struct addr {
struct sockaddr_storage address; struct sockaddr_storage address;
struct addr *next; struct addr *next;
}; };
struct sock { struct sock {
void *socket; void *socket;
void *pcb; void *pcb;
int shown; int shown;
int vflag; int vflag;
int family; int family;
int proto; int proto;
int state; int state;
const char *protoname; const char *protoname;
struct addr *laddr; struct addr *laddr;
struct addr *faddr; struct addr *faddr;
struct sock *next; struct sock *next;
}; };
#define HASHSIZE 1009 #define HASHSIZE 1009
static struct sock *sockhash[HASHSIZE]; static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles; static struct xfile *xfiles;
static int nxfiles; static int nxfiles;
static int static int
xprintf(const char *fmt, ...) xprintf(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
va_start(ap, fmt); va_start(ap, fmt);
len = vprintf(fmt, ap); len = vprintf(fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) if (len < 0)
err(1, "printf()"); err(1, "printf()");
return (len); return (len);
} }
static int static int
get_proto_type(const char *proto) get_proto_type(const char *proto)
{ {
struct protoent *pent; struct protoent *pent;
if (strlen(proto) == 0) if (strlen(proto) == 0)
return (0); return (0);
pent = getprotobyname(proto); pent = getprotobyname(proto);
if (pent == NULL) { if (pent == NULL) {
warn("getprotobyname"); warn("getprotobyname");
return (-1); return (-1);
} }
return (pent->p_proto); return (pent->p_proto);
} }
static void static void
init_protos(int num) init_protos(int num)
{ {
int proto_count = 0; int proto_count = 0;
if (num > 0) { if (num > 0) {
vangyzenUnsubmitted
Not Done
Inline Actions

style(9) was recently changed to permit the braces that were here. I personally prefer the braces, especially in cases like this, where the else has braces.

vangyzen: `style(9)` was recently changed to permit the braces that were here. I personally prefer the…
proto_count = num; proto_count = num;
} else { } else {
/* Find the maximum number of possible protocols. */ /* Find the maximum number of possible protocols. */
while (getprotoent() != NULL) while (getprotoent() != NULL)
proto_count++; proto_count++;
endprotoent(); endprotoent();
} }
if ((protos = malloc(sizeof(int) * proto_count)) == NULL) if ((protos = malloc(sizeof(int) * proto_count)) == NULL)
err(1, "malloc"); err(1, "malloc");
numprotos = proto_count; numprotos = proto_count;
} }
static int static int
parse_protos(char *protospec) parse_protos(char *protospec)
{ {
char *prot; char *prot;
int proto_type, proto_index; int proto_type, proto_index;
if (protospec == NULL) if (protospec == NULL)
return (-1); return (-1);
init_protos(0); init_protos(0);
proto_index = 0; proto_index = 0;
while ((prot = strsep(&protospec, ",")) != NULL) { while ((prot = strsep(&protospec, ",")) != NULL) {
if (strlen(prot) == 0) if (strlen(prot) == 0)
continue; continue;
proto_type = get_proto_type(prot); proto_type = get_proto_type(prot);
if (proto_type != -1) if (proto_type != -1)
protos[proto_index++] = proto_type; protos[proto_index++] = proto_type;
} }
numprotos = proto_index; numprotos = proto_index;
return (proto_index); return (proto_index);
} }
static void static void
parse_ports(const char *portspec) parse_ports(const char *portspec)
{ {
const char *p, *q; const char *p, *q;
int port, end; int port, end;
if (ports == NULL) if (ports == NULL)
if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Lines while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf + offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) if ((laddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1, "address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
if (sock->laddr == NULL) { if (sock->laddr == NULL) {
if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->laddr =
calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->laddr->address.ss_family = sock->family; sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->laddr->address.ss_len = sizeof(struct sockaddr_in); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in);
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure if style(9) covers this. I think the prevailing style would put sizeof at the beginning of the next line. Personally, I would prefer that. Ditto three times below.

vangyzen: I'm not sure if `style(9)` covers this. I think the prevailing style would put `sizeof` at the…
else else
sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in6);
local_all_loopback = 0; local_all_loopback = 0;
} }
if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->faddr->address.ss_family = sock->family; sock->faddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->faddr->address.ss_len = sizeof(struct sockaddr_in); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in);
else else
sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in6);
no_stcb = 1; no_stcb = 1;
while (offset < len) { while (offset < len) {
xstcb = (struct xsctp_tcb *)(void *)(buf + offset); xstcb = (struct xsctp_tcb *)(void *)(buf + offset);
offset += sizeof(struct xsctp_tcb); offset += sizeof(struct xsctp_tcb);
if (no_stcb) { if (no_stcb) {
if (opt_l && if (opt_l && (sock->vflag & vflag) &&
ngieUnsubmitted
Not Done
Inline Actions

(... vflag) != 0?

ngie: `(... vflag) != 0`?
(sock->vflag & vflag) &&
(!opt_L || !local_all_loopback) && (!opt_L || !local_all_loopback) &&
((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) ||
(xstcb->last == 1))) { (xstcb->last == 1))) {
hash = (int)((uintptr_t)sock->socket % HASHSIZE); hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
if (xstcb->last == 1) if (xstcb->last == 1)
break; break;
Show All 16 Lines while (offset < len) {
} else { } else {
sock->family = AF_INET; sock->family = AF_INET;
sock->vflag = INP_IPV4; sock->vflag = INP_IPV4;
} }
} }
prev_laddr = NULL; prev_laddr = NULL;
local_all_loopback = 1; local_all_loopback = 1;
while (offset < len) { while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) laddr = calloc(1, sizeof(struct addr));
if (laddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

I would prefer to separate the assignment and the comparison instead of wrapping the line, but this is fine.

vangyzen: I would prefer to separate the assignment and the comparison instead of wrapping the line, but…
vangyzenUnsubmitted
Not Done
Inline Actions

I should have been more clear. I'm sorry. I meant:

laddr = calloc(...);
if (laddr == NULL) {
vangyzen: I should have been more clear. I'm sorry. I meant: ``` laddr = calloc(...); if (laddr ==…
err(1, "malloc()"); err(1, "malloc()");
gargaAuthorUnsubmitted
Not Done
Inline Actions

err() call should point to "calloc()" here. There are other places I see the same issue. I'll submit a separate review

garga: err() call should point to "calloc()" here. There are other places I see the same issue. I'll…
allanjudeUnsubmitted
Not Done
Inline Actions

calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine

allanjude: calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
prev_faddr = NULL; prev_faddr = NULL;
foreign_all_loopback = 1; foreign_all_loopback = 1;
while (offset < len) { while (offset < len) {
xraddr = (struct xsctp_raddr *)(void *)(buf + offset); xraddr = (struct xsctp_raddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_raddr); offset += sizeof(struct xsctp_raddr);
if (xraddr->last == 1) if (xraddr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((faddr = calloc(1, sizeof(struct addr))) == NULL) faddr = calloc(1, sizeof(struct addr));
if (faddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

Ditto line 459.

vangyzen: Ditto line 459.
err(1, "malloc()"); err(1, "malloc()");
switch (xraddr->address.sa.sa_family) { switch (xraddr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xraddr->address.sin.sin_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET,
AF_INET,
&xraddr->address.sin.sin_addr, &xraddr->address.sin.sin_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xraddr->address.sin6.sin6_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET6,
AF_INET6,
&xraddr->address.sin6.sin6_addr, &xraddr->address.sin6.sin6_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xraddr->address.sa.sa_family); xraddr->address.sa.sa_family);
} }
faddr->next = NULL; faddr->next = NULL;
if (prev_faddr == NULL) if (prev_faddr == NULL)
sock->faddr = faddr; sock->faddr = faddr;
else else
prev_faddr->next = faddr; prev_faddr->next = faddr;
prev_faddr = faddr; prev_faddr = faddr;
} }
if (opt_c) { if (opt_c) {
if ((sock->vflag & vflag) && if ((sock->vflag & vflag) &&
(!opt_L || (!opt_L ||
!(local_all_loopback || foreign_all_loopback))) { !(local_all_loopback ||
hash = (int)((uintptr_t)sock->socket % HASHSIZE); foreign_all_loopback))) {
hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
} }
xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines default:
errx(1, "protocol %d not supported", proto); errx(1, "protocol %d not supported", proto);
} }
if ((inp->inp_vflag & vflag) == 0) if ((inp->inp_vflag & vflag) == 0)
continue; continue;
if (inp->inp_vflag & INP_IPV4) { if (inp->inp_vflag & INP_IPV4) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (opt_L && if (opt_L &&
(__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) ||
__IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr)))
continue; continue;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
} else if (inp->inp_vflag & INP_IPV6) { } else if (inp->inp_vflag & INP_IPV6) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
if (opt_L && if (opt_L &&
(IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) || (IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) ||
IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr))) IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr)))
continue; continue;
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Lines case AF_INET6:
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
if (faddr != NULL) if (faddr != NULL)
pos += printaddr(&faddr->address); pos += printaddr(&faddr->address);
break; break;
case AF_UNIX: case AF_UNIX:
if ((laddr == NULL) || (faddr == NULL)) if ((laddr == NULL) || (faddr == NULL))
errx(1, "laddr = %p or faddr = %p is NULL", errx(1, "laddr = %p or faddr = %p is NULL",
(void *)laddr, (void *)faddr); (void *)laddr, (void *)faddr);
/* server */ /* server */
if (laddr->address.ss_len > 0) { if (laddr->address.ss_len > 0) {
pos += printaddr(&laddr->address); pos += printaddr(&laddr->address);
break; break;
} }
/* client */ /* client */
p = *(void **)&(faddr->address); p = *(void **)&(faddr->address);
if (p == NULL) { if (p == NULL) {
pos += xprintf("(not connected)"); pos += xprintf("(not connected)");
break; break;
} }
pos += xprintf("-> "); pos += xprintf("-> ");
for (hash = 0; hash < HASHSIZE; ++hash) { for (hash = 0; hash < HASHSIZE; ++hash) {
for (s_tmp = sockhash[hash]; for (s_tmp = sockhash[hash];
s_tmp != NULL; s_tmp != NULL;
s_tmp = s_tmp->next) s_tmp = s_tmp->next)
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure that style(9) requires this. I personally prefer the old way.

vangyzen: I'm not sure that `style(9)` requires this. I personally prefer the old way.
ngieUnsubmitted
Not Done
Inline Actions

It does.

ngie: It does.
if (s_tmp->pcb == p) if (s_tmp->pcb == p)
break; break;
if (s_tmp != NULL) if (s_tmp != NULL)
break; break;
} }
if (s_tmp == NULL || if (s_tmp == NULL || s_tmp->laddr == NULL ||
s_tmp->laddr == NULL ||
s_tmp->laddr->address.ss_len == 0) s_tmp->laddr->address.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(&s_tmp->laddr->address); pos += printaddr(&s_tmp->laddr->address);
break; break;
default: default:
abort(); abort();
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines for (pindex = 0; pindex < default_numprotos; pindex++) {
prot = getprotobyname(pname); prot = getprotobyname(pname);
if (prot == NULL) if (prot == NULL)
err(1, "getprotobyname: %s", pname); err(1, "getprotobyname: %s", pname);
protos[pindex] = prot->p_proto; protos[pindex] = prot->p_proto;
} }
numprotos = pindex; numprotos = pindex;
return (pindex); return (pindex);
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n"); "usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n");
exit(1); exit(1);
} }
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines
View Options

secure/usr.bin/openssl/Makefile

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" };
static size_t default_numprotos = nitems(default_protos); static size_t default_numprotos = nitems(default_protos);
static int *protos; /* protocols to use */ static int *protos; /* protocols to use */
static size_t numprotos; /* allocated size of protos[] */ static size_t numprotos; /* allocated size of protos[] */
static int *ports; static int *ports;
#define INT_BIT (sizeof(int)*CHAR_BIT) #define INT_BIT (sizeof(int)*CHAR_BIT)
#define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0) #define SET_PORT(p) do { ports[p / INT_BIT] |= 1 << (p % INT_BIT); } while (0)
#define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT))) #define CHK_PORT(p) (ports[p / INT_BIT] & (1 << (p % INT_BIT)))
struct addr { struct addr {
struct sockaddr_storage address; struct sockaddr_storage address;
struct addr *next; struct addr *next;
}; };
struct sock { struct sock {
void *socket; void *socket;
void *pcb; void *pcb;
int shown; int shown;
int vflag; int vflag;
int family; int family;
int proto; int proto;
int state; int state;
const char *protoname; const char *protoname;
struct addr *laddr; struct addr *laddr;
struct addr *faddr; struct addr *faddr;
struct sock *next; struct sock *next;
}; };
#define HASHSIZE 1009 #define HASHSIZE 1009
static struct sock *sockhash[HASHSIZE]; static struct sock *sockhash[HASHSIZE];
static struct xfile *xfiles; static struct xfile *xfiles;
static int nxfiles; static int nxfiles;
static int static int
xprintf(const char *fmt, ...) xprintf(const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
va_start(ap, fmt); va_start(ap, fmt);
len = vprintf(fmt, ap); len = vprintf(fmt, ap);
va_end(ap); va_end(ap);
if (len < 0) if (len < 0)
err(1, "printf()"); err(1, "printf()");
return (len); return (len);
} }
static int static int
get_proto_type(const char *proto) get_proto_type(const char *proto)
{ {
struct protoent *pent; struct protoent *pent;
if (strlen(proto) == 0) if (strlen(proto) == 0)
return (0); return (0);
pent = getprotobyname(proto); pent = getprotobyname(proto);
if (pent == NULL) { if (pent == NULL) {
warn("getprotobyname"); warn("getprotobyname");
return (-1); return (-1);
} }
return (pent->p_proto); return (pent->p_proto);
} }
static void static void
init_protos(int num) init_protos(int num)
{ {
int proto_count = 0; int proto_count = 0;
if (num > 0) { if (num > 0) {
vangyzenUnsubmitted
Not Done
Inline Actions

style(9) was recently changed to permit the braces that were here. I personally prefer the braces, especially in cases like this, where the else has braces.

vangyzen: `style(9)` was recently changed to permit the braces that were here. I personally prefer the…
proto_count = num; proto_count = num;
} else { } else {
/* Find the maximum number of possible protocols. */ /* Find the maximum number of possible protocols. */
while (getprotoent() != NULL) while (getprotoent() != NULL)
proto_count++; proto_count++;
endprotoent(); endprotoent();
} }
if ((protos = malloc(sizeof(int) * proto_count)) == NULL) if ((protos = malloc(sizeof(int) * proto_count)) == NULL)
err(1, "malloc"); err(1, "malloc");
numprotos = proto_count; numprotos = proto_count;
} }
static int static int
parse_protos(char *protospec) parse_protos(char *protospec)
{ {
char *prot; char *prot;
int proto_type, proto_index; int proto_type, proto_index;
if (protospec == NULL) if (protospec == NULL)
return (-1); return (-1);
init_protos(0); init_protos(0);
proto_index = 0; proto_index = 0;
while ((prot = strsep(&protospec, ",")) != NULL) { while ((prot = strsep(&protospec, ",")) != NULL) {
if (strlen(prot) == 0) if (strlen(prot) == 0)
continue; continue;
proto_type = get_proto_type(prot); proto_type = get_proto_type(prot);
if (proto_type != -1) if (proto_type != -1)
protos[proto_index++] = proto_type; protos[proto_index++] = proto_type;
} }
numprotos = proto_index; numprotos = proto_index;
return (proto_index); return (proto_index);
} }
static void static void
parse_ports(const char *portspec) parse_ports(const char *portspec)
{ {
const char *p, *q; const char *p, *q;
int port, end; int port, end;
if (ports == NULL) if (ports == NULL)
if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL)
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Lines while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf + offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) if ((laddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xinpcb->local_port)); htons(xinpcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1, "address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
if (sock->laddr == NULL) { if (sock->laddr == NULL) {
if ((sock->laddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->laddr =
calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->laddr->address.ss_family = sock->family; sock->laddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->laddr->address.ss_len = sizeof(struct sockaddr_in); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in);
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure if style(9) covers this. I think the prevailing style would put sizeof at the beginning of the next line. Personally, I would prefer that. Ditto three times below.

vangyzen: I'm not sure if `style(9)` covers this. I think the prevailing style would put `sizeof` at the…
else else
sock->laddr->address.ss_len = sizeof(struct sockaddr_in6); sock->laddr->address.ss_len =
sizeof(struct sockaddr_in6);
local_all_loopback = 0; local_all_loopback = 0;
} }
if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL) if ((sock->faddr = calloc(1, sizeof(struct addr))) == NULL)
err(1, "malloc()"); err(1, "malloc()");
sock->faddr->address.ss_family = sock->family; sock->faddr->address.ss_family = sock->family;
if (sock->family == AF_INET) if (sock->family == AF_INET)
sock->faddr->address.ss_len = sizeof(struct sockaddr_in); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in);
else else
sock->faddr->address.ss_len = sizeof(struct sockaddr_in6); sock->faddr->address.ss_len =
sizeof(struct sockaddr_in6);
no_stcb = 1; no_stcb = 1;
while (offset < len) { while (offset < len) {
xstcb = (struct xsctp_tcb *)(void *)(buf + offset); xstcb = (struct xsctp_tcb *)(void *)(buf + offset);
offset += sizeof(struct xsctp_tcb); offset += sizeof(struct xsctp_tcb);
if (no_stcb) { if (no_stcb) {
if (opt_l && if (opt_l && (sock->vflag & vflag) &&
ngieUnsubmitted
Not Done
Inline Actions

(... vflag) != 0?

ngie: `(... vflag) != 0`?
(sock->vflag & vflag) &&
(!opt_L || !local_all_loopback) && (!opt_L || !local_all_loopback) &&
((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) || ((xinpcb->flags & SCTP_PCB_FLAGS_UDPTYPE) ||
(xstcb->last == 1))) { (xstcb->last == 1))) {
hash = (int)((uintptr_t)sock->socket % HASHSIZE); hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
if (xstcb->last == 1) if (xstcb->last == 1)
break; break;
Show All 16 Lines while (offset < len) {
} else { } else {
sock->family = AF_INET; sock->family = AF_INET;
sock->vflag = INP_IPV4; sock->vflag = INP_IPV4;
} }
} }
prev_laddr = NULL; prev_laddr = NULL;
local_all_loopback = 1; local_all_loopback = 1;
while (offset < len) { while (offset < len) {
xladdr = (struct xsctp_laddr *)(void *)(buf + offset); xladdr = (struct xsctp_laddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_laddr); offset += sizeof(struct xsctp_laddr);
if (xladdr->last == 1) if (xladdr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((laddr = calloc(1, sizeof(struct addr))) == NULL) laddr = calloc(1, sizeof(struct addr));
if (laddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

I would prefer to separate the assignment and the comparison instead of wrapping the line, but this is fine.

vangyzen: I would prefer to separate the assignment and the comparison instead of wrapping the line, but…
vangyzenUnsubmitted
Not Done
Inline Actions

I should have been more clear. I'm sorry. I meant:

laddr = calloc(...);
if (laddr == NULL) {
vangyzen: I should have been more clear. I'm sorry. I meant: ``` laddr = calloc(...); if (laddr ==…
err(1, "malloc()"); err(1, "malloc()");
gargaAuthorUnsubmitted
Not Done
Inline Actions

err() call should point to "calloc()" here. There are other places I see the same issue. I'll submit a separate review

garga: err() call should point to "calloc()" here. There are other places I see the same issue. I'll…
allanjudeUnsubmitted
Not Done
Inline Actions

calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine

allanjude: calloc(num, size) is just a safe wrapper around malloc(num * size), so the error message is fine
switch (xladdr->address.sa.sa_family) { switch (xladdr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xladdr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xladdr->address.sin.sin_addr))
local_all_loopback = 0; local_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET,
AF_INET,
&xladdr->address.sin.sin_addr, &xladdr->address.sin.sin_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xladdr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xladdr->address.sin6.sin6_addr))
local_all_loopback = 0; local_all_loopback = 0;
sockaddr(&laddr->address, sockaddr(&laddr->address, AF_INET6,
AF_INET6,
&xladdr->address.sin6.sin6_addr, &xladdr->address.sin6.sin6_addr,
htons(xstcb->local_port)); htons(xstcb->local_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xladdr->address.sa.sa_family); xladdr->address.sa.sa_family);
} }
laddr->next = NULL; laddr->next = NULL;
if (prev_laddr == NULL) if (prev_laddr == NULL)
sock->laddr = laddr; sock->laddr = laddr;
else else
prev_laddr->next = laddr; prev_laddr->next = laddr;
prev_laddr = laddr; prev_laddr = laddr;
} }
prev_faddr = NULL; prev_faddr = NULL;
foreign_all_loopback = 1; foreign_all_loopback = 1;
while (offset < len) { while (offset < len) {
xraddr = (struct xsctp_raddr *)(void *)(buf + offset); xraddr = (struct xsctp_raddr *)(void *)(buf +
offset);
offset += sizeof(struct xsctp_raddr); offset += sizeof(struct xsctp_raddr);
if (xraddr->last == 1) if (xraddr->last == 1)
break; break;
if (!opt_c) if (!opt_c)
continue; continue;
if ((faddr = calloc(1, sizeof(struct addr))) == NULL) faddr = calloc(1, sizeof(struct addr));
if (faddr == NULL)
vangyzenUnsubmitted
Not Done
Inline Actions

Ditto line 459.

vangyzen: Ditto line 459.
err(1, "malloc()"); err(1, "malloc()");
switch (xraddr->address.sa.sa_family) { switch (xraddr->address.sa.sa_family) {
case AF_INET: case AF_INET:
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (!__IN_IS_ADDR_LOOPBACK(&xraddr->address.sin.sin_addr)) if (!__IN_IS_ADDR_LOOPBACK(
&xraddr->address.sin.sin_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET,
AF_INET,
&xraddr->address.sin.sin_addr, &xraddr->address.sin.sin_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
case AF_INET6: case AF_INET6:
if (!IN6_IS_ADDR_LOOPBACK(&xraddr->address.sin6.sin6_addr)) if (!IN6_IS_ADDR_LOOPBACK(
&xraddr->address.sin6.sin6_addr))
foreign_all_loopback = 0; foreign_all_loopback = 0;
sockaddr(&faddr->address, sockaddr(&faddr->address, AF_INET6,
AF_INET6,
&xraddr->address.sin6.sin6_addr, &xraddr->address.sin6.sin6_addr,
htons(xstcb->remote_port)); htons(xstcb->remote_port));
break; break;
default: default:
errx(1, "address family %d not supported", errx(1,
"address family %d not supported",
xraddr->address.sa.sa_family); xraddr->address.sa.sa_family);
} }
faddr->next = NULL; faddr->next = NULL;
if (prev_faddr == NULL) if (prev_faddr == NULL)
sock->faddr = faddr; sock->faddr = faddr;
else else
prev_faddr->next = faddr; prev_faddr->next = faddr;
prev_faddr = faddr; prev_faddr = faddr;
} }
if (opt_c) { if (opt_c) {
if ((sock->vflag & vflag) && if ((sock->vflag & vflag) &&
(!opt_L || (!opt_L ||
!(local_all_loopback || foreign_all_loopback))) { !(local_all_loopback ||
hash = (int)((uintptr_t)sock->socket % HASHSIZE); foreign_all_loopback))) {
hash = (int)((uintptr_t)sock->socket %
HASHSIZE);
sock->next = sockhash[hash]; sock->next = sockhash[hash];
sockhash[hash] = sock; sockhash[hash] = sock;
} else { } else {
free_socket(sock); free_socket(sock);
} }
} }
} }
xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset); xinpcb = (struct xsctp_inpcb *)(void *)(buf + offset);
▲ Show 20 Lines • Show All 96 Lines • ▼ Show 20 Lines default:
errx(1, "protocol %d not supported", proto); errx(1, "protocol %d not supported", proto);
} }
if ((inp->inp_vflag & vflag) == 0) if ((inp->inp_vflag & vflag) == 0)
continue; continue;
if (inp->inp_vflag & INP_IPV4) { if (inp->inp_vflag & INP_IPV4) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
#define __IN_IS_ADDR_LOOPBACK(pina) \ #define __IN_IS_ADDR_LOOPBACK(pina) \
((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET) ((ntohl((pina)->s_addr) >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET)
if (opt_L && if (opt_L &&
(__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) || (__IN_IS_ADDR_LOOPBACK(&inp->inp_faddr) ||
__IN_IS_ADDR_LOOPBACK(&inp->inp_laddr))) __IN_IS_ADDR_LOOPBACK(&inp->inp_laddr)))
continue; continue;
#undef __IN_IS_ADDR_LOOPBACK #undef __IN_IS_ADDR_LOOPBACK
} else if (inp->inp_vflag & INP_IPV6) { } else if (inp->inp_vflag & INP_IPV6) {
if ((inp->inp_fport == 0 && !opt_l) || if ((inp->inp_fport == 0 && !opt_l) ||
(inp->inp_fport != 0 && !opt_c)) (inp->inp_fport != 0 && !opt_c))
continue; continue;
if (opt_L && if (opt_L &&
(IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) || (IN6_IS_ADDR_LOOPBACK(&inp->in6p_faddr) ||
IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr))) IN6_IS_ADDR_LOOPBACK(&inp->in6p_laddr)))
continue; continue;
▲ Show 20 Lines • Show All 334 Lines • ▼ Show 20 Lines case AF_INET6:
while (pos < 58) while (pos < 58)
pos += xprintf(" "); pos += xprintf(" ");
if (faddr != NULL) if (faddr != NULL)
pos += printaddr(&faddr->address); pos += printaddr(&faddr->address);
break; break;
case AF_UNIX: case AF_UNIX:
if ((laddr == NULL) || (faddr == NULL)) if ((laddr == NULL) || (faddr == NULL))
errx(1, "laddr = %p or faddr = %p is NULL", errx(1, "laddr = %p or faddr = %p is NULL",
(void *)laddr, (void *)faddr); (void *)laddr, (void *)faddr);
/* server */ /* server */
if (laddr->address.ss_len > 0) { if (laddr->address.ss_len > 0) {
pos += printaddr(&laddr->address); pos += printaddr(&laddr->address);
break; break;
} }
/* client */ /* client */
p = *(void **)&(faddr->address); p = *(void **)&(faddr->address);
if (p == NULL) { if (p == NULL) {
pos += xprintf("(not connected)"); pos += xprintf("(not connected)");
break; break;
} }
pos += xprintf("-> "); pos += xprintf("-> ");
for (hash = 0; hash < HASHSIZE; ++hash) { for (hash = 0; hash < HASHSIZE; ++hash) {
for (s_tmp = sockhash[hash]; for (s_tmp = sockhash[hash];
s_tmp != NULL; s_tmp != NULL;
s_tmp = s_tmp->next) s_tmp = s_tmp->next)
vangyzenUnsubmitted
Not Done
Inline Actions

I'm not sure that style(9) requires this. I personally prefer the old way.

vangyzen: I'm not sure that `style(9)` requires this. I personally prefer the old way.
ngieUnsubmitted
Not Done
Inline Actions

It does.

ngie: It does.
if (s_tmp->pcb == p) if (s_tmp->pcb == p)
break; break;
if (s_tmp != NULL) if (s_tmp != NULL)
break; break;
} }
if (s_tmp == NULL || if (s_tmp == NULL || s_tmp->laddr == NULL ||
s_tmp->laddr == NULL ||
s_tmp->laddr->address.ss_len == 0) s_tmp->laddr->address.ss_len == 0)
pos += xprintf("??"); pos += xprintf("??");
else else
pos += printaddr(&s_tmp->laddr->address); pos += printaddr(&s_tmp->laddr->address);
break; break;
default: default:
abort(); abort();
} }
▲ Show 20 Lines • Show All 100 Lines • ▼ Show 20 Lines for (pindex = 0; pindex < default_numprotos; pindex++) {
prot = getprotobyname(pname); prot = getprotobyname(pname);
if (prot == NULL) if (prot == NULL)
err(1, "getprotobyname: %s", pname); err(1, "getprotobyname: %s", pname);
protos[pindex] = prot->p_proto; protos[pindex] = prot->p_proto;
} }
numprotos = pindex; numprotos = pindex;
return (pindex); return (pindex);
} }
static void static void
usage(void) usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n"); "usage: sockstat [-46cLlsu] [-j jid] [-p ports] [-P protocols]\n");
exit(1); exit(1);
} }
▲ Show 20 Lines • Show All 79 Lines • Show Last 20 Lines