#ifndef INCLUDED_ircd_defs_h
#include "ircd_defs.h"
#endif
-#ifndef INCLUDED_config_h
-#include "config.h"
-#endif
#ifndef INCLUDED_dbuf_h
#include "dbuf.h"
#endif
#ifndef INCLUDED_msgq_h
#include "msgq.h"
#endif
+#ifndef INCLUDED_ircd_events_h
+#include "ircd_events.h"
+#endif
#ifndef INCLUDED_ircd_handler_h
#include "ircd_handler.h"
#endif
struct Whowas;
struct DNSReply;
struct hostent;
-
-/*-----------------------------------------------------------------------------
- * Macros
- */
-#define CLIENT_LOCAL_SIZE sizeof(struct Client)
-#define CLIENT_REMOTE_SIZE offsetof(struct Client, count)
+struct Privs;
+struct AuthRequest;
/*
* Structures
* source file, or in the source file itself (when only used in that file).
*/
-struct Client {
- struct Client* next; /* link in GlobalClientList */
- struct Client* prev; /* link in GlobalClientList */
- struct Client* hnext; /* link in hash table bucket or this */
- struct Client* from; /* == self, if Local Client, *NEVER* NULL! */
- struct User* user; /* ...defined, if this is a User */
- struct Server* serv; /* ...defined, if this is a server */
- struct Whowas* whowas; /* Pointer to ww struct to be freed on quit */
- char yxx[4]; /* Numeric Nick: YMM if this is a server,
- XX0 if this is a user */
- /*
- * XXX - move these to local part for next release
- * (lasttime, since)
- */
- time_t lasttime; /* last time data read from socket */
- time_t since; /* last time we parsed something, flood control */
-
- time_t firsttime; /* time client was created */
- time_t lastnick; /* TimeStamp on nick */
- int marker; /* /who processing marker */
- unsigned int flags; /* client flags */
- unsigned int hopcount; /* number of servers to this 0 = local */
- struct in_addr ip; /* Real ip# NOT defined for remote servers! */
- short status; /* Client type */
- unsigned char local; /* local or remote client */
- char name[HOSTLEN + 1]; /* Unique name of the client, nick or host */
- char username[USERLEN + 1]; /* username here now for auth stuff */
- char info[REALLEN + 1]; /* Free form additional client information */
+#define PRIV_CHAN_LIMIT 1 /* no channel limit on oper */
+#define PRIV_MODE_LCHAN 2 /* oper can mode local chans */
+#define PRIV_WALK_LCHAN 3 /* oper can walk thru local modes */
+#define PRIV_DEOP_LCHAN 4 /* no deop oper on local chans */
+#define PRIV_SHOW_INVIS 5 /* show local invisible users */
+#define PRIV_SHOW_ALL_INVIS 6 /* show all invisible users */
+#define PRIV_UNLIMIT_QUERY 7 /* unlimit who queries */
+
+#define PRIV_KILL 8 /* oper can KILL */
+#define PRIV_LOCAL_KILL 9 /* oper can local KILL */
+#define PRIV_REHASH 10 /* oper can REHASH */
+#define PRIV_RESTART 11 /* oper can RESTART */
+#define PRIV_DIE 12 /* oper can DIE */
+#define PRIV_GLINE 13 /* oper can GLINE */
+#define PRIV_LOCAL_GLINE 14 /* oper can local GLINE */
+#define PRIV_JUPE 15 /* oper can JUPE */
+#define PRIV_LOCAL_JUPE 16 /* oper can local JUPE */
+#define PRIV_OPMODE 17 /* oper can OP/CLEARMODE */
+#define PRIV_LOCAL_OPMODE 18 /* oper can local OP/CLEARMODE */
+#define PRIV_SET 19 /* oper can SET */
+#define PRIV_WHOX 20 /* oper can use /who x */
+#define PRIV_BADCHAN 21 /* oper can BADCHAN */
+#define PRIV_LOCAL_BADCHAN 22 /* oper can local BADCHAN */
+#define PRIV_SEE_CHAN 23 /* oper can see in secret chans */
+
+#define PRIV_PROPAGATE 24 /* propagate oper status */
+#define PRIV_DISPLAY 25 /* "Is an oper" displayed */
+#define PRIV_SEE_OPERS 26 /* display hidden opers */
+
+#define PRIV_WIDE_GLINE 27 /* oper can set wider G-lines */
+
+#define PRIV_LAST_PRIV 27 /* must be the same as the last priv */
+
+#define _PRIV_NBITS (8 * sizeof(unsigned long))
+
+#define _PRIV_IDX(priv) ((priv) / _PRIV_NBITS)
+#define _PRIV_BIT(priv) (1 << ((priv) % _PRIV_NBITS))
+
+struct Privs {
+ unsigned long priv_mask[(PRIV_LAST_PRIV / _PRIV_NBITS) + 1];
+};
+
+struct Connection {
/*
* The following fields are allocated only for local clients
* (directly connected to *this* server with a socket.
* to which the allocation is tied to! *Never* refer to
* these fields, if (from != self).
*/
- unsigned int count; /* Amount of data in buffer, DON'T PUT
- variables ABOVE this one! */
- int fd; /* >= 0, for local clients */
- int error; /* last socket level error for client */
- unsigned int snomask; /* mask for server messages */
- time_t nextnick; /* Next time a nick change is allowed */
- time_t nexttarget; /* Next time a target change is allowed */
- unsigned int cookie; /* Random number the user must PONG */
- struct MsgQ sendQ; /* Outgoing message queue--if socket full */
- struct DBuf recvQ; /* Hold for data incoming yet to be parsed */
- unsigned int sendM; /* Statistics: protocol messages send */
- unsigned int sendK; /* Statistics: total k-bytes send */
- unsigned int receiveM; /* Statistics: protocol messages received */
- unsigned int receiveK; /* Statistics: total k-bytes received */
- unsigned short sendB; /* counters to count upto 1-k lots of bytes */
- unsigned short receiveB; /* sent and received. */
- struct Listener* listener; /* listening client which we accepted from */
- struct SLink* confs; /* Configuration record associated */
- HandlerType handler; /* message index into command table for parsing */
- struct DNSReply* dns_reply; /* DNS reply used during client registration */
- struct ListingArgs* listing;
- unsigned int max_sendq; /* cached max send queue for client */
- unsigned int ping_freq; /* cached ping freq from client conf class */
- unsigned short lastsq; /* # 2k blocks when sendqueued called last */
- unsigned short port; /* and the remote port# too :-) */
- unsigned char targets[MAXTARGETS]; /* Hash values of current targets */
- char sock_ip[SOCKIPLEN + 1]; /* this is the ip address as a string */
- char sockhost[HOSTLEN + 1]; /* This is the host name from the socket and
- after which the connection was accepted. */
- char passwd[PASSWDLEN + 1];
- char buffer[BUFSIZE]; /* Incoming message buffer; or the error that
+ unsigned long con_magic; /* magic number */
+ struct Connection* con_next; /* Next connection with queued data */
+ struct Connection** con_prev_p; /* What points to us */
+ struct Client* con_client; /* Client associated with connection */
+ unsigned int con_count; /* Amount of data in buffer */
+ int con_fd; /* >= 0, for local clients */
+ int con_freeflag; /* indicates if connection can be freed */
+ int con_error; /* last socket level error for client */
+ unsigned int con_snomask; /* mask for server messages */
+ time_t con_nextnick; /* Next time a nick change is allowed */
+ time_t con_nexttarget;/* Next time a target change is allowed */
+ unsigned int con_cookie; /* Random number the user must PONG */
+ struct MsgQ con_sendQ; /* Outgoing message queue--if socket full */
+ struct DBuf con_recvQ; /* Hold for data incoming yet to be parsed */
+ unsigned int con_sendM; /* Statistics: protocol messages send */
+ unsigned int con_sendK; /* Statistics: total k-bytes send */
+ unsigned int con_receiveM;/* Statistics: protocol messages received */
+ unsigned int con_receiveK; /* Statistics: total k-bytes received */
+ unsigned short con_sendB; /* counters to count upto 1-k lots of bytes */
+ unsigned short con_receiveB; /* sent and received. */
+ struct Listener* con_listener; /* listening client which we accepted
+ from */
+ struct SLink* con_confs; /* Configuration record associated */
+ HandlerType con_handler; /* message index into command table
+ for parsing */
+ struct DNSReply* con_dns_reply; /* DNS reply used during client
+ registration */
+ struct ListingArgs* con_listing;
+ unsigned int con_max_sendq; /* cached max send queue for client */
+ unsigned int con_ping_freq; /* cached ping freq from client conf
+ class */
+ unsigned short con_lastsq; /* # 2k blocks when sendqueued called last */
+ unsigned short con_port; /* and the remote port# too :-) */
+ unsigned char con_targets[MAXTARGETS]; /* Hash values of current
+ targets */
+ char con_sock_ip[SOCKIPLEN + 1]; /* this is the ip address as a string */
+ char con_sockhost[HOSTLEN + 1]; /* This is the host name from the socket and
+ after which the connection was accepted. */
+ char con_passwd[PASSWDLEN + 1];
+ char con_buffer[BUFSIZE]; /* Incoming message buffer; or the error that
caused this clients socket to be `dead' */
+ struct Socket con_socket; /* socket descriptor for client */
+ struct Timer con_proc; /* process latent messages from client */
+ struct AuthRequest* con_auth; /* auth request for client */
};
-#define cli_next(cli) ((cli)->next)
-#define cli_prev(cli) ((cli)->prev)
-#define cli_hnext(cli) ((cli)->hnext)
-#define cli_from(cli) ((cli)->from)
-#define cli_user(cli) ((cli)->user)
-#define cli_serv(cli) ((cli)->serv)
-#define cli_whowas(cli) ((cli)->whowas)
-#define cli_yxx(cli) ((cli)->yxx)
-#define cli_lasttime(cli) ((cli)->lasttime)
-#define cli_since(cli) ((cli)->since)
-#define cli_firsttime(cli) ((cli)->firsttime)
-#define cli_lastnick(cli) ((cli)->lastnick)
-#define cli_marker(cli) ((cli)->marker)
-#define cli_flags(cli) ((cli)->flags)
-#define cli_hopcount(cli) ((cli)->hopcount)
-#define cli_ip(cli) ((cli)->ip)
-#define cli_status(cli) ((cli)->status)
-#define cli_local(cli) ((cli)->local)
-#define cli_name(cli) ((cli)->name)
-#define cli_username(cli) ((cli)->username)
-#define cli_info(cli) ((cli)->info)
-
-#define cli_count(cli) ((cli)->count)
-#define cli_fd(cli) ((cli)->fd)
-#define cli_error(cli) ((cli)->error)
-#define cli_snomask(cli) ((cli)->snomask)
-#define cli_nextnick(cli) ((cli)->nextnick)
-#define cli_nexttarget(cli) ((cli)->nexttarget)
-#define cli_cookie(cli) ((cli)->cookie)
-#define cli_sendQ(cli) ((cli)->sendQ)
-#define cli_recvQ(cli) ((cli)->recvQ)
-#define cli_sendM(cli) ((cli)->sendM)
-#define cli_sendK(cli) ((cli)->sendK)
-#define cli_receiveM(cli) ((cli)->receiveM)
-#define cli_receiveK(cli) ((cli)->receiveK)
-#define cli_sendB(cli) ((cli)->sendB)
-#define cli_receiveB(cli) ((cli)->receiveB)
-#define cli_listener(cli) ((cli)->listener)
-#define cli_confs(cli) ((cli)->confs)
-#define cli_handler(cli) ((cli)->handler)
-#define cli_dns_reply(cli) ((cli)->dns_reply)
-#define cli_listing(cli) ((cli)->listing)
-#define cli_max_sendq(cli) ((cli)->max_sendq)
-#define cli_ping_freq(cli) ((cli)->ping_freq)
-#define cli_lastsq(cli) ((cli)->lastsq)
-#define cli_port(cli) ((cli)->port)
-#define cli_targets(cli) ((cli)->targets)
-#define cli_sock_ip(cli) ((cli)->sock_ip)
-#define cli_sockhost(cli) ((cli)->sockhost)
-#define cli_passwd(cli) ((cli)->passwd)
-#define cli_buffer(cli) ((cli)->buffer)
+#define CONNECTION_MAGIC 0x12f955f3
+
+struct Client {
+ unsigned long cli_magic; /* magic number */
+ struct Client* cli_next; /* link in GlobalClientList */
+ struct Client* cli_prev; /* link in GlobalClientList */
+ struct Client* cli_hnext; /* link in hash table bucket or this */
+ struct Connection* cli_connect; /* Connection structure associated with us */
+ struct User* cli_user; /* ...defined, if this is a User */
+ struct Server* cli_serv; /* ...defined, if this is a server */
+ struct Whowas* cli_whowas; /* Pointer to ww struct to be freed on quit */
+ char cli_yxx[4]; /* Numeric Nick: YMM if this is a server,
+ XX0 if this is a user */
+ /*
+ * XXX - move these to local part for next release
+ * (lasttime, since)
+ */
+ time_t cli_lasttime; /* last time data read from socket */
+ time_t cli_since; /* last time we parsed something, flood control */
+
+ time_t cli_firsttime; /* time client was created */
+ time_t cli_lastnick; /* TimeStamp on nick */
+ int cli_marker; /* /who processing marker */
+ unsigned int cli_flags; /* client flags */
+ unsigned int cli_hopcount; /* number of servers to this 0 = local */
+ struct in_addr cli_ip; /* Real ip# NOT defined for remote servers! */
+ short cli_status; /* Client type */
+ unsigned char cli_local; /* local or remote client */
+ struct Privs cli_privs; /* Oper privileges */
+ char cli_name[HOSTLEN + 1]; /* Unique name of the client, nick or host */
+ char cli_username[USERLEN + 1]; /* username here now for auth stuff */
+ char cli_info[REALLEN + 1]; /* Free form additional client information */
+};
+
+#define CLIENT_MAGIC 0x4ca08286
+
+#define cli_verify(cli) ((cli)->cli_magic == CLIENT_MAGIC)
+#define cli_magic(cli) ((cli)->cli_magic)
+#define cli_next(cli) ((cli)->cli_next)
+#define cli_prev(cli) ((cli)->cli_prev)
+#define cli_hnext(cli) ((cli)->cli_hnext)
+#define cli_connect(cli) ((cli)->cli_connect)
+#define cli_from(cli) ((cli)->cli_connect->con_client)
+#define cli_user(cli) ((cli)->cli_user)
+#define cli_serv(cli) ((cli)->cli_serv)
+#define cli_whowas(cli) ((cli)->cli_whowas)
+#define cli_yxx(cli) ((cli)->cli_yxx)
+#define cli_lasttime(cli) ((cli)->cli_lasttime)
+#define cli_since(cli) ((cli)->cli_since)
+#define cli_firsttime(cli) ((cli)->cli_firsttime)
+#define cli_lastnick(cli) ((cli)->cli_lastnick)
+#define cli_marker(cli) ((cli)->cli_marker)
+#define cli_flags(cli) ((cli)->cli_flags)
+#define cli_hopcount(cli) ((cli)->cli_hopcount)
+#define cli_ip(cli) ((cli)->cli_ip)
+#define cli_status(cli) ((cli)->cli_status)
+#define cli_local(cli) ((cli)->cli_local)
+#define cli_privs(cli) ((cli)->cli_privs)
+#define cli_name(cli) ((cli)->cli_name)
+#define cli_username(cli) ((cli)->cli_username)
+#define cli_info(cli) ((cli)->cli_info)
+
+#define cli_count(cli) ((cli)->cli_connect->con_count)
+#define cli_fd(cli) ((cli)->cli_connect->con_fd)
+#define cli_freeflag(cli) ((cli)->cli_connect->con_freeflag)
+#define cli_error(cli) ((cli)->cli_connect->con_error)
+#define cli_snomask(cli) ((cli)->cli_connect->con_snomask)
+#define cli_nextnick(cli) ((cli)->cli_connect->con_nextnick)
+#define cli_nexttarget(cli) ((cli)->cli_connect->con_nexttarget)
+#define cli_cookie(cli) ((cli)->cli_connect->con_cookie)
+#define cli_sendQ(cli) ((cli)->cli_connect->con_sendQ)
+#define cli_recvQ(cli) ((cli)->cli_connect->con_recvQ)
+#define cli_sendM(cli) ((cli)->cli_connect->con_sendM)
+#define cli_sendK(cli) ((cli)->cli_connect->con_sendK)
+#define cli_receiveM(cli) ((cli)->cli_connect->con_receiveM)
+#define cli_receiveK(cli) ((cli)->cli_connect->con_receiveK)
+#define cli_sendB(cli) ((cli)->cli_connect->con_sendB)
+#define cli_receiveB(cli) ((cli)->cli_connect->con_receiveB)
+#define cli_listener(cli) ((cli)->cli_connect->con_listener)
+#define cli_confs(cli) ((cli)->cli_connect->con_confs)
+#define cli_handler(cli) ((cli)->cli_connect->con_handler)
+#define cli_dns_reply(cli) ((cli)->cli_connect->con_dns_reply)
+#define cli_listing(cli) ((cli)->cli_connect->con_listing)
+#define cli_max_sendq(cli) ((cli)->cli_connect->con_max_sendq)
+#define cli_ping_freq(cli) ((cli)->cli_connect->con_ping_freq)
+#define cli_lastsq(cli) ((cli)->cli_connect->con_lastsq)
+#define cli_port(cli) ((cli)->cli_connect->con_port)
+#define cli_targets(cli) ((cli)->cli_connect->con_targets)
+#define cli_sock_ip(cli) ((cli)->cli_connect->con_sock_ip)
+#define cli_sockhost(cli) ((cli)->cli_connect->con_sockhost)
+#define cli_passwd(cli) ((cli)->cli_connect->con_passwd)
+#define cli_buffer(cli) ((cli)->cli_connect->con_buffer)
+#define cli_socket(cli) ((cli)->cli_connect->con_socket)
+#define cli_proc(cli) ((cli)->cli_connect->con_proc)
+#define cli_auth(cli) ((cli)->cli_connect->con_auth)
+
+#define con_verify(con) ((con)->con_magic == CONNECTION_MAGIC)
+#define con_magic(con) ((con)->con_magic)
+#define con_next(con) ((con)->con_next)
+#define con_prev_p(con) ((con)->con_prev_p)
+#define con_client(con) ((con)->con_client)
+#define con_count(con) ((con)->con_count)
+#define con_fd(con) ((con)->con_fd)
+#define con_freeflag(con) ((con)->con_freeflag)
+#define con_error(con) ((con)->con_error)
+#define con_snomask(con) ((con)->con_snomask)
+#define con_nextnick(con) ((con)->con_nextnick)
+#define con_nexttarget(con) ((con)->con_nexttarget)
+#define con_cookie(con) ((con)->con_cookie)
+#define con_sendQ(con) ((con)->con_sendQ)
+#define con_recvQ(con) ((con)->con_recvQ)
+#define con_sendM(con) ((con)->con_sendM)
+#define con_sendK(con) ((con)->con_sendK)
+#define con_receiveM(con) ((con)->con_receiveM)
+#define con_receiveK(con) ((con)->con_receiveK)
+#define con_sendB(con) ((con)->con_sendB)
+#define con_receiveB(con) ((con)->con_receiveB)
+#define con_listener(con) ((con)->con_listener)
+#define con_confs(con) ((con)->con_confs)
+#define con_handler(con) ((con)->con_handler)
+#define con_dns_reply(con) ((con)->con_dns_reply)
+#define con_listing(con) ((con)->con_listing)
+#define con_max_sendq(con) ((con)->con_max_sendq)
+#define con_ping_freq(con) ((con)->con_ping_freq)
+#define con_lastsq(con) ((con)->con_lastsq)
+#define con_port(con) ((con)->con_port)
+#define con_targets(con) ((con)->con_targets)
+#define con_sock_ip(con) ((con)->con_sock_ip)
+#define con_sockhost(con) ((con)->con_sockhost)
+#define con_passwd(con) ((con)->con_passwd)
+#define con_buffer(con) ((con)->con_buffer)
+#define con_socket(con) ((con)->con_socket)
+#define con_proc(con) ((con)->con_proc)
+#define con_auth(con) ((con)->con_auth)
#define STAT_CONNECTING 0x001 /* connecting to another server */
#define STAT_HANDSHAKE 0x002 /* pass - server sent */
#define FLAGS_CLOSING 0x0400 /* set when closing to suppress errors */
#define FLAGS_UPING 0x0800 /* has active UDP ping request */
#define FLAGS_CHKACCESS 0x1000 /* ok to check clients access if set */
+#define FLAGS_HUB 0x2000 /* server is a hub */
+#define FLAGS_SERVICE 0x4000 /* server is a service */
#define FLAGS_LOCAL 0x00010000 /* set for local clients */
#define FLAGS_GOTID 0x00020000 /* successful ident lookup achieved */
#define FLAGS_DOID 0x00040000 /* I-lines say must use ident return */
#define SendDebug(x) (cli_flags(x) & FLAGS_DEBUG)
#define SendServNotice(x) (cli_flags(x) & FLAGS_SERVNOTICE)
#define SendWallops(x) (cli_flags(x) & FLAGS_WALLOP)
+#define IsHub(x) (cli_flags(x) & FLAGS_HUB)
+#define IsService(x) (cli_flags(x) & FLAGS_SERVICE)
#define IsPrivileged(x) (IsAnOper(x) || IsServer(x))
#define SetOper(x) (cli_flags(x) |= FLAGS_OPER)
#define SetUPing(x) (cli_flags(x) |= FLAGS_UPING)
#define SetWallops(x) (cli_flags(x) |= FLAGS_WALLOP)
+#define SetServNotice(x) (cli_flags(x) |= FLAGS_SERVNOTICE)
+#define SetHub(x) (cli_flags(x) |= FLAGS_HUB)
+#define SetService(x) (cli_flags(x) |= FLAGS_SERVICE)
#define ClearAccess(x) (cli_flags(x) &= ~FLAGS_CHKACCESS)
#define ClearBurst(x) (cli_flags(x) &= ~FLAGS_BURST)
#define ClearOper(x) (cli_flags(x) &= ~FLAGS_OPER)
#define ClearUPing(x) (cli_flags(x) &= ~FLAGS_UPING)
#define ClearWallops(x) (cli_flags(x) &= ~FLAGS_WALLOP)
+#define ClearServNotice(x) (cli_flags(x) &= ~FLAGS_SERVNOTICE)
+
+/* free flags */
+#define FREEFLAG_SOCKET 0x0001 /* socket needs to be freed */
+#define FREEFLAG_TIMER 0x0002 /* timer needs to be freed */
/* server notice stuff */
#define SNO_OPER (SNO_CONNEXIT|SNO_OLDREALOP)
#define SNO_NOISY (SNO_SERVKILL|SNO_UNAUTH)
+#define PrivSet(pset, priv) ((pset)->priv_mask[_PRIV_IDX(priv)] |= \
+ _PRIV_BIT(priv))
+#define PrivClr(pset, priv) ((pset)->priv_mask[_PRIV_IDX(priv)] &= \
+ ~(_PRIV_BIT(priv)))
+#define PrivHas(pset, priv) ((pset)->priv_mask[_PRIV_IDX(priv)] & \
+ _PRIV_BIT(priv))
+
+#define GrantPriv(cli, priv) (PrivSet(&(cli_privs(cli)), priv))
+#define RevokePriv(cli, priv) (PrivClr(&(cli_privs(cli)), priv))
+#define HasPriv(cli, priv) (PrivHas(&(cli_privs(cli)), priv))
+
typedef enum ShowIPType {
HIDE_IP,
SHOW_IP,
extern const char* get_client_name(const struct Client* sptr, int showip);
extern int client_get_ping(const struct Client* local_client);
-
+extern void client_drop_sendq(struct Connection* con);
+extern void client_add_sendq(struct Connection* con,
+ struct Connection** con_p);
+extern void client_set_privs(struct Client* client);
+extern int client_report_privs(struct Client* to, struct Client* client);
#endif /* INCLUDED_client_h */
projects / ircu2.10.12-pk.git / blobdiff