diff options
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/cf/linux-v6.h | 9 | ||||
| -rw-r--r-- | sysdep/linux/netlink/netlink.c | 13 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 4 |
3 files changed, 17 insertions, 9 deletions
diff --git a/sysdep/cf/linux-v6.h b/sysdep/cf/linux-v6.h index 69ab0f8..ef52ee4 100644 --- a/sysdep/cf/linux-v6.h +++ b/sysdep/cf/linux-v6.h @@ -8,9 +8,16 @@ #define IPV6 -#define CONFIG_TOS #define CONFIG_AUTO_ROUTES #define CONFIG_ALL_MULTICAST +#define CONFIG_SELF_CONSCIOUS + +/* + * Netlink supports multiple tables, but kernel IPv6 code doesn't, so we + * treat it as a multiple table system with number of tables set to 1. + */ +#define CONFIG_MULTIPLE_TABLES +#define CONFIG_ALL_TABLES_AT_ONCE /* Link: sysdep/linux/netlink diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index 6682dbc..f71f1f5 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -242,7 +242,7 @@ nl_add_attr_ipa(struct nlmsghdr *h, unsigned maxsize, int code, ip_addr ipa) a = (struct rtattr *)((char *)h + NLMSG_ALIGN(h->nlmsg_len)); a->rta_type = code; a->rta_len = len; - ipa = ipa_hton(ipa); + ipa_hton(ipa); memcpy(RTA_DATA(a), &ipa, sizeof(ipa)); h->nlmsg_len = NLMSG_ALIGN(h->nlmsg_len) + len; } @@ -351,17 +351,18 @@ nl_parse_addr(struct nlmsghdr *h) if (i->ifa_flags & IFA_F_SECONDARY) ifa.flags |= IA_SECONDARY; memcpy(&ifa.ip, RTA_DATA(a[IFA_LOCAL]), sizeof(ifa.ip)); - ifa.ip = ipa_ntoh(ifa.ip); + ipa_ntoh(ifa.ip); ifa.pxlen = i->ifa_prefixlen; if (ifi->flags & IF_UNNUMBERED) { memcpy(&ifa.opposite, RTA_DATA(a[IFA_ADDRESS]), sizeof(ifa.opposite)); - ifa.opposite = ifa.brd = ipa_ntoh(ifa.opposite); + ipa_ntoh(ifa.opposite); + ifa.brd = ifa.opposite; } else if ((ifi->flags & IF_BROADCAST) && a[IFA_BROADCAST]) { memcpy(&ifa.brd, RTA_DATA(a[IFA_BROADCAST]), sizeof(ifa.brd)); - ifa.brd = ipa_ntoh(ifa.brd); + ipa_ntoh(ifa.brd); } /* else a NBMA link */ ifa.prefix = ipa_and(ifa.ip, ipa_mkmask(ifa.pxlen)); @@ -575,7 +576,7 @@ nl_parse_route(struct nlmsghdr *h, int scan) if (a[RTA_DST]) { memcpy(&dst, RTA_DATA(a[RTA_DST]), sizeof(dst)); - dst = ipa_ntoh(dst); + ipa_ntoh(dst); } else dst = IPA_NONE; @@ -630,7 +631,7 @@ nl_parse_route(struct nlmsghdr *h, int scan) neighbor *ng; ra.dest = RTD_ROUTER; memcpy(&ra.gw, RTA_DATA(a[RTA_GATEWAY]), sizeof(ra.gw)); - ra.gw = ipa_ntoh(ra.gw); + ipa_ntoh(ra.gw); ng = neigh_find(&p->p, &ra.gw, 0); if (ng) ra.iface = ng->iface; diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index 39cf200..3e070fa 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -314,7 +314,7 @@ sk_new(pool *p) static inline void set_inaddr(struct in_addr *ia, ip_addr a) { - a = ipa_hton(a); + ipa_hton(a); memcpy(&ia->s_addr, &a, sizeof(a)); } @@ -334,7 +334,7 @@ get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port) if (port) *port = ntohs(sa->sin_port); memcpy(a, &sa->sin_addr.s_addr, sizeof(*a)); - *a = ipa_ntoh(*a); + ipa_ntoh(*a); } static char * |