aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2016-09-12 16:46:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-12 16:46:59 +0000
commit068930a7990eb6608360a06ac469fd71fb1d0328 (patch)
tree9c9fc4090a22e3cc2c32e2a02910d1079764dcee
parentf93d4864cddabf602f78069e35fdc7431536d26f (diff)
parentbfa1e214f5efa4dd536ea75867959338cf9947e1 (diff)
downloadmdnsresponder-068930a7990eb6608360a06ac469fd71fb1d0328.tar.gz
Merge "[mDNS] Support interface names larger than 8 characters" am: 55aee11ccd
am: bfa1e214f5 Change-Id: Ia0c45472d779fb99e4ab586f06224036e49f5357
-rwxr-xr-xmDNSPosix/mDNSUNP.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mDNSPosix/mDNSUNP.c b/mDNSPosix/mDNSUNP.c
index c3d3366..5379b6b 100755
--- a/mDNSPosix/mDNSUNP.c
+++ b/mDNSPosix/mDNSUNP.c
@@ -86,7 +86,7 @@ struct ifi_info *get_ifi_info_linuxv6(int family, int doaliases)
FILE *fp = NULL;
char addr[8][5];
int flags, myflags, index, plen, scope;
- char ifname[9], lastname[IFNAMSIZ];
+ char ifname[IFNAMSIZ], lastname[IFNAMSIZ];
char addr6[32+7+1]; /* don't forget the seven ':' */
struct addrinfo hints, *res0;
struct sockaddr_in6 *sin6;
@@ -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 %8s\n",
+ "%4s%4s%4s%4s%4s%4s%4s%4s %02x %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) {