From: pk910 <pk910@pk910-laptop.(none)>
Date: Mon, 10 Mar 2014 12:31:59 +0000 (+0100)
Subject: [IOMultiplexerV2] Merge branch 'v2'
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=ff504c46f70bde2d66a42fb814d91008891742e6;hp=-c

[IOMultiplexerV2] Merge branch 'v2'
---

ff504c46f70bde2d66a42fb814d91008891742e6
diff --combined src/IOHandler/IOSockets.h
index 21536fb,d38bcd7..50ed268
--- a/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)) \
  )
  #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