diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-11-19 03:24:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-19 03:24:48 +0000 |
| commit | 8539179a11a22401e92c3ba1f3e5cad83d28789c (patch) | |
| tree | 5e95ce8c7c8c2d30474d55c3100e08bf8fa5d0d9 | |
| parent | c68fd1dcf3abb442a5f9a6de6834687df5216fac (diff) | |
| parent | 7d86a89a16598fe21fc25d8c99eed182e39848a9 (diff) | |
| download | mdnsresponder-nougat-release.tar.gz | |
Merge "Don\'t enable MDNS on non-multicast, non-broadcast interfaces." am: 306cc40dd3android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-cts-releasenougat-bugfix-release
am: 7d86a89a16
* commit '7d86a89a16598fe21fc25d8c99eed182e39848a9':
Don't enable MDNS on non-multicast, non-broadcast interfaces.
| -rw-r--r-- | mDNSPosix/mDNSPosix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c index 0f1ef3e..8a46c6f 100644 --- a/mDNSPosix/mDNSPosix.c +++ b/mDNSPosix/mDNSPosix.c @@ -970,7 +970,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) if (firstLoopback == NULL) firstLoopback = i; } - else + else if (i->ifi_flags & (IFF_MULTICAST | IFF_BROADCAST)) // http://b/25669326 { if (SetupOneInterface(m, i->ifi_addr, i->ifi_netmask, i->ifi_name, i->ifi_index) == 0) if (i->ifi_addr->sa_family == AF_INET) |