Page MenuHomeFreeBSD
Differential D25604 Diff 74600 usr.sbin/traceroute6/traceroute6.c

Changeset View

Standalone View

View Options

usr.sbin/traceroute6/traceroute6.c

Show First 20 Lines • Show All 240 Lines • ▼ Show 20 Lines
* *
* I've hacked up a round-trip-route version of this that works by * I've hacked up a round-trip-route version of this that works by
* sending a loose-source-routed udp datagram through the destination * sending a loose-source-routed udp datagram through the destination
* back to yourself. Unfortunately, SO many gateways botch source * back to yourself. Unfortunately, SO many gateways botch source
* routing, the thing is almost worthless. Maybe one day... * routing, the thing is almost worthless. Maybe one day...
* *
* -- Van Jacobson (van@helios.ee.lbl.gov) * -- Van Jacobson (van@helios.ee.lbl.gov)
* Tue Dec 20 03:50:13 PST 1988 * Tue Dec 20 03:50:13 PST 1988
*/ */
oshogboUnsubmitted
Not Done
Inline Actions

This new line was fine.

oshogbo: This new line was fine.
#include <sys/param.h> #include <sys/param.h>
oshogboUnsubmitted
Not Done
Inline Actions

man style(9)

First goyes "sys" then others inculudes.

Typo:
#include <stdio.h>

oshogbo: man style(9) First goyes "sys" then others inculudes. Typo: #include <stdio.h>
#include <sys/capsicum.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef WITH_CASPER
oshogboUnsubmitted
Not Done
Inline Actions

Why we need this check?

oshogbo: Why we need this check?
oshogboUnsubmitted
Not Done
Inline Actions

This wasn't fixed.

oshogbo: This wasn't fixed.
#include <libcasper.h>
#include <casper/cap_dns.h>
#endif
#include <netdb.h> #include <netdb.h>
#include <stdio.h> #include <stdio.h>
#include <err.h> #include <err.h>
#ifdef HAVE_POLL #ifdef HAVE_POLL
#include <poll.h> #include <poll.h>
#endif #endif
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
Show All 14 Lines
#include "as.h" #include "as.h"
#define DUMMY_PORT 10010 #define DUMMY_PORT 10010
#define MAXPACKET 65535 /* max ip packet size */ #define MAXPACKET 65535 /* max ip packet size */
#ifndef HAVE_GETIPNODEBYNAME #ifndef HAVE_GETIPNODEBYNAME
#define getipnodebyname(x, y, z, u) gethostbyname2((x), (y)) #define getipnodebyname(x, y, z, u) cap_gethostbyname2(capdns, (x), (y))
oshogboUnsubmitted
Not Done
Inline Actions

Will getipnodebyname work in capablility mode?

oshogbo: Will getipnodebyname work in capablility mode?
markjUnsubmitted
Not Done
Inline Actions

It won't, but it is used before entering capability mode.

However, I don't think the substitution above makes sense. If a system doesn't have getipnodebyname(), it definitely won't have cap_gethostbyname2().

I would suggest deleting this block entirely, and add a comment above the getipnodebyname() saying that the call should be moved to after cap_enter(). e.g., /* XXX use after capability mode is entered */.

