-Sun Aug 4 1
3:23:40 CEST 2002 Pekka Riikonen <priikone@silcnet.org>
+Sun Aug 4 1
5:55:40 CEST 2002 Pekka Riikonen <priikone@silcnet.org>
* More fixed for not having purge timeout for global clients
that are on channel. Affected files silcd/command_reply.c
and server_util.c.
+ * Fixed the rekey protocol to work with backup router connections.
+ Rekey packets are now allowed on disabled connections as
+ well. Affected files silcd/packet_send.c and server.c.
+
+ * Do not switch to be as backup router when shutting down and
+ closing the primary connection. Affected file silcd/server.c.
+
+ * Fixed memory leaks in backup router deleting. Added
+ silc_server_backup_free to free all data during shutdown of
+ server. Affected files silcd/server_backup.[ch].
+
Sun Jul 14 21:33:32 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
* Do not process commands if the sock->user_data is NULL.
TODO/bugs In SILC Server
========================
- o Rekey protocol does not work with backup router (due to disabled
- connections)!?
-
- o Do not switch to primary router on backup if server is shutting
- (the backup) down.
-
o Implement the <Requested Attributes> and the Attribute Payload to
the core library, client and server. Maybe implementations of
RFC 2425 and RFC 2426 to make it complete.
/*
- packet_send.c
+ packet_send.c
Author: Pekka Riikonen <priikone@silcnet.org>
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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
+ the Free Software Foundation; version 2 of the License.
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
if (SILC_IS_DISCONNECTING(sock))
return;
- /* If entry is disabled do not sent anything. */
+ /* If entry is disabled do not sent anything. Allow hearbeat and
+ rekeys, though */
if ((idata && idata->status & SILC_IDLIST_STATUS_DISABLED &&
- type != SILC_PACKET_HEARTBEAT) ||
+ type != SILC_PACKET_HEARTBEAT && type != SILC_PACKET_REKEY &&
+ type != SILC_PACKET_REKEY_DONE) ||
sock->user_data == server->id_entry) {
SILC_LOG_DEBUG(("Connection is disabled"));
return;
/*
- server.c
+ server.c
Author: Pekka Riikonen <priikone@silcnet.org>
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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
}
#endif
+ silc_server_backup_free(server);
silc_server_config_unref(&server->config_ref);
if (server->rng)
silc_rng_free(server->rng);
ret = silc_packet_parse_special(packet, idata ? idata->receive_key : NULL);
/* If entry is disabled ignore what we got. */
- if (ret != SILC_PACKET_RESUME_ROUTER &&
- idata && idata->status & SILC_IDLIST_STATUS_DISABLED) {
- SILC_LOG_DEBUG(("Connection is disabled"));
- goto out;
- }
- if (ret != SILC_PACKET_HEARTBEAT &&
- idata && idata->status & SILC_IDLIST_STATUS_DISABLED) {
+ if (idata && idata->status & SILC_IDLIST_STATUS_DISABLED &&
+ ret != SILC_PACKET_HEARTBEAT && ret != SILC_PACKET_RESUME_ROUTER &&
+ ret != SILC_PACKET_REKEY && ret != SILC_PACKET_REKEY_DONE) {
SILC_LOG_DEBUG(("Connection is disabled"));
goto out;
}
sock->type != SILC_SOCKET_TYPE_ROUTER)
backup_router = NULL;
+ if (server->server_shutdown)
+ backup_router = NULL;
+
/* If this was our primary router connection then we're lost to
the outside world. */
if (server->router == user_data) {
int i;
if (!server->backup)
- return ;
+ return;
for (i = 0; i < server->backup->servers_count; i++) {
if (server->backup->servers[i].server == server_entry) {
}
}
+/* Frees all data allocated for backup routers. Call this after deleting
+ all backup routers and when new routers are added no more, for example
+ when shutting down the server. */
+
+void silc_server_backup_free(SilcServer server)
+{
+ int i;
+
+ if (!server->backup)
+ return;
+
+ /* Delete existing servers if caller didn't do it */
+ for (i = 0; i < server->backup->servers_count; i++) {
+ if (server->backup->servers[i].server)
+ silc_server_backup_del(server, server->backup->servers[i].server);
+ }
+
+ silc_free(server->backup->servers);
+ silc_free(server->backup);
+ server->backup = NULL;
+}
+
/* Marks the IP address and port from the `server_id' as being replaced
by backup router indicated by the `server'. If the router connects at
a later time we can check whether it has been replaced by an backup
/* Deletes the backup server `server_entry'. */
void silc_server_backup_del(SilcServer server, SilcServerEntry server_entry);
+/* Frees all data allocated for backup routers. Call this after deleting
+ all backup routers and when new routers are added no more, for example
+ when shutting down the server. */
+void silc_server_backup_free(SilcServer server);
+
/* Marks the IP address and port from the `server_id' as being replaced
by backup router indicated by the `server'. If the router connects at
a later time we can check whether it has been replaced by an backup
This directory includes example files for a small SILC network. The
-network consists of three (3) routers, and seven (7) servers. One of
-the cell also has a backup router too. The topology of the network is
-as follows:
+network consists of one router, and three (3) servers. The cell also
+has one backup router.
Cell 1:
-Router 212.146.42.250 cell1_router.conf
- Backup router 212.146.42.100 cell1_backup.conf
- Server1 212.146.42.101 cell1_server1.conf
- Server2 212.146.42.102 cell1_server2.conf
-
-Cell 2:
-Router 212.146.42.251 cell2_router.conf
- Server1 212.146.42.130 cell2_server1.conf
- Server2 212.146.42.131 cell2_server2.conf
-
-Cell 3:
-Router 212.146.42.252 cell3_router.conf
- Server1 212.146.42.150 cell3_server1.conf
- Server2 212.146.42.151 cell3_server2.conf
+Router 212.146.42.250 cell_router.conf
+ Backup router 212.146.42.100 cell_backup.conf
+ Server1 212.146.42.101 cell_server1.conf
+ Server2 212.146.42.102 cell_server2.conf
To make it simple all servers and routers use the same public and private
keys. They are the silcd.pub and silcd.prv in this directory. Also, to
+++ /dev/null
-#
-# CELL 1 Backup Router 212.146.42.100 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell1:Backup:Administrator:admin@cell1backup.com
-
-[ServerInfo]
-backup.cell1.com:212.146.42.100:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.100:212.146.42.100:706
-
-[Logging]
-infologfile:cell1_backup.log:
-warninglogfile:cell1_backup.log:
-errorlogfile:cell1_backup.log:
-fatallogfile:cell1_backup.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-# backup connections
-212.146.42.101:passwd:priikone:706:1:1:1
-212.146.42.102:passwd:priikone:706:1:1:1
-
-[RouterConnection]
-# my primary
-212.146.42.250:passwd:priikone:706:1:1:1
-# backup connection to my primary's primary
-212.146.42.251:passwd:priikone:706:1:1:1:212.146.42.250:706
-# this use my primary as it's primary and me as backup
-212.146.42.252:passwd:priikone:706:1:1:0:212.146.42.250:706
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 1 Router 212.146.42.250 on port 706
-#
-# CELL 1 is:
-#
-# Router 212.146.42.250
-# Backup router 212.146.42.100
-# Server1 212.146.42.101
-# Server2 212.146.42.102
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell1:Router:Administrator:admin@cell1router.com
-
-[ServerInfo]
-router.cell1.com:212.146.42.250:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.250:212.146.42.250:706
-
-[Logging]
-infologfile:cell1_router.log:
-warninglogfile:cell1_router.log:
-errorlogfile:cell1_router.log:
-fatallogfile:cell1_router.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-212.146.42.101:passwd:priikone:706:1:1
-212.146.42.102:passwd:priikone:706:1:1
-
-[RouterConnection]
-# my primary
-212.146.42.251:passwd:priikone:706:1:1:1
-# this use me as primary
-212.146.42.252:passwd:priikone:706:1:1:0
-# our backup router (it will replace me if I'll go down)
-212.146.42.100:passwd:priikone:706:1:1:0:212.146.42.250:706:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 1 Server 212.146.42.101 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell1:Server1:Administrator:admin@cell1server1.com
-
-[ServerInfo]
-server1.cell1.com:212.146.42.101:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.101:212.146.42.101:706
-
-[Logging]
-infologfile:cell1_server1.log:
-warninglogfile:cell1_server1.log:
-errorlogfile:cell1_server1.log:
-fatallogfile:cell1_server1.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.250:passwd:priikone:706:1:1:1
-# our backup router in the cell
-212.146.42.100:passwd:priikone:706:1:1:1:212.146.42.250:706:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 1 Server 212.146.42.102 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell1:Server2:Administrator:admin@cell1server2.com
-
-[ServerInfo]
-server2.cell1.com:212.146.42.102:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.102:212.146.42.102:706
-
-[Logging]
-infologfile:cell1_server2.log:
-warninglogfile:cell1_server2.log:
-errorlogfile:cell1_server2.log:
-fatallogfile:cell1_server2.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.250:passwd:priikone:706:1:1:1
-# our backup router in the cell
-212.146.42.100:passwd:priikone:706:1:1:1:212.146.42.250:706:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 2 Router 212.146.42.251 on port 706
-#
-# CELL 2 is:
-#
-# Router 212.146.42.251
-# Server1 212.146.42.130
-# Server2 212.146.42.131
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell2:Router:Administrator:admin@cell2router.com
-
-[ServerInfo]
-router.cell2.com:212.146.42.251:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.251:212.146.42.251:706
-
-[Logging]
-infologfile:cell2_router.log:
-warninglogfile:cell2_router.log:
-errorlogfile:cell2_router.log:
-fatallogfile:cell2_router.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-212.146.42.130:passwd:priikone:706:1:1
-212.146.42.131:passwd:priikone:706:1:1
-
-[RouterConnection]
-# my primary
-212.146.42.252:passwd:priikone:706:1:1:1
-# this use me as primary
-212.146.42.250:passwd:priikone:706:1:1:0
-# this is the 212.146.42.250 router's backup router
-212.146.42.100:passwd:priikone:706:1:1:0:212.146.42.250:706:0
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 2 Server 212.146.42.130 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell2:Server1:Administrator:admin@cell2server1.com
-
-[ServerInfo]
-server1.cell2.com:212.146.42.130:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.130:212.146.42.130:706
-
-[Logging]
-infologfile:cell2_server1.log:
-warninglogfile:cell2_server1.log:
-errorlogfile:cell2_server1.log:
-fatallogfile:cell2_server1.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.251:passwd:priikone:706:1:1:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 2 Server 212.146.42.131 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell2:Server2:Administrator:admin@cell2server2.com
-
-[ServerInfo]
-server2.cell2.com:212.146.42.131:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.131:212.146.42.131:706
-
-[Logging]
-infologfile:cell2_server2.log:
-warninglogfile:cell2_server2.log:
-errorlogfile:cell2_server2.log:
-fatallogfile:cell2_server2.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.251:passwd:priikone:706:1:1:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 3 Router 212.146.42.252 on port 706
-#
-# CELL 3 is:
-#
-# Router 212.146.42.252
-# Server1 212.146.42.150
-# Server2 212.146.42.151
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell3:Router:Administrator:admin@cell3router.com
-
-[ServerInfo]
-router.cell3.com:212.146.42.252:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.252:212.146.42.252:706
-
-[Logging]
-infologfile:cell3_router.log:
-warninglogfile:cell3_router.log:
-errorlogfile:cell3_router.log:
-fatallogfile:cell3_router.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-212.146.42.150:passwd:priikone:706:1:1
-212.146.42.151:passwd:priikone:706:1:1
-
-[RouterConnection]
-# my primary
-212.146.42.250:passwd:priikone:706:1:1:1
-# this use me as primary
-212.146.42.251:passwd:priikone:706:1:1:0
-# this is 212.146.42.250 router's (my primary's) backup router
-212.146.42.100:passwd:priikone:706:1:1:1:212.146.42.250:706:0
-
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 3 Server 212.146.42.150 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell3:Server1:Administrator:admin@cell3server1.com
-
-[ServerInfo]
-server1.cell3.com:212.146.42.150:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.150:212.146.42.150:706
-
-[Logging]
-infologfile:cell3_server1.log:
-warninglogfile:cell3_server1.log:
-errorlogfile:cell3_server1.log:
-fatallogfile:cell3_server1.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.252:passwd:priikone:706:1:1:1
-
-[DenyConnection]
+++ /dev/null
-#
-# CELL 3 Server 212.146.42.151 on port 706
-#
-
-[Cipher]
-aes-256-cbc::32:16
-
-[Hash]
-md5::64:16
-sha1::64:20
-
-[hmac]
-hmac-sha1-96:sha1:12
-hmac-md5-96:md5:12
-hmac-sha1:sha1:20
-hmac-md5:md5:16
-
-[PKCS]
-rsa
-
-[serverkeys]
-./silcd.pub:./silcd.prv
-
-[Identity]
-nobody:nobody
-
-[AdminInfo]
-Cell3:Server2:Administrator:admin@cell3server2.com
-
-[ServerInfo]
-server2.cell3.com:212.146.42.151:Kuopio, Finland:706
-
-[ListenPort]
-212.146.42.151:212.146.42.151:706
-
-[Logging]
-infologfile:cell3_server2.log:
-warninglogfile:cell3_server2.log:
-errorlogfile:cell3_server2.log:
-fatallogfile:cell3_server2.log:
-
-[ConnectionClass]
-1:100:100:100
-2:200:300:400
-
-[ClientConnection]
-:::706:1
-
-[AdminConnection]
-*:priikone:*:passwd:testi
-
-[ServerConnection]
-
-[RouterConnection]
-# my primary
-212.146.42.252:passwd:priikone:706:1:1:1
-
-[DenyConnection]
--- /dev/null
+#
+# Backup router + Normal server
+# 212.146.24.252 on 1335
+#
+
+General {
+ key_exchange_rekey = 30;
+ #key_exchange_pfs = true;
+};
+
+ServerInfo {
+ hostname = "pelle.kuo.fi.ssh.com";
+ primary { ip = "212.146.42.252"; port = 1335; };
+ servertype = "mun servo";
+ location = "mun huone";
+ admin = "Pekka Riikonen";
+ adminemail = "priikone@silcnet.org";
+ user = "nobody";
+ group = "nobody";
+ publickey = "./silcd.pub";
+ privatekey = "./silcd.prv";
+ motdfile = "./motd";
+};
+
+Logging {
+ quicklogs = true;
+ info { file = "silcd.log"; };
+};
+
+ConnectionParams {
+ name = "foo";
+ key_exchange_pfs = true;
+};
+
+Client { };
+
+Admin {
+ user = "priikone";
+ passphrase = "testi";
+};
+
+#############################################################################
+
+# This server use me as primary router
+ServerConnection {
+ host = "212.146.42.251";
+ passphrase = "priikone";
+ backup = true;
+};
+
+#############################################################################
+
+# My primary router
+RouterConnection {
+ host = "212.146.42.253";
+ port = 1334;
+ passphrase = "priikone";
+ initiator = true;
+};
Include "silcalgs.conf";
+General {
+ key_exchange_rekey = 30;
+ #key_exchange_pfs = true;
+};
+
ServerInfo {
hostname = "lassi.kuo.fi.ssh.com";
primary { ip = "212.146.42.253"; port = 1334; };
##############################################################################
#
-# This server use me as primary router. It is normal server in the cell.
+# These servers use me as primary router. They are normal servers in the
+# cell.
#
ServerConnection {
host = "212.146.42.251";
passphrase = "priikone";
};
+ServerConnection {
+ host = "212.146.42.250";
+ passphrase = "priikone";
+};
+
##############################################################################
#
# This server is our backup router (it will replace me if I go down). It
--- /dev/null
+#
+# Normal server 1
+# 212.146.24.251 on 1333
+#
+
+General {
+ key_exchange_rekey = 30;
+ #key_exchange_pfs = true;
+};
+
+ServerInfo {
+ hostname = "leevi.kuo.fi.ssh.com";
+ primary { ip = "212.146.42.251"; port = 1333; };
+ servertype = "mun servo";
+ location = "mun huone";
+ admin = "Pekka Riikonen";
+ adminemail = "priikone@silcnet.org";
+ user = "nobody";
+ group = "nobody";
+ publickey = "./silcd.pub";
+ privatekey = "./silcd.prv";
+ motdfile = "./motd";
+};
+
+Logging {
+ quicklogs = true;
+ info { file = "silcd.log"; };
+};
+
+ConnectionParams {
+ name = "foo";
+ key_exchange_pfs = true;
+};
+
+Client { };
+
+Admin {
+ user = "priikone";
+ passphrase = "testi";
+};
+
+#############################################################################
+
+# My primary router
+RouterConnection {
+ host = "212.146.42.253";
+ port = 1334;
+ passphrase = "priikone";
+ initiator = true;
+};
+
+# Our cell's backup router
+RouterConnection {
+ host = "212.146.42.252";
+ port = 1335;
+ passphrase = "priikone";
+ initiator = true;
+ backuphost = "212.146.42.253";
+ backupport = 1334;
+ backuplocal = true;
+};
--- /dev/null
+#
+# Normal server 2
+# 212.146.24.250 on 1334
+#
+
+General {
+ key_exchange_rekey = 30;
+ #key_exchange_pfs = true;
+};
+
+ServerInfo {
+ hostname = "huuhaa.ssh.com";
+ primary { ip = "212.146.42.250"; port = 1334; };
+ servertype = "mun servo";
+ location = "mun huone";
+ admin = "Pekka Riikonen";
+ adminemail = "priikone@silcnet.org";
+ user = "nobody";
+ group = "nobody";
+ publickey = "./silcd.pub";
+ privatekey = "./silcd.prv";
+ motdfile = "./motd";
+};
+
+Logging {
+ quicklogs = true;
+ info { file = "silcd.log"; };
+};
+
+ConnectionParams {
+ name = "foo";
+ key_exchange_pfs = true;
+};
+
+Client { };
+
+Admin {
+ user = "priikone";
+ passphrase = "testi";
+};
+
+#############################################################################
+
+# My primary router
+RouterConnection {
+ host = "212.146.42.253";
+ port = 1334;
+ passphrase = "priikone";
+ initiator = true;
+};
projects / silc.git / commitdiff