X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.h;h=5328465677c5939aa9718c03c5c0b24ab4846d3c;hp=ce09997c23ee8bffeb460c405a3791fa922b527c;hb=4c113d8850dfc423e3dae2d2f90e7e9a9d42f0b0;hpb=001c00b27312289e40425db19ce9f7d957ffbbba

diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h
index ce09997c..53284656 100644
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -8,8 +8,6 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conf.h,v 1.44 2007/10/25 11:01:19 fw Exp $
- *
  * Configuration management (header)
  */
 
@@ -22,6 +20,11 @@
 #include "defines.h"
 #include "array.h"
 #include "portab.h"
+#include "tool.h"
+#include "ng_ipaddr.h"
+#include "resolve.h"
+#include "conf-ssl.h"
+
 
 typedef struct _Conf_Oper
 {
@@ -33,7 +36,6 @@ typedef struct _Conf_Oper
 typedef struct _Conf_Server
 {
 	char host[HOST_LEN];		/* Hostname */
-	char ip[16];			/* IP address (Resolver) */
 	char name[CLIENT_ID_LEN];	/* IRC-Client-ID */
 	char pwd_in[CLIENT_PASS_LEN];	/* Password which must be received */
 	char pwd_out[CLIENT_PASS_LEN];	/* Password to send to peer */
@@ -43,8 +45,28 @@ typedef struct _Conf_Server
 	RES_STAT res_stat;		/* Status of the resolver */
 	int flags;			/* Flags */
 	CONN_ID conn_id;		/* ID of server connection or NONE */
+	ng_ipaddr_t bind_addr;		/* source address to use for outgoing
+					   connections */
+	ng_ipaddr_t dst_addr[2];	/* list of addresses to connect to */
+#ifdef SSL_SUPPORT
+	bool SSLConnect;		/* connect() using SSL? */
+#endif
+	char svs_mask[CLIENT_ID_LEN];	/* Mask of nick names that are
+					   services */
 } CONF_SERVER;
 
+
+#ifdef SSL_SUPPORT
+struct SSLOptions {
+	char *KeyFile;
+	char *CertFile;
+	char *DHFile;
+	array ListenPorts;
+	array KeyFilePassword;
+};
+#endif
+
+
 typedef struct _Conf_Channel
 {
 	char name[CHANNEL_NAME_LEN];	/* Name of the channel */
@@ -83,7 +105,7 @@ GLOBAL char Conf_MotdPhrase[LINE_LEN];
 GLOBAL array Conf_ListenPorts;
 
 /* Address to which the socket should be bound or empty (=all) */
-GLOBAL char Conf_ListenAddress[16];
+GLOBAL char *Conf_ListenAddress;
 
 /* User and group ID the server should run with */
 GLOBAL uid_t Conf_UID;
@@ -121,6 +143,18 @@ GLOBAL bool Conf_OperCanMode;
 /* Disable all DNS functions? */
 GLOBAL bool Conf_NoDNS;
 
+/* Disable IDENT lookups, even when compiled with support for it */
+GLOBAL bool Conf_NoIdent;
+
+/*
+ * try to connect to remote systems using the ipv6 protocol,
+ * if they have an ipv6 address? (default yes)
+ */
+GLOBAL bool Conf_ConnectIPv6;
+
+/* same as above, but for ipv4 hosts, default: yes  */
+GLOBAL bool Conf_ConnectIPv4;
+
 /* If an IRC op gives chanop privileges without being a chanop,
  * ircd2 will ignore the command. This enables a workaround:
  * It masks the command as coming from the server */
@@ -135,9 +169,11 @@ GLOBAL int Conf_MaxJoins;
 /* Maximum number of connections per IP address */
 GLOBAL int Conf_MaxConnectionsIP;
 
+/* Maximum length of a nick name */
+GLOBAL unsigned int Conf_MaxNickLength;
 
 GLOBAL void Conf_Init PARAMS((void));
-GLOBAL void Conf_Rehash PARAMS((void));
+GLOBAL bool Conf_Rehash PARAMS((void));
 GLOBAL int Conf_Test PARAMS((void));
 
 GLOBAL void Conf_UnsetServer PARAMS(( CONN_ID Idx ));
@@ -149,6 +185,8 @@ GLOBAL bool Conf_EnablePassiveServer PARAMS((const char *Name));
 GLOBAL bool Conf_DisableServer PARAMS(( char *Name ));
 GLOBAL bool Conf_AddServer PARAMS(( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd ));
 
+GLOBAL bool Conf_IsService PARAMS((int ConfServer, char *Nick));
+
 
 #endif