markj: It won't, but it is used before entering capability mode. However, I don't think the…
#define freehostent(x) #define freehostent(x)
#endif #endif
u_char packet[512]; /* last inbound (icmp) packet */ u_char packet[512]; /* last inbound (icmp) packet */
char *outpacket; /* last output packet */ char *outpacket; /* last output packet */
int main(int, char *[]); int main(int, char *[]);
int wait_for_reply(int, struct msghdr *); int wait_for_reply(int, struct msghdr *);
#ifdef IPSEC #ifdef IPSEC
#ifdef IPSEC_POLICY_IPSEC #ifdef IPSEC_POLICY_IPSEC
int setpolicy(int so, char *policy); int setpolicy(int so, char *policy);
#endif #endif
#endif #endif
void send_probe(int, u_long); void send_probe(int, u_long);
void *get_uphdr(struct ip6_hdr *, u_char *); void *get_uphdr(struct ip6_hdr *, u_char *);
int get_hoplim(struct msghdr *); int get_hoplim(struct msghdr *);
double deltaT(struct timeval *, struct timeval *); double deltaT(struct timeval *, struct timeval *);
const char *pr_type(int); const char *pr_type(int);
int packet_ok(struct msghdr *, int, int, u_char *, u_char *); int packet_ok(struct msghdr *, int, int, u_char *, u_char *);
void print(struct msghdr *, int); void print(struct msghdr *, int);
const char *inetname(struct sockaddr *); const char *inetname(struct sockaddr *);
u_int32_t sctp_crc32c(void *, u_int32_t); u_int32_t sctp_crc32c(void *, u_int32_t);
u_int16_t in_cksum(u_int16_t *addr, int); u_int16_t in_cksum(u_int16_t *addr, int);
u_int16_t udp_cksum(struct sockaddr_in6 *, struct sockaddr_in6 *,
void *, u_int32_t);
u_int16_t tcp_chksum(struct sockaddr_in6 *, struct sockaddr_in6 *, u_int16_t tcp_chksum(struct sockaddr_in6 *, struct sockaddr_in6 *,
void *, u_int32_t); void *, u_int32_t);
void usage(void); void usage(void);
int rcvsock; /* receive (icmp) socket file descriptor */ int rcvsock; /* receive (icmp) socket file descriptor */
int sndsock; /* send (raw/udp) socket file descriptor */ int sndsock; /* send (raw/udp) socket file descriptor */
struct msghdr rcvmhdr; struct msghdr rcvmhdr;
struct iovec rcviov[2]; struct iovec rcviov[2];
int rcvhlim; int rcvhlim;
struct in6_pktinfo *rcvpktinfo; struct in6_pktinfo *rcvpktinfo;
struct sockaddr_in6 Src, Dst, Rcv; struct sockaddr_in6 Src, Dst, Rcv;
u_long datalen = 20; /* How much data */ u_long datalen = 20; /* How much data */
#define ICMP6ECHOLEN 8 #define ICMP6ECHOLEN 8
/* XXX: 2064 = 127(max hops in type 0 rthdr) * sizeof(ip6_hdr) + 16(margin) */ /* XXX: 2064 = 127(max hops in type 0 rthdr) * sizeof(ip6_hdr) + 16(margin) */
char rtbuf[2064]; char rtbuf[2064];
struct ip6_rthdr *rth; struct ip6_rthdr *rth;
struct cmsghdr *cmsg; struct cmsghdr *cmsg;
char *source = NULL; char *source = NULL;
char *hostname; char *hostname;
#ifdef WITH_CASPER
oshogboUnsubmitted
Not Done
Inline Actions

Do we need this ifdef?

oshogbo: Do we need this ifdef?
static cap_channel_t *capdns;
#endif
u_long nprobes = 3; u_long nprobes = 3;
u_long first_hop = 1; u_long first_hop = 1;
u_long max_hops = 30; u_long max_hops = 30;
u_int16_t srcport; u_int16_t srcport;
u_int16_t port = 32768+666; /* start udp dest port # for probe packets */ u_int16_t port = 32768+666; /* start udp dest port # for probe packets */
u_int16_t ident; u_int16_t ident;
int options; /* socket options */ int options; /* socket options */
int verbose; int verbose;
int waittime = 5; /* time to wait for response (in seconds) */ int waittime = 5; /* time to wait for response (in seconds) */
int nflag; /* print addresses numerically */ int nflag; /* print addresses numerically */
int useproto = IPPROTO_UDP; /* protocol to use to send packet */ int useproto = IPPROTO_UDP; /* protocol to use to send packet */
int lflag; /* print both numerical address & hostname */ int lflag; /* print both numerical address & hostname */
int as_path; /* print as numbers for each hop */ int as_path; /* print as numbers for each hop */
char *as_server = NULL; char *as_server = NULL;
void *asn; void *asn;
int int
oshogboUnsubmitted
Not Done
Inline Actions

We don't need this extra line.

oshogbo: We don't need this extra line.
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int mib[4] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_DEFHLIM }; int mib[4] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_DEFHLIM };
char hbuf[NI_MAXHOST], src0[NI_MAXHOST], *ep; char hbuf[NI_MAXHOST], src0[NI_MAXHOST], *ep;
int ch, i, on = 1, seq, rcvcmsglen, error; int ch, i, on = 1, seq, rcvcmsglen, error;
struct addrinfo hints, *res; struct addrinfo hints, *res;
static u_char *rcvcmsgbuf; static u_char *rcvcmsgbuf;
u_long probe, hops, lport; u_long probe, hops, lport;
struct hostent *hp; struct hostent *hp;
size_t size, minlen; size_t size, minlen;
uid_t uid; uid_t uid;
u_char type, code; u_char type, code;
cap_rights_t rights;
oshogboUnsubmitted
Not Done
Inline Actions

Style(9):

