X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspsocket.h;h=ae18afabd959df47a1f786aed78ca3a06743798f;hb=c5d8d3e3c6b7a5cb44572d9a9b6e5249d74cb1f7;hp=fd5d4dd18c47f1ff1fbe97b44713950896db1726;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspsocket.h b/include/inspsocket.h
index fd5d4dd18..ae18afabd 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -14,13 +14,6 @@
 #ifndef __INSP_SOCKET_H__
 #define __INSP_SOCKET_H__
 
-#include <sstream>
-#include <string>
-#include <deque>
-#include "dns.h"
-#include "inspircd_config.h"
-#include "socket.h"
-#include "inspsocket.h"
 #include "timer.h"
 
 /**
@@ -166,15 +159,6 @@ class CoreExport BufferedSocket : public EventHandler
 	 * socket has timed out.
 	 */
 	bool timeout;
-	
-	/**
-	 * Socket input buffer, used by read(). The class which
-	 * extends BufferedSocket is expected to implement an extendable
-	 * buffer which can grow much larger than 64k,
-	 * this buffer is just designed to be temporary storage.
-	 * space.
-	 */
-	char ibuf[65535];
 
 	/**
 	 * The IP address being connected
@@ -325,7 +309,7 @@ class CoreExport BufferedSocket : public EventHandler
 	 * into a char* array which can be up to
 	 * 16 kilobytes in length.
 	 */
-	virtual char* Read();
+	virtual const char* Read();
 
 	/**
 	 * Returns the IP address associated with
@@ -339,7 +323,7 @@ class CoreExport BufferedSocket : public EventHandler
 	 * returns or linefeeds are appended to the string.
 	 * @param data The data to send
 	 */
-	virtual int Write(const std::string &data);
+	virtual void Write(const std::string &data);
 
 	/**
 	 * If your socket is a listening socket, when a new
@@ -413,17 +397,6 @@ class CoreExport BufferedSocket : public EventHandler
 	 */
 	virtual bool DoConnect();
 
-	/**
-	 * This method marks the socket closed.
-	 * The next time the core examines a socket marked
-	 * as closed, the socket will be closed and the 
-	 * memory reclaimed.
-	 *
-	 * NOTE: This method is DEPRECIATED and will be
-	 * ignored if called!
-	 */
-	void MarkAsClosed();
-
 	/** Handle event from EventHandler parent class
 	 */
 	void HandleEvent(EventType et, int errornum = 0);