diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-30 21:53:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-30 21:53:35 +0000 |
| commit | 49b14176c409f5b1694732dbfec0f365c50eb58f (patch) | |
| tree | 99d0b6901893778f468cfbcd21a3351713eedc90 | |
| parent | b2a89f15836a522b75d3153fef92a9b031b1d27b (diff) | |
| parent | 915de376bba22940df2ca64abdea365e2aad0ec4 (diff) | |
| download | mdnsresponder-oreo-r2-release.tar.gz | |
Merge cherrypicks of [2822671, 2822672] into oc-r2-releaseandroid-8.0.0_r29oreo-r2-release
Change-Id: I576bf12ec19ac10b92c1bc79dfeb4b1915d15a30
| -rw-r--r-- | Android.mk | 2 | ||||
| -rwxr-xr-x | mDNSCore/mDNS.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -10,6 +10,7 @@ commonLibs := libcutils liblog commonFlags := \ -O2 -g \ -fno-strict-aliasing \ + -fwrapv \ -D_GNU_SOURCE \ -DHAVE_IPV6 \ -DNOT_HAVE_SA_LEN \ @@ -20,6 +21,7 @@ commonFlags := \ -W \ -Wall \ -Wextra \ + -Wno-address-of-packed-member \ -Wno-array-bounds \ -Wno-pointer-sign \ -Wno-unused \ diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c index ddee3de..e126754 100755 --- a/mDNSCore/mDNS.c +++ b/mDNSCore/mDNS.c @@ -10641,7 +10641,7 @@ mDNSexport mStatus mDNS_Init(mDNS *const m, mDNS_PlatformSupport *const p, // Task Scheduling variables result = mDNSPlatformTimeInit(); if (result != mStatus_NoError) return(result); - m->timenow_adjust = 0; // b/63335997 , High outbound network traffic + m->timenow_adjust = (mDNSs32)mDNSRandom(0xFFFFFFFF); timenow = mDNS_TimeNow_NoLock(m); m->timenow = 0; // MUST only be set within mDNS_Lock/mDNS_Unlock section |