From 09254f58ffd499cd6c6faef77a23266c7e03deb0 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sat, 30 Sep 2000 06:06:51 +0000 Subject: [PATCH] updates --- CHANGES | 29 ++++++++++ apps/silcd/testi.conf | 123 ++++++++++++++++++++++++++++++++++++++---- configure.in | 2 +- 3 files changed, 144 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index 8e5e073c..43126dd0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,32 @@ +Sat Sep 30 08:48:47 EEST 2000 Pekka Riikonen + + * Added new function into lib/silcutil/silcschedule.[ch]: + silc_schedule_with_fd to select() a specified fd. The function + returns after timeout expires or data arrives or goes. The + function is used by packet routines to wait that all data is + received from network. + + * Fixed data reading from network in lib/silccore/silcpacket.c. + The code now assures that all data is read from the fd and then + continues packet processing. This was a bug fix since the code + used to drop some data in some circumstances. + + * Added new function into lib/silcclient/client.[ch]: + silc_client_start_key_exchange to start key exchange after + connection has been established to server. The code internally + now uses this funtion but its main purpose was to provide it + for applications that perform their own connecting. After + application has created a connection it merely calls this + function to start the key exchange between client and server. + The library takes care of everything else after that. + + Updated also lib/silcclient/README to explain the usage of + this new function. + + * Do not send to application information that connection has + been established. Application gets notified it by connect + operation anyway. + Thu Sep 28 23:40:19 EEST 2000 Pekka Riikonen * Applied cras's patch to add silc_schedule_one function. The diff --git a/apps/silcd/testi.conf b/apps/silcd/testi.conf index c04a7aa8..a36fc0e4 100644 --- a/apps/silcd/testi.conf +++ b/apps/silcd/testi.conf @@ -1,44 +1,149 @@ +# +# Configured ciphers. +# +# Format: ::: +# +# If the cipher is builtin the maybe omitted. +# [Cipher] -rc6:/home/priikone/silc/lib/silcsim/modules/rc6.sim.so:16:16 -twofish:/home/priikone/silc/lib/silcsim/modules/twofish.sim.so:16:16 -mars:/home/priikone/silc/lib/silcsim/modules/mars.sim.so:16:16 -none:/home/priikone/silc/lib/silcsim/modules/none.sim.so:0:0 +twofish:../lib/silcsim/modules/twofish.sim.so:16:16 +rc6:../lib/silcsim/modules/rc6.sim.so:16:16 +mars:../lib/silcsim/modules/mars.sim.so:16:16 +none:../lib/silcsim/modules/none.sim.so:0:0 +# +# Configured hash functions. +# +# Format: ::: +# +# If the hash function is builtin the maybe omitted. +# [HashFunction] md5::64:16 sha1::64:20 +# +# Configured PKCS. +# +# Format: :: +# +# NOTE: must be omitted as PKCS cannot be modules currently. +# #[PKCS] #rsa::1024 #dss::1024 +# +# Server's administrative information. +# +# Format: ::: +# [AdminInfo] -Mun huone:Mun servo:Pekka Riikonen:priikone@poseidon.pspt.fi +Kuopio, Finland:Test Server:Pekka Riikonen:priikone@poseidon.pspt.fi +# +# Server information. +# +# Format: +::: +# [ServerInfo] -lassi.kuo.fi.ssh.com:10.2.1.6:Kuopio, Finland:1333 +silc.pspt.fi:193.166.51.47:Kuopio, Finland:1707 +# +# Listenning ports. +# +# Format: :: +# [ListenPort] -10.2.1.6:10.2.1.6:1333 +193.166.51.47:193.166.51.47:1707 +# +# Log files. +# +# This section is used to set various logging files, their paths +# and maximum sizes. All the other directives except those defined +# below are ignored in this section. Log files are purged after they +# reach the maximum set byte size. +# +# Format: infologfile:: +# warninglogile:: +# errorlogile:: +# fatallogile:: +# [Logging] infologfile:silcd.log:10000 #warninglogfile:/var/log/silcd_warning.log:10000 -errorlogfile:silcd2_error.log:10000 +#errorlogfile:ERROR.log:10000 #fatallogfile:/var/log/silcd_error.log: +# +# Connection classes. +# +# This section is used to define connection classes. These can be +# used to optimize the server and the connections.# +# +# Format: ::: +# [ConnectionClass] 1:100:100:100 2:200:300:400 +# +# Configured client connections. +# +# Format: :::: +# [ClientConnection] -:::1333:1 +:::1707:1 +# +# Configured server administrator connections +# +# Format: :::: +# [AdminConnection] +#10.2.1.199:passwd:veryscret:XXX:1 +# +# Configured server connections. +# +# If server connections are configured it means that our server is +# router server. Normal server must not configure server connections. +# Thus, if your server is not router do not configure this section. If +# your server is router, this must be configured. +# +# Format: ::::: +# [ServerConnection] +#10.2.1.7:passwd:veryscret:706:1:1 +# +# Configured router connections. +# +# For normal server only one entry maybe configured to this section. It +# must be the router this server will be connected to. For router server, +# this sections includes all configured router connections. The first +# configured connection is the primary route. +# +# Format: ::::: +# [RouterConnection] +#10.2.1.100:passwd:veryverysecret:706:1:1 +# +# Denied connections. +# +# These connections are denied to connect our server. +# +# Format: :