提交 8771064d 编写于 作者: C chegar

7123415: Some cases of network interface indexes being read incorrectly

Reviewed-by: chegar
Contributed-by: brandon.passanisi@oracle.com
上级 9c614d9e
...@@ -588,7 +588,7 @@ static void initLoopbackRoutes() { ...@@ -588,7 +588,7 @@ static void initLoopbackRoutes() {
int plen, scope, dad_status, if_idx; int plen, scope, dad_status, if_idx;
if ((f = fopen("/proc/net/if_inet6", "r")) != NULL) { if ((f = fopen("/proc/net/if_inet6", "r")) != NULL) {
while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[0], addr6p[1], addr6p[2], addr6p[3],
addr6p[4], addr6p[5], addr6p[6], addr6p[7], addr6p[4], addr6p[5], addr6p[6], addr6p[7],
&if_idx, &plen, &scope, &dad_status, devname) == 13) { &if_idx, &plen, &scope, &dad_status, devname) == 13) {
...@@ -1078,7 +1078,7 @@ int getDefaultIPv6Interface(struct in6_addr *target_addr) { ...@@ -1078,7 +1078,7 @@ int getDefaultIPv6Interface(struct in6_addr *target_addr) {
int plen, scope, dad_status, if_idx; int plen, scope, dad_status, if_idx;
if ((f = fopen("/proc/net/if_inet6", "r")) != NULL) { if ((f = fopen("/proc/net/if_inet6", "r")) != NULL) {
while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n", while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
addr6p[0], addr6p[1], addr6p[2], addr6p[3], addr6p[0], addr6p[1], addr6p[2], addr6p[3],
addr6p[4], addr6p[5], addr6p[6], addr6p[7], addr6p[4], addr6p[5], addr6p[6], addr6p[7],
&if_idx, &plen, &scope, &dad_status, devname) == 13) { &if_idx, &plen, &scope, &dad_status, devname) == 13) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册