X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=include%2Fs_serv.h;h=4d6706b67d15582a62473582766d1a2425dc5c47;hb=refs%2Fheads%2Fupstream-ssl;hp=4c7fdd1687232d7fdb6d6fc93dd1a412ef48cfee;hpb=b70944c4b84fc2b707d0853ddf03975569dac2bd;p=ircu2.10.12-pk.git

diff --git a/include/s_serv.h b/include/s_serv.h
index 4c7fdd1..4d6706b 100644
--- a/include/s_serv.h
+++ b/include/s_serv.h
@@ -1,98 +1,27 @@
-#ifndef S_SERV_H
-#define S_SERV_H
-
-#include "struct.h"
-
-/*=============================================================================
- * General defines
- */
-
-/*-----------------------------------------------------------------------------
- * Macro's
+/** @file s_serv.h
+ * @brief Miscellaneous server support functions.
+ * @version $Id$
  */
+#ifndef INCLUDED_s_serv_h
+#define INCLUDED_s_serv_h
+#ifndef INCLUDED_sys_types_h
+#include <sys/types.h>
+#define INCLUDED_sys_types_h
+#endif
 
-#define STAT_PING		0
-#define STAT_LOG		1	/* logfile for -x */
-#define STAT_MASTER		2	/* Local ircd master before identification */
-#define STAT_CONNECTING		3
-#define STAT_HANDSHAKE		4
-#define STAT_ME			5
-#define STAT_UNKNOWN		6
-#define STAT_UNKNOWN_USER	7	/* Connect to client port */
-#define STAT_UNKNOWN_SERVER	8	/* Connect to server port */
-#define STAT_SERVER		9
-#define STAT_USER		10
+struct ConfItem;
+struct Client;
 
-/* 
- * for when you wanna create a bitmask of status values
- */
-#define StatusMask(T) (1<<(T))
-#define IsStatMask(x, s) (StatusMask((x)->status) & (s))
+extern unsigned int max_connection_count;
+extern unsigned int max_client_count;
 
 /*
- * status macros.
+ * Prototypes
  */
-#define IsRegistered(x)		(IsStatMask(x, \
-					StatusMask(STAT_SERVER)|\
-					StatusMask(STAT_USER)))
-#define IsConnecting(x)		((x)->status == STAT_CONNECTING)
-#define IsHandshake(x)		((x)->status == STAT_HANDSHAKE)
-#define IsMe(x)			((x)->status == STAT_ME)
-#define IsUnknown(x)		(IsStatMask(x, \
-					StatusMask(STAT_UNKNOWN)|\
-					StatusMask(STAT_UNKNOWN_USER)|\
-					StatusMask(STAT_UNKNOWN_SERVER)|\
-					StatusMask(STAT_MASTER)))
-#define IsServerPort(x)		((x)->status == STAT_UNKNOWN_SERVER )
-#define IsUserPort(x)		((x)->status == STAT_UNKNOWN_USER )
-#define IsMaster(x)		((x)->status == STAT_MASTER)
-#define IsClient(x)		(IsStatMask(x, \
-					StatusMask(STAT_MASTER)|\
-					StatusMask(STAT_HANDSHAKE)|\
-					StatusMask(STAT_ME)|\
-					StatusMask(STAT_UNKNOWN)|\
-					StatusMask(STAT_UNKNOWN_USER)|\
-					StatusMask(STAT_UNKNOWN_SERVER)|\
-					StatusMask(STAT_SERVER)|\
-					StatusMask(STAT_USER)))
-#define IsTrusted(x)		(IsStatMask(x, \
-					StatusMask(STAT_PING)|\
-					StatusMask(STAT_LOG)|\
-					StatusMask(STAT_CONNECTING)|\
-					StatusMask(STAT_HANDSHAKE)|\
-					StatusMask(STAT_ME)|\
-					StatusMask(STAT_SERVER)))
-#ifdef DEBUGMODE		/* Coredump if we miss something... */
-#define IsServer(x)		( ((x)->status == STAT_SERVER) && \
-                                  (((x)->serv) ? 1 : (*((char *) NULL) = 0)) )
-#define IsUser(x)		( ((x)->status == STAT_USER) && \
-                                  (((x)->user) ? 1 : (*((char *) NULL) = 0)) )
-#else
-#define IsServer(x)		((x)->status == STAT_SERVER)
-#define IsUser(x)		((x)->status == STAT_USER)
-#endif
-#define IsLog(x)		((x)->status == STAT_LOG)
-#define IsPing(x)		((x)->status == STAT_PING)
-
-#define SetMaster(x)		((x)->status = STAT_MASTER)
-#define SetConnecting(x)	((x)->status = STAT_CONNECTING)
-#define SetHandshake(x)		((x)->status = STAT_HANDSHAKE)
-#define SetServer(x)		((x)->status = STAT_SERVER)
-#define SetMe(x)		((x)->status = STAT_ME)
-#define SetUser(x)		((x)->status = STAT_USER)
-
-/*=============================================================================
- * Proto types
- */
-
-extern int m_server(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-extern int m_server_estab(aClient *cptr, aConfItem *aconf, aConfItem *bconf);
-extern int m_error(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-extern int m_end_of_burst(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-extern int m_end_of_burst_ack(aClient *cptr, aClient *sptr,
-    int parc, char *parv[]);
-extern int m_desynch(aClient *cptr, aClient *sptr, int parc, char *parv[]);
+extern int exit_new_server(struct Client* cptr, struct Client* sptr,
+                           const char* host, time_t timestamp, const char* fmt, ...);
+extern int a_kills_b_too(struct Client *a, struct Client *b);
+extern int server_estab(struct Client *cptr, struct ConfItem *aconf);
 
-extern unsigned int max_connection_count, max_client_count;
 
-#endif /* S_SERV_H */
+#endif /* INCLUDED_s_serv_h */