summaryrefslogtreecommitdiffstats
path: root/server/RouteController.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-02-14 17:09:09 +0900
committerLorenzo Colitti <lorenzo@google.com>2017-02-14 17:32:34 +0900
commitbbcd81d2e5103bbf465d69c6d0f958d3e740dd6e (patch)
tree56fc6e5092224e7e579b28fc37525eeb5881083d /server/RouteController.cpp
parent219f328b7c2f99ef27f89206bdbf1260fa7ad2e4 (diff)
downloadplatform_system_netd-bbcd81d2e5103bbf465d69c6d0f958d3e740dd6e.tar.gz
platform_system_netd-bbcd81d2e5103bbf465d69c6d0f958d3e740dd6e.tar.bz2
platform_system_netd-bbcd81d2e5103bbf465d69c6d0f958d3e740dd6e.zip
Don't call NetlinkCallbacks with nullptr on NLMSG_DONE.
No real callback uses this, and even the test code doesn't seem to use it for anything useful. Bug: 34873832 Test: bullhead builds, boots, rules flushed on netd restart Test: netd_{unit,integration}_test pass Change-Id: I195dd388864e9e596af9f4d08aee7b8ade078fb5
Diffstat (limited to 'server/RouteController.cpp')
-rw-r--r--server/RouteController.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 532a43f4d..19907eb9a 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -864,7 +864,6 @@ WARN_UNUSED_RESULT int flushRules() {
}
NetlinkDumpCallback callback = [writeSock] (nlmsghdr *nlh) {
- if (nlh == nullptr) return;
// Don't touch rules at priority 0 because by default they are used for local input.
if (getRulePriority(nlh) == 0) return;