VARIABLES
NEW_LINE
CODE.
oshogbo: Style(9): ``` VARIABLES NEW_LINE CODE. ```
#ifdef WITH_CASPER
const char *types[] = { "NAME", "ADDR" };
int families[1];
cap_channel_t *casper;
#endif
#ifdef WITH_CASPER
casper = cap_init();
if (casper == NULL)
errx(1, "unable to create casper process");
oshogboUnsubmitted
Not Done
Inline Actions

I would use nitems instead of hardcodign the size.

oshogbo: I would use nitems instead of hardcodign the size.
capdns = cap_service_open(casper, "system.dns");
if (capdns == NULL)
errx(1, "unable to open system.dns service");
oshogboUnsubmitted
Not Done
Inline Actions

Same.

oshogbo: Same.
if (cap_dns_type_limit(capdns, types, 2) < 0)
errx(1, "unable to limit access to system.dns service");
markjUnsubmitted
Not Done
Inline Actions

Since this block of code only sets a global variable, and the added local vars are unused afterward, let's move it into a separate function.

markj: Since this block of code only sets a global variable, and the added local vars are unused…
families[0] = AF_INET6;
if (cap_dns_family_limit(capdns, families, 1) < 0)
errx(1, "unable to limit access to system.dns service");
#endif /* WITH_CASPER */
#ifdef WITH_CASPER
cap_close(casper);
#endif
oshogboUnsubmitted
Not Done
Inline Actions

No extra lines.

oshogbo: No extra lines.
/* /*
* Receive ICMP * Receive ICMP
*/ */
if ((rcvsock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) { if ((rcvsock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) {
perror("socket(ICMPv6)"); perror("socket(ICMPv6)");
exit(5); exit(5);
} }
size = sizeof(i); size = sizeof(i);
(void) sysctl(mib, sizeof(mib)/sizeof(mib[0]), &i, &size, NULL, 0); (void) sysctl(mib, sizeof(mib)/sizeof(mib[0]), &i, &size, NULL, 0);
oshogboUnsubmitted
Not Done
Inline Actions

Why we need this checks?

oshogbo: Why we need this checks?
max_hops = i; max_hops = i;
/* specify to tell receiving interface */ /* specify to tell receiving interface */
#ifdef IPV6_RECVPKTINFO #ifdef IPV6_RECVPKTINFO
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on,
sizeof(on)) < 0) sizeof(on)) < 0)
err(1, "setsockopt(IPV6_RECVPKTINFO)"); err(1, "setsockopt(IPV6_RECVPKTINFO)");
#else /* old adv. API */ #else /* old adv. API */
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_PKTINFO, &on, if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_PKTINFO, &on,
sizeof(on)) < 0) sizeof(on)) < 0)
err(1, "setsockopt(IPV6_PKTINFO)"); err(1, "setsockopt(IPV6_PKTINFO)");
#endif #endif
/* specify to tell value of hoplimit field of received IP6 hdr */ /* specify to tell value of hoplimit field of received IP6 hdr */
oshogboUnsubmitted
Not Done
Inline Actions

We are mixing defines, Why?

