eventmachine-eventmachine 0.12.7 → 0.12.8

data/ext/ed.h

@@ -67,27 +67,28 @@ class EventableDescriptor: public Bindable_t
 		virtual bool GetSubprocessPid (pid_t*) {return false;}
 
 		virtual void StartTls() {}
-		virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename) {}
+		virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename, bool verify_peer) {}
 
 		#ifdef WITH_SSL
 		virtual X509 *GetPeerCert() {return NULL;}
 		#endif
 
-		// Properties: return 0/1 to signify T/F, and handle the values
-		// through arguments.
-		virtual int GetCommInactivityTimeout (int *value) {return 0;}
-		virtual int SetCommInactivityTimeout (int *value) {return 0;}
+		virtual float GetCommInactivityTimeout() {return 0.0;}
+		virtual int SetCommInactivityTimeout (float value) {return 0;}
 
 		#ifdef HAVE_EPOLL
 		struct epoll_event *GetEpollEvent() { return &EpollEvent; }
 		#endif
 
+		virtual void StartProxy(const char*);
+		virtual void StopProxy();
+
 	private:
 		bool bCloseNow;
 		bool bCloseAfterWriting;
-		int MySocket;
 
 	protected:
+		int MySocket;
 		enum {
 			// 4 seconds is too short, most other libraries default to OS settings
 			// which in 2.6 kernel defaults to a 60 second connect timeout. 
@@ -96,16 +97,17 @@ class EventableDescriptor: public Bindable_t
 			//
 			// updating to 50 seconds, so we catch it before the OS does
 
-			PendingConnectTimeout = 50 // can easily be made an instance variable
+			// can easily be made an instance variable
+			PendingConnectTimeout = 50000000 // now in usec
 		};
 
 		void (*EventCallback)(const char*, int, const char*, int);
-    
-		time_t CreatedAt;
-		time_t LastRead;
-		time_t LastWritten;
+		void _GenericInboundDispatch(const char*, int);
+
+		Int64 CreatedAt;
 		bool bCallbackUnbind;
 		int UnbindReasonCode;
+		char *ProxyTarget;
 
 		#ifdef HAVE_EPOLL
 		struct epoll_event EpollEvent;
@@ -153,8 +155,8 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		void SetConnectPending (bool f);
 
-		void SetNotifyReadable (bool readable) { bNotifyReadable = readable; }
-		void SetNotifyWritable (bool writable) { bNotifyWritable = writable; }
+		void SetNotifyReadable (bool);
+		void SetNotifyWritable (bool);
 
 		virtual void Read();
 		virtual void Write();
@@ -167,10 +169,12 @@ class ConnectionDescriptor: public EventableDescriptor
 		virtual int GetOutboundDataSize() {return OutboundDataSize;}
 
 		virtual void StartTls();
-		virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename);
+		virtual void SetTlsParms (const char *privkey_filename, const char *certchain_filename, bool verify_peer);
 
 		#ifdef WITH_SSL
 		virtual X509 *GetPeerCert();
+		virtual bool VerifySslPeer(const char*);
+		virtual void AcceptSslPeer();
 		#endif
 
 		void SetServerMode() {bIsServer = true;}
@@ -178,8 +182,8 @@ class ConnectionDescriptor: public EventableDescriptor
 		virtual bool GetPeername (struct sockaddr*);
 		virtual bool GetSockname (struct sockaddr*);
 
-		virtual int GetCommInactivityTimeout (int *value);
-		virtual int SetCommInactivityTimeout (int *value);
+		virtual float GetCommInactivityTimeout();
+		virtual int SetCommInactivityTimeout (float value);
 
 
 	protected:
@@ -208,10 +212,16 @@ class ConnectionDescriptor: public EventableDescriptor
 		std::string CertChainFilename;
 		std::string PrivateKeyFilename;
 		bool bHandshakeSignaled;
+		bool bSslVerifyPeer;
+		bool bSslPeerAccepted;
 		#endif
 		bool bIsServer;
 
-		time_t LastIo;
+		#ifdef HAVE_KQUEUE
+		bool bGotExtraKqueueEvent;
+		#endif
+
+		Int64 LastIo;
 		int InactivityTimeout;
 
 	private:
@@ -251,8 +261,8 @@ class DatagramDescriptor: public EventableDescriptor
 		virtual bool GetPeername (struct sockaddr*);
 		virtual bool GetSockname (struct sockaddr*);
 
-    virtual int GetCommInactivityTimeout (int *value);
-    virtual int SetCommInactivityTimeout (int *value);
+    virtual float GetCommInactivityTimeout();
+    virtual int SetCommInactivityTimeout (float value);
 
 		static int SendDatagram (const char*, const char*, int, const char*, int);
 
@@ -272,7 +282,7 @@ class DatagramDescriptor: public EventableDescriptor
 
 		struct sockaddr_in ReturnAddress;
 
-		time_t LastIo;
+		Int64 LastIo;
 		int InactivityTimeout;
 };
 
@@ -333,7 +343,7 @@ class PipeDescriptor: public EventableDescriptor
 
 	protected:
 		bool bReadAttemptedAfterClose;
-		time_t LastIo;
+		Int64 LastIo;
 		int InactivityTimeout;
 
 		deque<OutboundPage> OutboundPages;
@@ -366,7 +376,7 @@ class KeyboardDescriptor: public EventableDescriptor
 
 	protected:
 		bool bReadAttemptedAfterClose;
-		time_t LastIo;
+		Int64 LastIo;
 		int InactivityTimeout;
 
 	private:
@@ -374,6 +384,23 @@ class KeyboardDescriptor: public EventableDescriptor
 };
 
 
+/***********************
+class InotifyDescriptor
+************************/
+
+class InotifyDescriptor: public EventableDescriptor
+{
+	public:
+		InotifyDescriptor (EventMachine_t*);
+		virtual ~InotifyDescriptor();
+
+		void Read();
+		void Write();
+
+		virtual void Heartbeat() {}
+		virtual bool SelectForRead() {return true;}
+		virtual bool SelectForWrite() {return false;}
+};
 
 #endif // __EventableDescriptor__H_