Mock only whitelisted libraries.

Also fix bug inside |fake::connect()|.

Author: abyss7

build/config/BUILD.gn

@@ -12,6 +12,7 @@ config("base") {
   ]
 
   cflags_cc = [
+    "-fdef-sized-delete",
     "-std=c++1y",
   ]
 

mock-network.config

@@ -0,0 +1,5 @@
+#define __clang__
+#define __cplusplus 20130101L
+
+#define cxx_exceptions 1
+#define __has_feature(x) (x != 1)

src/mock_network/functions.cc

@@ -54,6 +54,9 @@ int connect(int sockfd, const struct sockaddr* addr, socklen_t addrlen) {
 
   if (!socket.SetState(Socket::CONNECTING, addr, addrlen)) {
     // Assume |errno| is already set by |Socket::SetState()|.
+    if (Connection::result_ != 0) {
+      errno = Connection::result_;
+    }
     return -1;
   }
 

src/mock_network/mock.cc

@@ -42,17 +42,12 @@ LinkList GetLoadedModules() {
   return std::move(modules);
 }
 
-const char* blacklist[] = {
-    // Old libstdc++ doesn't support substring regex matching.
-    ".*ld-linux-x86-64\\.so.*", ".*libc\\.so.*", ".*libpthread\\.so.*",
-};
-
 Map<String, void*> handles;
 
 }  // namespace
 
 // static
-bool Mock::Enable(String* error) {
+bool Mock::Enable(const List<String>& whitelist, String* error) {
   UniqueLock lock(mutex_);
 
   if (enabled_) {
@@ -67,14 +62,14 @@ bool Mock::Enable(String* error) {
   LinkList modules = GetLoadedModules();
 
   for (const auto& handle : modules) {
-    bool in_blacklist = false;
-    for (const auto* entry : blacklist) {
+    bool in_whitelist = false;
+    for (const auto& entry : whitelist) {
       if (std::regex_match(handle->l_name, std::regex(entry))) {
-        in_blacklist = true;
+        in_whitelist = true;
         break;
       }
     }
-    if (in_blacklist) {
+    if (!in_whitelist) {
       continue;
     }
 
@@ -151,6 +146,7 @@ bool Mock::Disable(String* error) {
 
   // NOTE: |elf_hook()| uses the |close()| internally, so we need to be able to
   //       call the |CallOriginal()|, which asserts the |enabled_|.
+  // FIXME: looks like deprecated NOTE.
   enabled_ = false;
 
   return true;

src/mock_network/mock.h

@@ -17,7 +17,7 @@ class Mock {
     return reinterpret_cast<R (*)(Args...)>(original->second)(args...);
   }
 
-  static bool Enable(String* error = nullptr);
+  static bool Enable(const List<String>& whitelist, String* error = nullptr);
   static bool Disable(String* error = nullptr);
 
  private:

src/mock_network/mock_test.cc

@@ -12,7 +12,7 @@ namespace mock_network {
 
 TEST(MockNetworkTest, Socket) {
   String error;
-  ASSERT_TRUE(Mock::Enable(&error)) << error;
+  ASSERT_TRUE(Mock::Enable({".*libtest_library\\.so"}, &error)) << error;
 
   int socket = test::socket(AF_UNIX, SOCK_STREAM, 0);
   EXPECT_NE(-1, socket);
@@ -43,7 +43,7 @@ TEST(MockNetworkTest, Socket) {
 
 TEST(MockNetworkTest, Connect) {
   String error;
-  ASSERT_TRUE(Mock::Enable(&error)) << error;
+  ASSERT_TRUE(Mock::Enable({".*libtest_library\\.so"}, &error)) << error;
 
   // Unknown socket.
   EXPECT_EQ(-1, test::connect(1, nullptr, 0));
@@ -84,7 +84,7 @@ TEST(MockNetworkTest, Connect) {
 
 TEST(MockNetworkTest, Bind) {
   String error;
-  ASSERT_TRUE(Mock::Enable(&error)) << error;
+  ASSERT_TRUE(Mock::Enable({".*libtest_library\\.so"}, &error)) << error;
 
   // Unknown socket.
   EXPECT_EQ(-1, test::bind(1, nullptr, 0));