X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=2bb7af091217e5fef51d2a8038dca673a4cc095a;hb=d3c7457dda8555e410f4fbc36bb1b1b4cb0ae3f2;hp=8b031012d43f728453d33f70d4d6fe08aa369264;hpb=f83322c93800a528cf74811523ed90560092b715;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 8b031012d..2bb7af091 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -34,7 +34,7 @@
 /* Required forward definitions */
 class ServerConfig;
 class InspIRCd;
-class InspSocket;
+class BufferedSocket;
 
 /** Types of data in the core config
  */
@@ -235,7 +235,7 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Check that there is only one of each configuration item
 	 */
-	bool CheckOnce(char* tag, bool bail, userrec* user);
+	bool CheckOnce(char* tag) throw (CoreException);
   
   public:
 
@@ -515,7 +515,7 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	std::map<int,Module*> IOHookModule;
 
-	std::map<InspSocket*, Module*> SocketIOHookModule;
+	std::map<BufferedSocket*, Module*> SocketIOHookModule;
 
 	/** The 005 tokens of this server (ISUPPORT)
 	 * populated/repopulated upon loading or unloading
@@ -628,13 +628,13 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Send the 005 numerics (ISUPPORT) to a user
 	 */
-	void Send005(userrec* user);
+	void Send005(User* user);
 
 	/** Read the entire configuration into memory
 	 * and initialize this class. All other methods
 	 * should be used only by the core.
 	 */
-	void Read(bool bail, userrec* user);
+	void Read(bool bail, User* user);
 
 	/** Read a file into a file_cache object
 	 */
@@ -646,7 +646,7 @@ class CoreExport ServerConfig : public Extensible
 	 * this user as SNOTICEs.
 	 * If the parameter is NULL, the messages are spooled to all users via WriteOpers as SNOTICEs.
 	 */
-	void ReportConfigError(const std::string &errormessage, bool bail, userrec* user);
+	void ReportConfigError(const std::string &errormessage, bool bail, User* user);
 
 	/** Load 'filename' into 'target', with the new config parser everything is parsed into
 	 * tag/key/value at load-time rather than at read-value time.
@@ -734,25 +734,25 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	bool DelIOHook(int port);
 	
-	/** Get a pointer to the module which has hooked the given InspSocket class.
+	/** Get a pointer to the module which has hooked the given BufferedSocket class.
 	 * @parameter port Port number
 	 * @return Returns a pointer to the hooking module, or NULL
 	 */
-	Module* GetIOHook(InspSocket* is);
+	Module* GetIOHook(BufferedSocket* is);
 
-	/** Hook a module to an InspSocket class, so that it can receive notifications
+	/** Hook a module to an BufferedSocket class, so that it can receive notifications
 	 * of low-level socket activity.
 	 * @param iomod The module to hook to the socket
-	 * @param is The InspSocket to attach to
+	 * @param is The BufferedSocket to attach to
 	 * @return True if the hook was successful.
 	 */
-	bool AddIOHook(Module* iomod, InspSocket* is);
+	bool AddIOHook(Module* iomod, BufferedSocket* is);
 
-	/** Delete a module hook from an InspSocket.
-	 * @param is The InspSocket to detatch from.
+	/** Delete a module hook from an BufferedSocket.
+	 * @param is The BufferedSocket to detatch from.
 	 * @return True if the unhook was successful
 	 */
-	bool DelIOHook(InspSocket* is);
+	bool DelIOHook(BufferedSocket* is);
 
 	/** Returns the fully qualified path to the inspircd directory
 	 * @return The full program directory