rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 18:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2017-06-01

Browse Source 
Git mirror commit dfb26efac4ce9101dda240e94d9ab53f80a9e131.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-07 12:12:37 +02:00
parent a25e6a9d18
commit de261e0404
257 changed files with 3909 additions and 2604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
freebsd/sbin/route/route.c
View File

@@ -1556,10 +1556,7 @@ rtmsg(int cmd, int flags, int fib)
#define NEXTADDR(w, u) \
if (rtm_addrs & (w)) { \
l = (((struct sockaddr *)&(u))->sa_len == 0) ? \
sizeof(long) : \
1 + ((((struct sockaddr *)&(u))->sa_len - 1) \
| (sizeof(long) - 1)); \
l = SA_SIZE(&(u)); \
memmove(cp, (char *)&(u), l); \
cp += l; \
if (verbose) \
@@ -1625,7 +1622,8 @@ rtmsg(int cmd, int flags, int fib)
do {
l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
} while (l > 0 && stop_read == 0 &&
(rtm.rtm_seq != rtm_seq || rtm.rtm_pid != pid));
(rtm.rtm_type != RTM_GET || rtm.rtm_seq != rtm_seq ||
rtm.rtm_pid != pid));
#ifndef __rtems__
if (stop_read != 0) {
warnx("read from routing socket timed out");
@@ -1769,10 +1767,13 @@ print_rtmsg(struct rt_msghdr *rtm, size_t msglen)
break;
default:
printf("pid: %ld, seq %d, errno %d, flags:",
(long)rtm->rtm_pid, rtm->rtm_seq, rtm->rtm_errno);
printb(rtm->rtm_flags, routeflags);
pmsg_common(rtm, msglen);
if (rtm->rtm_type <= RTM_RESOLVE) {
printf("pid: %ld, seq %d, errno %d, flags:",
(long)rtm->rtm_pid, rtm->rtm_seq, rtm->rtm_errno);
printb(rtm->rtm_flags, routeflags);
pmsg_common(rtm, msglen);
} else
printf("type: %u, len: %zu\n", rtm->rtm_type, msglen);
}
return;