mirror of
https://github.com/sheumann/hush.git
synced 2024-06-11 04:29:30 +00:00
route: improve -A inet6
Upstream route command shows non-up routes, it shows reject and nonexthop flags. And we had "ref" and "use" values mixed up... function old new delta flagvals 32 44 +12 flagchars 9 12 +3 INET_setroute 767 768 +1 INET6_setroute 495 496 +1 set_flags 43 39 -4 flags_ipvx 16 8 -8 route_main 632 623 -9 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/3 up/down: 17/-21) Total: -4 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
b62d4d9d57
commit
09020b1aa8
|
@ -55,6 +55,7 @@
|
||||||
#define RTF_WINDOW 0x0080 /* per route window clamping */
|
#define RTF_WINDOW 0x0080 /* per route window clamping */
|
||||||
#define RTF_IRTT 0x0100 /* Initial round trip time */
|
#define RTF_IRTT 0x0100 /* Initial round trip time */
|
||||||
#define RTF_REJECT 0x0200 /* Reject route */
|
#define RTF_REJECT 0x0200 /* Reject route */
|
||||||
|
#define RTF_NONEXTHOP 0x00200000 /* route with no nexthop */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SIOCADDRTOLD) || defined(RTF_IRTT) /* route */
|
#if defined(SIOCADDRTOLD) || defined(RTF_IRTT) /* route */
|
||||||
|
@ -128,7 +129,7 @@ static const char tbl_ipvx[] ALIGN1 =
|
||||||
"\013\043reinstate" /* Since last, we can save a byte. */
|
"\013\043reinstate" /* Since last, we can save a byte. */
|
||||||
;
|
;
|
||||||
|
|
||||||
static const int flags_ipvx[] = { /* MUST match tbl_ipvx[] values above. */
|
static const uint16_t flags_ipvx[] = { /* MUST match tbl_ipvx[] values above. */
|
||||||
#ifdef RTF_REJECT
|
#ifdef RTF_REJECT
|
||||||
RTF_REJECT,
|
RTF_REJECT,
|
||||||
#endif
|
#endif
|
||||||
|
@ -449,7 +450,11 @@ static NOINLINE void INET6_setroute(int action, char **args)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const unsigned flagvals[] = { /* Must agree with flagchars[]. */
|
static const
|
||||||
|
IF_NOT_FEATURE_IPV6(uint16_t)
|
||||||
|
IF_FEATURE_IPV6(unsigned)
|
||||||
|
flagvals[] = { /* Must agree with flagchars[]. */
|
||||||
|
RTF_UP,
|
||||||
RTF_GATEWAY,
|
RTF_GATEWAY,
|
||||||
RTF_HOST,
|
RTF_HOST,
|
||||||
RTF_REINSTATE,
|
RTF_REINSTATE,
|
||||||
|
@ -458,27 +463,25 @@ static const unsigned flagvals[] = { /* Must agree with flagchars[]. */
|
||||||
#if ENABLE_FEATURE_IPV6
|
#if ENABLE_FEATURE_IPV6
|
||||||
RTF_DEFAULT,
|
RTF_DEFAULT,
|
||||||
RTF_ADDRCONF,
|
RTF_ADDRCONF,
|
||||||
RTF_CACHE
|
RTF_CACHE,
|
||||||
|
RTF_REJECT,
|
||||||
|
RTF_NONEXTHOP, /* this one doesn't fit into 16 bits */
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#define IPV4_MASK (RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED)
|
|
||||||
#define IPV6_MASK (RTF_GATEWAY|RTF_HOST|RTF_DEFAULT|RTF_ADDRCONF|RTF_CACHE)
|
|
||||||
|
|
||||||
/* Must agree with flagvals[]. */
|
/* Must agree with flagvals[]. */
|
||||||
static const char flagchars[] ALIGN1 =
|
static const char flagchars[] ALIGN1 =
|
||||||
"GHRDM"
|
"UGHRDM"
|
||||||
#if ENABLE_FEATURE_IPV6
|
#if ENABLE_FEATURE_IPV6
|
||||||
"DAC"
|
"DAC!n"
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
|
#define IPV4_MASK (RTF_UP|RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED)
|
||||||
|
#define IPV6_MASK (RTF_UP|RTF_GATEWAY|RTF_HOST|RTF_DEFAULT|RTF_ADDRCONF|RTF_CACHE|RTF_REJECT|RTF_NONEXTHOP)
|
||||||
|
|
||||||
static void set_flags(char *flagstr, int flags)
|
static void set_flags(char *flagstr, int flags)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
*flagstr++ = 'U';
|
|
||||||
|
|
||||||
for (i = 0; (*flagstr = flagchars[i]) != 0; i++) {
|
for (i = 0; (*flagstr = flagchars[i]) != 0; i++) {
|
||||||
if (flags & flagvals[i]) {
|
if (flags & flagvals[i]) {
|
||||||
++flagstr;
|
++flagstr;
|
||||||
|
@ -574,7 +577,7 @@ static void INET6_displayroutes(void)
|
||||||
int r;
|
int r;
|
||||||
r = fscanf(fp, "%32s%x%*s%x%32s%x%x%x%x%s\n",
|
r = fscanf(fp, "%32s%x%*s%x%32s%x%x%x%x%s\n",
|
||||||
addr6x+14, &prefix_len, &slen, addr6x+40+7,
|
addr6x+14, &prefix_len, &slen, addr6x+40+7,
|
||||||
&metric, &use, &refcnt, &iflags, iface);
|
&metric, &refcnt, &use, &iflags, iface);
|
||||||
if (r != 9) {
|
if (r != 9) {
|
||||||
if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
|
if ((r < 0) && feof(fp)) { /* EOF with no (nonspace) chars read. */
|
||||||
break;
|
break;
|
||||||
|
@ -606,10 +609,6 @@ static void INET6_displayroutes(void)
|
||||||
} while (i < 40+28+7);
|
} while (i < 40+28+7);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(iflags & RTF_UP)) { /* Skip interfaces that are down. */
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
set_flags(flags, (iflags & IPV6_MASK));
|
set_flags(flags, (iflags & IPV6_MASK));
|
||||||
|
|
||||||
r = 0;
|
r = 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user