#include "portab.h"
#include "tool.h"
#include "ng_ipaddr.h"
+#include "resolve.h"
+#include "conf-ssl.h"
+
typedef struct _Conf_Oper
{
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
} 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 */
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;
/* Disable all DNS functions? */
GLOBAL bool Conf_NoDNS;
-/* listen for incoming ipv6 connections if OS supports it (default: yes)? */
-GLOBAL bool Conf_ListenIPv6;
-
-/* listen for incoming ipv4 connections if OS supports it (default: yes)? */
-GLOBAL bool Conf_ListenIPv4;
-
/*
* try to connect to remote systems using the ipv6 protocol,
* if they have an ipv6 address? (default yes)