diff options
| author | Martin Mares <mj@ucw.cz> | 1999-12-16 13:51:43 +0000 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 1999-12-16 13:51:43 +0000 |
| commit | 476e10842503b51331a7994b6e25c91b20eb8e71 (patch) | |
| tree | e9858a156a032f27a213c8932b5fc5021b2343d3 /sysdep | |
| parent | e693ddff874890a9e5c990f6ca75d2e2358d065a (diff) | |
Minor cleanups.
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/linux/krt-scan.c | 2 | ||||
| -rw-r--r-- | sysdep/linux/netlink/netlink.c | 7 | ||||
| -rw-r--r-- | sysdep/unix/krt-iface.c | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sysdep/linux/krt-scan.c b/sysdep/linux/krt-scan.c index 3f3def1a..10a40b7a 100644 --- a/sysdep/linux/krt-scan.c +++ b/sysdep/linux/krt-scan.c @@ -103,7 +103,7 @@ krt_parse_entry(byte *ent, struct krt_proto *p) if (ng) a.iface = ng->iface; else - /* FIXME: Remove this warning? */ + /* FIXME: Remove this warning? Handle it somehow... */ log(L_WARN "Kernel told us to use non-neighbor %I for %I/%d", gw, net->n.prefix, net->n.pxlen); a.dest = RTD_ROUTER; a.gw = gw; diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c index 25d8fc03..11973e93 100644 --- a/sysdep/linux/netlink/netlink.c +++ b/sysdep/linux/netlink/netlink.c @@ -30,7 +30,7 @@ #include <linux/netlink.h> #include <linux/rtnetlink.h> -#ifndef MSG_TRUNC /* FIXME: Hack to circumvent omissions in glibc includes */ +#ifndef MSG_TRUNC /* Hack: Several versions of glibc miss this one :( */ #define MSG_TRUNC 0x20 #endif @@ -143,7 +143,7 @@ nl_error(struct nlmsghdr *h) e = (struct nlmsgerr *) NLMSG_DATA(h); ec = -e->error; if (ec) - log(L_WARN "Netlink: %s", strerror(ec)); /* FIXME: Shut up? */ + log(L_WARN "Netlink: %s", strerror(ec)); return ec; } @@ -472,7 +472,6 @@ nl_send_route(struct krt_proto *p, rte *e, int new) r.h.nlmsg_type = new ? RTM_NEWROUTE : RTM_DELROUTE; r.h.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)); r.h.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | (new ? NLM_F_CREATE|NLM_F_REPLACE : 0); - /* FIXME: Do we really need to process ACKs? */ r.r.rtm_family = BIRD_AF; r.r.rtm_dst_len = net->n.pxlen; @@ -666,7 +665,7 @@ nl_parse_route(struct nlmsghdr *h, int scan) if (ng) ra.iface = ng->iface; else - /* FIXME: Remove this warning? */ + /* FIXME: Remove this warning? Handle it somehow... */ log(L_WARN "Kernel told us to use non-neighbor %I for %I/%d", ra.gw, net->n.prefix, net->n.pxlen); } else diff --git a/sysdep/unix/krt-iface.c b/sysdep/unix/krt-iface.c index e9df6e43..8c82ffdf 100644 --- a/sysdep/unix/krt-iface.c +++ b/sysdep/unix/krt-iface.c @@ -191,7 +191,11 @@ krt_if_scan(struct kif_proto *p) break; } } -#ifdef CLEAN_WAY_WORKING_ONLY_ON_LINUX_2_1 /* FIXME */ +#if 0 + /* + * Linux 2.1 and higher supports this, but it's not needed since + * we prefer to use Netlink there anyway. + */ ic.ifc_req = NULL; ic.ifc_len = 999999999; if (ioctl(if_scan_sock, SIOCGIFCONF, &ic) < 0) |