Author: vsevolod (ports committer)
Date: Mon Feb 2 19:00:18 2015
New Revision: 278107
URL: https://svnweb.freebsd.org/changeset/base/278107
Log:
Revert the change of flowid output format. [1]
Reverse the sorting order of the interfaces addresses familise so it should be
the same as getifaddrs(3) order. [2]
Suggested by: hrs [1], bz [2]
Approved by: hrs, bapt
Modified:
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifconfig.c
Modified: head/sbin/ifconfig/af_inet6.c
==============================================================================
--- head/sbin/ifconfig/af_inet6.c Mon Feb 2 18:48:49 2015
(r278106)
+++ head/sbin/ifconfig/af_inet6.c Mon Feb 2 19:00:18 2015
(r278107)
@@ -167,33 +167,6 @@ setip6eui64(const char *cmd, int dummy _
}
static void
-in6_print_scope(uint8_t *a)
-{
- const char *sname = NULL;
- uint16_t val;
-
- val = (a[0] << 4) + ((a[1] & 0xc0) >> 4);
-
- if ((val & 0xff0) == 0xff0)
- sname = "Multicast";
- else {
- switch(val) {
- case 0xfe8:
- sname = "Link";
- break;
- case 0xfec:
- sname = "Site";
- break;
- default:
- sname = "Global";
- break;
- }
- }
-
- printf("scope: %s ", sname);
-}
-
-static void
in6_status(int s __unused, const struct ifaddrs *ifa)
{
struct sockaddr_in6 *sin, null_sin;
@@ -284,8 +257,9 @@ in6_status(int s __unused, const struct
if ((flags6 & IN6_IFF_PREFER_SOURCE) != 0)
printf("prefer_source ");
- in6_print_scope((uint8_t *)&((struct sockaddr_in6 *)
- (ifa->ifa_addr))->sin6_addr);
+ if (((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id)
+ printf("scopeid 0x%x ",
+ ((struct sockaddr_in6 *)(ifa->ifa_addr))->sin6_scope_id);
if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
printf("pltime ");
Modified: head/sbin/ifconfig/ifconfig.c
==============================================================================
--- head/sbin/ifconfig/ifconfig.c Mon Feb 2 18:48:49 2015
(r278106)
+++ head/sbin/ifconfig/ifconfig.c Mon Feb 2 19:00:18 2015
(r278107)
@@ -235,7 +235,7 @@ cmpifaddrs(struct ifaddrs *a, struct ifa
if (af1 < ORDERS_SIZE(e1->af_orders) &&
af2 < ORDERS_SIZE(e1->af_orders))
- return (e1->af_orders[af2] - e1->af_orders[af1]);
+ return (e1->af_orders[af1] - e1->af_orders[af2]);
}
return (0);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
