d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespace change. No functional change.

Browse Source 
MFC after:		2 weeks
This commit is contained in:
Michael Tuexen 2019-07-16 10:06:41 +00:00
parent a70e114dc6
commit 83c022b5c0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/traceroute6/traceroute6.c
View File

@ -1006,7 +1006,7 @@ wait_for_reply(int sock, struct msghdr *mhdr)
if (poll(pfd, 1, waittime * 1000) > 0)
cc = recvmsg(rcvsock, mhdr, 0);
return(cc);
return (cc);
#else
fd_set *fdsp;
struct timeval wait;
@ -1023,7 +1023,7 @@ wait_for_reply(int sock, struct msghdr *mhdr)
cc = recvmsg(rcvsock, mhdr, 0);
free(fdsp);
return(cc);
return (cc);
#endif
}
@ -1189,10 +1189,10 @@ get_hoplim(struct msghdr *mhdr)
if (cm->cmsg_level == IPPROTO_IPV6 &&
cm->cmsg_type == IPV6_HOPLIMIT &&
cm->cmsg_len == CMSG_LEN(sizeof(int)))
return(*(int *)CMSG_DATA(cm));
return (*(int *)CMSG_DATA(cm));
}
return(-1);
return (-1);
}
double
@ -1303,7 +1303,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
strlcpy(hbuf, "invalid", sizeof(hbuf));
printf("data too short (%d bytes) from %s\n", cc, hbuf);
}
return(0);
return (0);
}
icp = (struct icmp6_hdr *)buf;
#endif
@ -1326,7 +1326,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
if (rcvpktinfo == NULL || hlimp == NULL) {
warnx("failed to get received hop limit or packet info");
#if 0
return(0);
return (0);
#else
rcvhlim = 0; /*XXX*/
#endif
@ -1350,7 +1350,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
if ((up = get_uphdr(hip, (u_char *)(buf + cc))) == NULL) {
if (verbose)
warnx("failed to get upper layer header");
return(0);
return (0);
}
switch (useproto) {
case IPPROTO_ICMPV6:
@ -1445,7 +1445,7 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
if (cc % WIDTH != 0)
printf("\n");
}
return(0);
return (0);
}
/*
@ -1459,7 +1459,7 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim)
static u_char none_hdr[1]; /* Fake pointer for IPPROTO_NONE. */
if (cp + sizeof(*ip6) > lim)
return(NULL);
return (NULL);
nh = ip6->ip6_nxt;
cp += sizeof(struct ip6_hdr);
@ -1467,15 +1467,15 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim)
while (lim - cp >= (nh == IPPROTO_NONE ? 0 : 8)) {
switch (nh) {
case IPPROTO_ESP:
return(NULL);
return (NULL);
case IPPROTO_ICMPV6:
return(useproto == nh ? cp : NULL);
return (useproto == nh ? cp : NULL);
case IPPROTO_SCTP:
case IPPROTO_TCP:
case IPPROTO_UDP:
return(useproto == nh ? cp : NULL);
return (useproto == nh ? cp : NULL);
case IPPROTO_NONE:
return(useproto == nh ? none_hdr : NULL);
return (useproto == nh ? none_hdr : NULL);
case IPPROTO_FRAGMENT:
hlen = sizeof(struct ip6_frag);
nh = ((struct ip6_frag *)cp)->ip6f_nxt;
@ -1493,7 +1493,7 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim)
cp += hlen;
}
return(NULL);
return (NULL);
}
void