oshogbo: We are mixing defines, Why?
#ifdef IPV6_RECVHOPLIMIT #ifdef IPV6_RECVHOPLIMIT
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on, if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on,
sizeof(on)) < 0) sizeof(on)) < 0)
err(1, "setsockopt(IPV6_RECVHOPLIMIT)"); err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
#else /* old adv. API */ #else /* old adv. API */
if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_HOPLIMIT, &on, if (setsockopt(rcvsock, IPPROTO_IPV6, IPV6_HOPLIMIT, &on,
sizeof(on)) < 0) sizeof(on)) < 0)
err(1, "setsockopt(IPV6_HOPLIMIT)"); err(1, "setsockopt(IPV6_HOPLIMIT)");
▲ Show 20 Lines • Show All 151 Lines • ▼ Show 20 Lines#endif
/* /*
* Open socket to send probe packets. * Open socket to send probe packets.
*/ */
switch (useproto) { switch (useproto) {
case IPPROTO_ICMPV6: case IPPROTO_ICMPV6:
sndsock = rcvsock; sndsock = rcvsock;
break; break;
case IPPROTO_UDP: case IPPROTO_UDP:
if ((sndsock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { if ((sndsock = socket(AF_INET6, SOCK_RAW, IPPROTO_UDP)) < 0) {
perror("socket(SOCK_DGRAM)"); perror("socket(SOCK_RAW)");
exit(5); exit(5);
} }
break; break;
case IPPROTO_NONE: case IPPROTO_NONE:
case IPPROTO_SCTP: case IPPROTO_SCTP:
case IPPROTO_TCP: case IPPROTO_TCP:
if ((sndsock = socket(AF_INET6, SOCK_RAW, useproto)) < 0) { if ((sndsock = socket(AF_INET6, SOCK_RAW, useproto)) < 0) {
perror("socket(SOCK_RAW)"); perror("socket(SOCK_RAW)");
Show All 28 Lines#else
setlinebuf(stdout); setlinebuf(stdout);
#endif #endif
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = PF_INET6; hints.ai_family = PF_INET6;
hints.ai_socktype = SOCK_RAW; hints.ai_socktype = SOCK_RAW;
hints.ai_protocol = IPPROTO_ICMPV6; hints.ai_protocol = IPPROTO_ICMPV6;
hints.ai_flags = AI_CANONNAME; hints.ai_flags = AI_CANONNAME;
error = getaddrinfo(*argv, NULL, &hints, &res);
if(capdns != NULL){
oshogboUnsubmitted
Not Done
Inline Actions

What if casper doesn't exists? We still want to do getaddrinfo instead of cap_getaddrinfo right?
If casper is not build in all the cap_getaddrinfo will be replaced with getaddrinfo. So this check introduce a bug.

oshogbo: What if casper doesn't exists? We still want to do getaddrinfo instead of cap_getaddrinfo right?
error = cap_getaddrinfo(capdns, *argv, NULL, &hints, &res);
oshogboUnsubmitted
Not Done
Inline Actions

Style

if (capdns != NULL) {

oshogbo: Style if (capdns != NULL) {
}
oshogboUnsubmitted
Not Done
Inline Actions

If you would build this without HAVE_LIBCASPER the casper/cap_dns.h would not be included and this function prototype wouldn't exists.

oshogbo: If you would build this without HAVE_LIBCASPER the casper/cap_dns.h would not be included and…
if (error) { if (error) {
fprintf(stderr, fprintf(stderr,
"traceroute6: %s\n", gai_strerror(error)); "traceroute6: %s\n", gai_strerror(error));
exit(1); exit(1);
} }
if (res->ai_addrlen != sizeof(Dst)) { if (res->ai_addrlen != sizeof(Dst)) {
fprintf(stderr, fprintf(stderr,
"traceroute6: size of sockaddr mismatch\n"); "traceroute6: size of sockaddr mismatch\n");
exit(1); exit(1);
} }
memcpy(&Dst, res->ai_addr, res->ai_addrlen); memcpy(&Dst, res->ai_addr, res->ai_addrlen);
hostname = res->ai_canonname ? strdup(res->ai_canonname) : *argv; hostname = res->ai_canonname ? strdup(res->ai_canonname) : *argv;
if (!hostname) { if (!hostname) {
fprintf(stderr, "traceroute6: not enough core\n"); fprintf(stderr, "traceroute6: not enough core\n");
exit(1); exit(1);
} }
if (res->ai_next) { if (res->ai_next) {
if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, if (cap_getnameinfo(capdns, res->ai_addr, res->ai_addrlen, hbuf,
sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
strlcpy(hbuf, "?", sizeof(hbuf)); strlcpy(hbuf, "?", sizeof(hbuf));
fprintf(stderr, "traceroute6: Warning: %s has multiple " fprintf(stderr, "traceroute6: Warning: %s has multiple "
"addresses; using %s\n", hostname, hbuf); "addresses; using %s\n", hostname, hbuf);
} }
if (*++argv) { if (*++argv) {
ep = NULL; ep = NULL;
▲ Show 20 Lines • Show All 169 Lines • ▼ Show 20 Lines#endif /*IPSEC*/
if (source) { if (source) {
struct addrinfo hints, *res; struct addrinfo hints, *res;
int error; int error;
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET6; hints.ai_family = AF_INET6;
hints.ai_socktype = SOCK_DGRAM; /*dummy*/ hints.ai_socktype = SOCK_DGRAM; /*dummy*/
hints.ai_flags = AI_NUMERICHOST; hints.ai_flags = AI_NUMERICHOST;
error = getaddrinfo(source, "0", &hints, &res); error = cap_getaddrinfo(capdns, source, "0", &hints, &res);
if (error) { if (error) {
printf("traceroute6: %s: %s\n", source, printf("traceroute6: %s: %s\n", source,
gai_strerror(error)); gai_strerror(error));
exit(1); exit(1);
} }
if (res->ai_addrlen > sizeof(Src)) { if (res->ai_addrlen > sizeof(Src)) {
printf("traceroute6: %s: %s\n", source, printf("traceroute6: %s: %s\n", source,
gai_strerror(error)); gai_strerror(error));
Show All 19 Lines if (connect(dummy, (struct sockaddr *)&Nxt, Nxt.sin6_len) < 0) {
perror("connect"); perror("connect");
exit(1); exit(1);
} }
len = sizeof(Src); len = sizeof(Src);
if (getsockname(dummy, (struct sockaddr *)&Src, &len) < 0) { if (getsockname(dummy, (struct sockaddr *)&Src, &len) < 0) {
perror("getsockname"); perror("getsockname");
exit(1); exit(1);
} }
if (getnameinfo((struct sockaddr *)&Src, Src.sin6_len, if (cap_getnameinfo(capdns, (struct sockaddr *)&Src, Src.sin6_len,
src0, sizeof(src0), NULL, 0, NI_NUMERICHOST)) { src0, sizeof(src0), NULL, 0, NI_NUMERICHOST)) {
fprintf(stderr, "getnameinfo failed for source\n"); fprintf(stderr, "getnameinfo failed for source\n");
exit(1); exit(1);
} }
source = src0; source = src0;
close(dummy); close(dummy);
} }
Show All 23 Lines if (asn == NULL) {
(void)fflush(stderr); (void)fflush(stderr);
as_path = 0; as_path = 0;
} }
} }
/* /*
* Message to users * Message to users
*/ */
if (getnameinfo((struct sockaddr *)&Dst, Dst.sin6_len, hbuf, if (cap_getnameinfo(capdns, (struct sockaddr *)&Dst, Dst.sin6_len, hbuf,
sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) sizeof(hbuf), NULL, 0, NI_NUMERICHOST))
strlcpy(hbuf, "(invalid)", sizeof(hbuf)); strlcpy(hbuf, "(invalid)", sizeof(hbuf));
fprintf(stderr, "traceroute6"); fprintf(stderr, "traceroute6");
fprintf(stderr, " to %s (%s)", hostname, hbuf); fprintf(stderr, " to %s (%s)", hostname, hbuf);
if (source) if (source)
fprintf(stderr, " from %s", source); fprintf(stderr, " from %s", source);
fprintf(stderr, ", %lu hops max, %lu byte packets\n", fprintf(stderr, ", %lu hops max, %lu byte packets\n",
max_hops, max_hops,
datalen + ((useproto == IPPROTO_UDP) ? sizeof(struct udphdr) : 0)); datalen + ((useproto == IPPROTO_UDP) ? sizeof(struct udphdr) : 0));
(void) fflush(stderr); (void) fflush(stderr);
if (first_hop > 1) if (first_hop > 1)
printf("Skipping %lu intermediate hops\n", first_hop - 1); printf("Skipping %lu intermediate hops\n", first_hop - 1);
if (connect(sndsock, (struct sockaddr *)&Dst,
sizeof(Dst)) != 0) {
fprintf(stderr, "connect: %s\n", strerror(errno));
exit(1);
}
/* /*
* Here we enter capability mode. Further down access to global
* namespaces (e.g filesystem) is restricted (see capsicum(4)).
* We must connect(2) our socket before this point.
*/
if (cap_enter() < 0 && errno != ENOSYS) {
oshogboUnsubmitted
Not Done
Inline Actions

If we don't use cansandbox anymore, then maybe better would be using caph_enter_casper?

oshogbo: If we don't use cansandbox anymore, then maybe better would be using caph_enter_casper?
oshogboUnsubmitted
Not Done
Inline Actions

When using caph_* you don't need to check for errno:

The caph_enter, caph_rights_limit, caph_ioctls_limit and
caph_fcntls_limit are respectively equivalent to cap_enter(2),
cap_rights_limit(2), cap_ioctls_limit(2) and cap_fcntls_limit(2), it
returns success when the kernel is built without support of the
capability mode.
oshogbo: When using caph_* you don't need to check for errno: ``` The caph_enter…
fprintf(stderr, "cap_enter: %s\n", strerror(errno));
exit(1);
}
cap_rights_init(&rights, CAP_SEND, CAP_SETSOCKOPT);
if (cap_rights_limit(sndsock, &rights) < 0) {
oshogboUnsubmitted
Not Done
Inline Actions

We have to check errno or use caph_rights_limit

oshogbo: We have to check errno or use caph_rights_limit
fprintf(stderr, "cap_rights_limit sndsock: %s\n",
strerror(errno));
exit(1);
}
oshogboUnsubmitted
Not Done
Inline Actions

When using cap_enter you have to check for errno as well, the system may be build without the capsicum support.

oshogbo: When using cap_enter you have to check for errno as well, the system may be build without the…
/*
* Main loop * Main loop
*/ */
for (hops = first_hop; hops <= max_hops; ++hops) { for (hops = first_hop; hops <= max_hops; ++hops) {
struct in6_addr lastaddr; struct in6_addr lastaddr;
int got_there = 0; int got_there = 0;
oshogboUnsubmitted
Not Done
Inline Actions

When using cap_enter you have to check for errno as well, the system may be build without the capsicum support.
There is no need to check 'cansandbox' here. If we are unable to enter capability mode we can still limit descriptors.

oshogbo: When using cap_enter you have to check for errno as well, the system may be build without the…
unsigned unreachable = 0; unsigned unreachable = 0;
printf("%2lu ", hops); printf("%2lu ", hops);
bzero(&lastaddr, sizeof(lastaddr)); bzero(&lastaddr, sizeof(lastaddr));
for (probe = 0; probe < nprobes; ++probe) { for (probe = 0; probe < nprobes; ++probe) {
int cc; int cc;
struct timeval t1, t2; struct timeval t1, t2;
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
#endif #endif
#endif #endif
void void
send_probe(int seq, u_long hops) send_probe(int seq, u_long hops)
{ {
struct icmp6_hdr *icp; struct icmp6_hdr *icp;
struct sctphdr *sctp; struct sctphdr *sctp;
struct udphdr *outudp;
struct sctp_chunkhdr *chk; struct sctp_chunkhdr *chk;
struct sctp_init_chunk *init; struct sctp_init_chunk *init;
struct sctp_paramhdr *param; struct sctp_paramhdr *param;
struct tcphdr *tcp; struct tcphdr *tcp;
int i; int i;
i = hops; i = hops;
if (setsockopt(sndsock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, if (setsockopt(sndsock, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
Show All 9 Lines case IPPROTO_ICMPV6:
icp->icmp6_type = ICMP6_ECHO_REQUEST; icp->icmp6_type = ICMP6_ECHO_REQUEST;
icp->icmp6_code = 0; icp->icmp6_code = 0;
icp->icmp6_cksum = 0; icp->icmp6_cksum = 0;
icp->icmp6_id = ident; icp->icmp6_id = ident;
icp->icmp6_seq = htons(seq); icp->icmp6_seq = htons(seq);
break; break;
case IPPROTO_UDP: case IPPROTO_UDP:
outudp = (struct udphdr *) outpacket;
outudp->uh_sport = htons(ident);
outudp->uh_dport = htons(port+seq);
outudp->uh_ulen = htons(datalen);
outudp->uh_sum = udp_cksum(&Src, &Dst, outpacket, datalen);
break; break;
case IPPROTO_NONE: case IPPROTO_NONE:
/* No space for anything. No harm as seq/tv32 are decorative. */ /* No space for anything. No harm as seq/tv32 are decorative. */
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
sctp = (struct sctphdr *)outpacket; sctp = (struct sctphdr *)outpacket;
sctp->src_port = htons(ident); sctp->src_port = htons(ident);
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines case IPPROTO_TCP:
tcp->th_flags = TH_SYN; tcp->th_flags = TH_SYN;
tcp->th_sum = 0; tcp->th_sum = 0;
tcp->th_sum = tcp_chksum(&Src, &Dst, outpacket, datalen); tcp->th_sum = tcp_chksum(&Src, &Dst, outpacket, datalen);
break; break;
default: default:
fprintf(stderr, "Unknown probe protocol %d.\n", useproto); fprintf(stderr, "Unknown probe protocol %d.\n", useproto);
exit(1); exit(1);
} }
i = sendto(sndsock, (char *)outpacket, datalen, 0, i = send(sndsock, (char *)outpacket, datalen, 0);
(struct sockaddr *)&Dst, Dst.sin6_len);
if (i < 0 || (u_long)i != datalen) { if (i < 0 || (u_long)i != datalen) {
if (i < 0) if (i < 0)
perror("sendto"); perror("send");
printf("traceroute6: wrote %s %lu chars, ret=%d\n", printf("traceroute6: wrote %s %lu chars, ret=%d\n",
hostname, datalen, i); hostname, datalen, i);
(void) fflush(stdout); (void) fflush(stdout);
} }
} }
int int
get_hoplim(struct msghdr *mhdr) get_hoplim(struct msghdr *mhdr)
▲ Show 20 Lines • Show All 95 Lines • ▼ Show 20 Lines#ifdef OLDRAWSOCKET
struct ip6_hdr *ip; struct ip6_hdr *ip;
#endif #endif
#ifdef OLDRAWSOCKET #ifdef OLDRAWSOCKET
ip = (struct ip6_hdr *) buf; ip = (struct ip6_hdr *) buf;
hlen = sizeof(struct ip6_hdr); hlen = sizeof(struct ip6_hdr);
if (cc < hlen + sizeof(struct icmp6_hdr)) { if (cc < hlen + sizeof(struct icmp6_hdr)) {
if (verbose) { if (verbose) {
if (getnameinfo((struct sockaddr *)from, from->sin6_len, if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len,
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
strlcpy(hbuf, "invalid", sizeof(hbuf)); strlcpy(hbuf, "invalid", sizeof(hbuf));
printf("packet too short (%d bytes) from %s\n", cc, printf("packet too short (%d bytes) from %s\n", cc,
hbuf); hbuf);
} }
return (0); return (0);
} }
cc -= hlen; cc -= hlen;
icp = (struct icmp6_hdr *)(buf + hlen); icp = (struct icmp6_hdr *)(buf + hlen);
#else #else
if (cc < (int)sizeof(struct icmp6_hdr)) { if (cc < (int)sizeof(struct icmp6_hdr)) {
if (verbose) { if (verbose) {
if (getnameinfo((struct sockaddr *)from, from->sin6_len, if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len,
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
strlcpy(hbuf, "invalid", sizeof(hbuf)); strlcpy(hbuf, "invalid", sizeof(hbuf));
printf("data too short (%d bytes) from %s\n", cc, hbuf); printf("data too short (%d bytes) from %s\n", cc, hbuf);
} }
return (0); return (0);
} }
icp = (struct icmp6_hdr *)buf; icp = (struct icmp6_hdr *)buf;
#endif #endif
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 Lines if ((*type == ICMP6_TIME_EXCEEDED &&
case IPPROTO_ICMPV6: case IPPROTO_ICMPV6:
icmp = (struct icmp6_hdr *)up; icmp = (struct icmp6_hdr *)up;
if (icmp->icmp6_id == ident && if (icmp->icmp6_id == ident &&
icmp->icmp6_seq == htons(seq)) icmp->icmp6_seq == htons(seq))
return (1); return (1);
break; break;
case IPPROTO_UDP: case IPPROTO_UDP:
udp = (struct udphdr *)up; udp = (struct udphdr *)up;
if (udp->uh_sport == htons(srcport) && if (udp->uh_sport == htons(ident) &&
udp->uh_dport == htons(port + seq)) udp->uh_dport == htons(port + seq))
return (1); return (1);
break; break;
case IPPROTO_SCTP: case IPPROTO_SCTP:
sctp = (struct sctphdr *)up; sctp = (struct sctphdr *)up;
if (sctp->src_port != htons(ident) || if (sctp->src_port != htons(ident) ||
sctp->dest_port != htons(port + seq)) { sctp->dest_port != htons(port + seq)) {
break; break;
Show All 39 Lines if (icp->icmp6_id == ident &&
icp->icmp6_seq == htons(seq)) icp->icmp6_seq == htons(seq))
return (1); return (1);
} }
if (verbose) { if (verbose) {
char sbuf[NI_MAXHOST+1], dbuf[INET6_ADDRSTRLEN]; char sbuf[NI_MAXHOST+1], dbuf[INET6_ADDRSTRLEN];
u_int8_t *p; u_int8_t *p;
int i; int i;
if (getnameinfo((struct sockaddr *)from, from->sin6_len, if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len,
sbuf, sizeof(sbuf), NULL, 0, NI_NUMERICHOST) != 0) sbuf, sizeof(sbuf), NULL, 0, NI_NUMERICHOST) != 0)
strlcpy(sbuf, "invalid", sizeof(sbuf)); strlcpy(sbuf, "invalid", sizeof(sbuf));
printf("\n%d bytes from %s to %s", cc, sbuf, printf("\n%d bytes from %s to %s", cc, sbuf,
rcvpktinfo ? inet_ntop(AF_INET6, &rcvpktinfo->ipi6_addr, rcvpktinfo ? inet_ntop(AF_INET6, &rcvpktinfo->ipi6_addr,
dbuf, sizeof(dbuf)) : "?"); dbuf, sizeof(dbuf)) : "?");
printf(": icmp type %d (%s) code %d\n", *type, pr_type(*type), printf(": icmp type %d (%s) code %d\n", *type, pr_type(*type),
*code); *code);
p = (u_int8_t *)(icp + 1); p = (u_int8_t *)(icp + 1);
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Lines while (lim - cp >= (nh == IPPROTO_NONE ? 0 : 8)) {
cp += hlen; cp += hlen;
} }
return (NULL); return (NULL);
} }
void void
print(struct msghdr *mhdr, int cc) print(struct msghdr *mhdr, int cc)
markjUnsubmitted
Not Done
Inline Actions

The parameter list should be void to match the declaration.

This function should also be static, like you did for the global variables, but I see that other functions in this file are not defined static, so we can fix it later all at once.

markj: The parameter list should be `void` to match the declaration. This function should also be…
{ {
struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name; struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name;
markjUnsubmitted
Not Done
Inline Actions

Shouldn't it be "NAME2ADDR" and "ADDR2NAME"? The old limit names are supported for backward compatibility, but we should avoid adding new usages.

markj: Shouldn't it be "NAME2ADDR" and "ADDR2NAME"? The old limit names are supported for backward…
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
if (getnameinfo((struct sockaddr *)from, from->sin6_len, if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len,
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
strlcpy(hbuf, "invalid", sizeof(hbuf)); strlcpy(hbuf, "invalid", sizeof(hbuf));
if (as_path) if (as_path)
printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6)); printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6));
if (nflag) if (nflag)
printf(" %s", hbuf); printf(" %s", hbuf);
else if (lflag) else if (lflag)
printf(" %s (%s)", inetname((struct sockaddr *)from), hbuf); printf(" %s (%s)", inetname((struct sockaddr *)from), hbuf);
Show All 30 Lines if (first && !nflag) {
if (gethostname(domain, sizeof(domain)) == 0 && if (gethostname(domain, sizeof(domain)) == 0 &&
(cp = strchr(domain, '.'))) (cp = strchr(domain, '.')))
(void) strlcpy(domain, cp + 1, sizeof(domain)); (void) strlcpy(domain, cp + 1, sizeof(domain));
else else
domain[0] = 0; domain[0] = 0;
} }
cp = NULL; cp = NULL;
if (!nflag) { if (!nflag) {
if (getnameinfo(sa, sa->sa_len, line, sizeof(line), NULL, 0, if (cap_getnameinfo(capdns, sa, sa->sa_len, line, sizeof(line), NULL, 0,
NI_NAMEREQD) == 0) { NI_NAMEREQD) == 0) {
if ((cp = strchr(line, '.')) && if ((cp = strchr(line, '.')) &&
!strcmp(cp + 1, domain)) !strcmp(cp + 1, domain))
*cp = 0; *cp = 0;
cp = line; cp = line;
} }
} }
if (cp) if (cp)
return cp; return cp;
if (getnameinfo(sa, sa->sa_len, line, sizeof(line), NULL, 0, if (cap_getnameinfo(capdns, sa, sa->sa_len, line, sizeof(line), NULL, 0,
NI_NUMERICHOST) != 0) NI_NUMERICHOST) != 0)
strlcpy(line, "invalid", sizeof(line)); strlcpy(line, "invalid", sizeof(line));
return line; return line;
} }
/* /*
* CRC32C routine for the Stream Control Transmission Protocol * CRC32C routine for the Stream Control Transmission Protocol
*/ */
▲ Show 20 Lines • Show All 111 Lines • ▼ Show 20 Linesin_cksum(u_int16_t *addr, int len)
/* /*
* add back carry outs from top 16 bits to low 16 bits * add back carry outs from top 16 bits to low 16 bits
*/ */
sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */ sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
sum += (sum >> 16); /* add carry */ sum += (sum >> 16); /* add carry */
answer = ~sum; /* truncate to 16 bits */ answer = ~sum; /* truncate to 16 bits */
return (answer); return (answer);
}
u_int16_t
udp_cksum(struct sockaddr_in6 *src, struct sockaddr_in6 *dst,
void *payload, u_int32_t len)
{
struct {
struct in6_addr src;
struct in6_addr dst;
u_int32_t len;
u_int8_t zero[3];
u_int8_t next;
} pseudo_hdr;
u_int16_t sum[2];
pseudo_hdr.src = src->sin6_addr;
pseudo_hdr.dst = dst->sin6_addr;
pseudo_hdr.len = htonl(len);
pseudo_hdr.zero[0] = 0;
pseudo_hdr.zero[1] = 0;
pseudo_hdr.zero[2] = 0;
pseudo_hdr.next = IPPROTO_UDP;
sum[1] = in_cksum((u_int16_t *)&pseudo_hdr, sizeof(pseudo_hdr));
sum[0] = in_cksum(payload, len);
return (~in_cksum(sum, sizeof(sum)));
} }
u_int16_t u_int16_t
tcp_chksum(struct sockaddr_in6 *src, struct sockaddr_in6 *dst, tcp_chksum(struct sockaddr_in6 *src, struct sockaddr_in6 *dst,
void *payload, u_int32_t len) void *payload, u_int32_t len)
{ {
struct { struct {
struct in6_addr src; struct in6_addr src;
Show All 31 Lines