[IOMultiplexerV2] Merge branch 'v2'

diff --combined src/IOHandler/IOSockets.h
index 21536fbdf0e76af2486750268f058abc21e28bc2,d38bcd7e6576b475919b5ce4c7db4f7543043b9f..50ed268f24eb2dce363e2599b5bf21d49276e2c1
--- 1/src/IOHandler/IOSockets.h
--- 2/src/IOHandler/IOSockets.h
+++ b/src/IOHandler/IOSockets.h
@@@ -127,6 -127,12 +127,12 @@@ struct _IOSocket 
  };
  
  void _init_sockets();
+ struct _IOSocket *_create_socket();
+ void _free_socket(struct _IOSocket *iosock);
+ void iosocket_activate(struct _IOSocket *iosock);
+ void iosocket_deactivate(struct _IOSocket *iosock);
+ void iosocket_update(struct _IOSocket *iosock);
+ 
  void iosocket_loop(int usec);
  void iosocket_lookup_callback(struct IOSocketDNSLookup *lookup, struct IODNSEvent *event);
  void iosocket_events_callback(struct _IOSocket *iosock, int readable, int writeable);
@@@ -135,13 -141,13 +141,13 @@@
  (\
        ((IOSOCK->socket_flags & (IOSOCKETFLAG_SSL_READHS | IOSOCKETFLAG_SSL_WRITEHS)) && !(IOSOCK->socket_flags & IOSOCKETFLAG_SSL_WANTWRITE)) || \
        (!(IOSOCK->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_RW)) || \
-       (IOSOCK->socket_flags & (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_R) == (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_R)) \
+       ((IOSOCK->socket_flags & (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_R)) == (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_R)) \
  )\r
  #define iosocket_wants_writes(IOSOCK) \
  (\
-       (IOSOCK->socket_flags & (IOSOCKETFLAG_SSL_READHS | IOSOCKETFLAG_SSL_WRITEHS | IOSOCKETFLAG_SSL_WANTWRITE) > IOSOCKETFLAG_SSL_WANTWRITE) || \
+       ((IOSOCK->socket_flags & (IOSOCKETFLAG_SSL_READHS | IOSOCKETFLAG_SSL_WRITEHS | IOSOCKETFLAG_SSL_WANTWRITE)) > IOSOCKETFLAG_SSL_WANTWRITE) || \
        (!(IOSOCK->socket_flags & IOSOCKETFLAG_OVERRIDE_WANT_RW) && (IOSOCK->writebuf.bufpos || (IOSOCK->socket_flags & IOSOCKETFLAG_CONNECTING))) || \
-       (IOSOCK->socket_flags & (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_W) == (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_W)) \
+       ((IOSOCK->socket_flags & (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_W)) == (IOSOCKETFLAG_OVERRIDE_WANT_RW | IOSOCKETFLAG_OVERRIDE_WANT_W)) \
  )
  
  #endif
@@@ -169,11 -175,6 +175,11 @@@ enum IOSocketEventType 
        IOSOCKETEVENT_DNSFAILED /* failed to lookup DNS information (recv_str contains error message) */
  };
  
 +#define IOSOCKET_ADDR_IPV4 0x01
 +#define IOSOCKET_ADDR_IPV6 0x02 /* overrides IOSOCKET_ADDR_IPV4 */
 +#define IOSOCKET_PROTO_UDP 0x04
 +
 +#if !defined IOSOCKET_CPP
  struct IOSocket {
        void *iosocket;
        
@@@ -199,6 -200,11 +205,6 @@@ struct IOSocketEvent 
      } data;
  };
  
 -
 -#define IOSOCKET_ADDR_IPV4 0x01
 -#define IOSOCKET_ADDR_IPV6 0x02 /* overrides IOSOCKET_ADDR_IPV4 */
 -#define IOSOCKET_PROTO_UDP 0x04
 -
  struct IOSocket *iosocket_connect(const char *hostname, unsigned int port, int ssl, const char *bindhost, iosocket_callback *callback);
  struct IOSocket *iosocket_connect_flags(const char *hostname, unsigned int port, int ssl, const char *bindhost, iosocket_callback *callback, int flags);
  struct IOSocket *iosocket_listen(const char *hostname, unsigned int port, iosocket_callback *callback);
@@@ -211,4 -217,3 +217,4 @@@ void iosocket_printf(struct IOSocket *i
  void iosocket_close(struct IOSocket *iosocket);
  
  #endif
 +#endif