Add device port unmapping support to forwarder2.

tools/android/forwarder2/socket.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef TOOLS_ANDROID_FORWARDER2_SOCKET_H_
 #define TOOLS_ANDROID_FORWARDER2_SOCKET_H_
 
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 
 namespace forwarder2 {
 
 // Wrapper class around unix socket api.  Can be used to create, bind or
 // connect to both Unix domain sockets and TCP sockets.
 // TODO(pliard): Split this class into TCPSocket and UnixDomainSocket.
 class Socket {
  public:
@@ skipping 38 matching lines @@
   // is performed. Returns number of bytes written, which can be different from
   // num_bytes in case of errror.
   int WriteNumBytes(const void* buffer, size_t num_bytes);
 
   // Calls WriteNumBytes for the given std::string. Note that the null
   // terminator is not written to the socket.
   int WriteString(const std::string& buffer);
 
   bool has_error() const { return socket_error_; }
 
-  // |exit_notifier_fd| must be a valid pipe file descriptor created from the
+  // |event_fd| must be a valid pipe file descriptor created from the
   // PipeNotifier and must live (not be closed) at least as long as this socket
   // is alive.
-  void set_exit_notifier_fd(int exit_notifier_fd) {
-    exit_notifier_fd_ = exit_notifier_fd;
-  }
-  // Unset the |exit_notifier_fd_| so that it will not receive notifications
-  // anymore.
-  void reset_exit_notifier_fd() { exit_notifier_fd_ = -1; }
+  void AddEventFd(int event_fd);
 
   // Returns whether Accept() or Connect() was interrupted because the socket
-  // received an exit notification.
-  bool exited() const { return exited_; }
+  // received an external event fired through the provided fd.
+  bool DidReceiveEventOnFd(int fd) const;
+
+  bool DidReceiveEvent() const { return !fired_events_.empty(); };
 
   static int GetHighestFileDescriptor(const Socket& s1, const Socket& s2);
 
   static pid_t GetUnixDomainSocketProcessOwner(const std::string& path);
 
  private:
   union SockAddr {
     // IPv4 sockaddr
     sockaddr_in addr4;
     // IPv6 sockaddr
@@ skipping 28 matching lines @@
   // Family of the socket (PF_INET, PF_INET6 or PF_UNIX).
   int family_;
 
   SockAddr addr_;
 
   // Points to one of the members of the above union depending on the family.
   sockaddr* addr_ptr_;
   // Length of one of the members of the above union depending on the family.
   socklen_t addr_len_;
 
-  // File descriptor from PipeNotifier (see pipe_notifier.h) to send application
-  // exit notifications before calling socket blocking operations such as Read
-  // and Accept.
-  int exit_notifier_fd_;
+  // Sorted file descriptors from PipeNotifier (see pipe_notifier.h) to send
+  // application exit notifications before calling socket blocking operations
+  // such as Read and Accept.
+  std::vector<int> event_fds_;
 
-  bool exited_;
+  std::vector<int> fired_events_;
 
   DISALLOW_COPY_AND_ASSIGN(Socket);
 };
 
 }  // namespace forwarder
 
 #endif  // TOOLS_ANDROID_FORWARDER2_SOCKET_H_