hardware/interfaces
Revision | d97f8714f07a762efe5a48747454fb4bdd51be8b (tree) |
---|---|
Time | 2017-10-20 18:33:40 |
Author | Erik Kline <ek@goog...> |
Commiter | Erik Kline |
Fixup netlink socket creation to make corresponding fix in JNI
Corresponding JNI fix is:
Test: as follows
Bug: 68018148
Change-Id: I5aa019d708abaff61387b83a857e9e8226709842
@@ -43,8 +43,8 @@ using android::sp; | ||
43 | 43 | #define ASSERT_FALSE_CALLBACK \ |
44 | 44 | [&](bool success, const hidl_string& errMsg) { ASSERT_FALSE(success) << errMsg.c_str(); } |
45 | 45 | |
46 | -const unsigned kFd1Groups = NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY; | |
47 | -const unsigned kFd2Groups = NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY; | |
46 | +const unsigned kFd1Groups = NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY; | |
47 | +const unsigned kFd2Groups = NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY; | |
48 | 48 | |
49 | 49 | inline const sockaddr* asSockaddr(const sockaddr_nl* nladdr) { |
50 | 50 | return reinterpret_cast<const sockaddr*>(nladdr); |
@@ -131,7 +131,7 @@ class OffloadControlHidlTestBase : public testing::VtsHalHidlTargetTestBase { | ||
131 | 131 | config = testing::VtsHalHidlTargetTestBase::getService<IOffloadConfig>(); |
132 | 132 | ASSERT_NE(nullptr, config.get()) << "Could not get HIDL instance"; |
133 | 133 | |
134 | - unique_fd fd1(conntrackSocket(NFNLGRP_CONNTRACK_NEW | NFNLGRP_CONNTRACK_DESTROY)); | |
134 | + unique_fd fd1(conntrackSocket(NF_NETLINK_CONNTRACK_NEW | NF_NETLINK_CONNTRACK_DESTROY)); | |
135 | 135 | if (fd1.get() < 0) { |
136 | 136 | ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno)); |
137 | 137 | FAIL(); |
@@ -141,7 +141,7 @@ class OffloadControlHidlTestBase : public testing::VtsHalHidlTargetTestBase { | ||
141 | 141 | hidl_handle h1; |
142 | 142 | h1.setTo(nativeHandle1, true); |
143 | 143 | |
144 | - unique_fd fd2(conntrackSocket(NFNLGRP_CONNTRACK_UPDATE | NFNLGRP_CONNTRACK_DESTROY)); | |
144 | + unique_fd fd2(conntrackSocket(NF_NETLINK_CONNTRACK_UPDATE | NF_NETLINK_CONNTRACK_DESTROY)); | |
145 | 145 | if (fd2.get() < 0) { |
146 | 146 | ALOGE("Unable to create conntrack handles: %d/%s", errno, strerror(errno)); |
147 | 147 | FAIL(); |