diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2022-06-13 19:46:36 +0900 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-06-14 07:35:32 +0000 |
| commit | 4400e30d33e4bac025039c993d4de00c90608a48 (patch) | |
| tree | 55fcdb845092d664195a0949e45b5e61f81dd51c | |
| parent | 6eeb5c843f9f5e9feed501345bfb94f3451e61c6 (diff) | |
| download | mdnsresponder-android13-dev.tar.gz | |
Fix listing of interfaces with ID > 255android13-dev
get_ifi_info_linuxv6 only reads up to 2 hexadecimal characters for
interface indexes, so interface indexes above 255 cannot be used.
Use %x instead of %02x to remove this limitation. This is what upstream
used up to version 878.270.2, after which mdnsresponder stopped using
/proc to list interfaces. Only the interface index reading is changed to
keep the change minimal.
Test: atest NsdManagerTest --rerun-until-failure 100
Bug: 235797641
Change-Id: Iddca5052e7d76bc7878f0442acb9ccd67cbb620f
(cherry picked from commit e9c96727e7e42c0ef6ff8edf79087b81a5fb5082)
Merged-In: Iddca5052e7d76bc7878f0442acb9ccd67cbb620f
| -rwxr-xr-x | mDNSPosix/mDNSUNP.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mDNSPosix/mDNSUNP.c b/mDNSPosix/mDNSUNP.c index 5379b6b..f5d0c52 100755 --- a/mDNSPosix/mDNSUNP.c +++ b/mDNSPosix/mDNSUNP.c @@ -106,7 +106,7 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases) goto gotError; } while (fscanf(fp, - "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %15s\n", + "%4s%4s%4s%4s%4s%4s%4s%4s %x %02x %02x %02x %15s\n", addr[0],addr[1],addr[2],addr[3], addr[4],addr[5],addr[6],addr[7], &index, &plen, &scope, &flags, ifname) != EOF) { |