From 3a8b0fb742bba6cbb7f7f56744fafd43714e07cf Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 6 Nov 2007 15:30:55 +0000
Subject: [PATCH] 	updates.

---
 TODO            | 28 +++++++++++++++++++++++++++-
 distdir/default |  1 -
 distdir/server  |  1 -
 distdir/silcmap |  1 -
 distdir/toolkit |  1 -
 lib/Makefile.ad |  8 ++++----
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/TODO b/TODO
index 07b7b956..5bfd5f69 100644
--- a/TODO
+++ b/TODO
@@ -87,6 +87,8 @@ lib/silcclient, The Client Library
    should provide events so that application developer has a choice of
    developing the SILC app with callbacks or with events.
 
+ o Ability to recover from rekey errors, at least try to.
+
 
 Runtime library, lib/silcutil/
 ==============================
@@ -166,7 +168,7 @@ Runtime library, lib/silcutil/
    This relationship would be associative only.  The schedulers are still
    independent and run independently from each other.   All schedulers
    would be linked and could be accessed from any of the schedulers.
-   It should be possible to retrieve the parent and enumate all children
+   It should be possible to retrieve the parent and enumerate all children
    from any of the schedulers.
 
    SilcSchedule silc_schedule_init(int max_tasks, void *app_context,
@@ -239,6 +241,7 @@ Runtime library, lib/silcutil/
    }
 
    silc_snprintf(buf, sizeof(buf), "Client ID %@", id_renderer, client_id);
+   (***DONE)
 
  o Change silc_gettimeofday on Unix to use clock_gettime with REALTIME
    clock if it is available, otherwise use gettimeofday(). (***DONE)
@@ -377,6 +380,27 @@ SILC Accelerator Library
    public key and private key operations are executed in threads. 
    (***DONE)
 
+ o Add init options to SilcAcceleratorObject as a SilcAcceleratorOption
+   structure.  Each accelerator defines the options that they support and
+   can be retrieved from the SilcAccelerator with silc_acc_get_options.
+   The format must also be machine parseable.  The structure can be of the
+   following format:
+
+	typedef struct SilcAcceleratorOptionStruct {
+	  const char *option;			/* Option name */
+	  const char *display_name;		/* Option displayable name */
+	  SilcParamType type;			/* Option data format */
+	} *SilcAcceleratorOption;
+
+   For software accelerator it could be for example:
+
+   { "min_threads", "Minimum threads", SILC_PARAM_UINT32 },
+   { "max_threads", "Maximum threads", SILC_PARAM_UINT32 },
+
+   The accelerator itself doesn't have to use the option structure to
+   parse the options if not wanted.  It is defined for the caller so
+   they can learn the supported options in a well defined way.
+
  o Diffie-Hellman acceleration
 
  (o Symmetric key cryptosystem acceleration?  They are always sycnhronouos
@@ -540,6 +564,8 @@ lib/silcserver
    different mechanisms: UDP 706, TCP 706, TCP 80, TCP 443, UDP 7706 and
    TCP 7706.  This is the so called hole punching mechanism.
 
+ o Ability to recover from rekey errors, at least try to.
+
  o Reference count all Silc*Entry structures.
 
  Some issues that must be kept in mind from 1.0 and 1.1 silcd's:
diff --git a/distdir/default b/distdir/default
index 6837f3ad..87acf347 100644
--- a/distdir/default
+++ b/distdir/default
@@ -14,7 +14,6 @@ inherit server
 inherit toolkit
 
 define SILC_DIST_INPLACE
-define SILC_DIST_SIM
 
 # SFTP and VCARD is undefined in server, so force it here
 define SILC_DIST_SFTP
diff --git a/distdir/server b/distdir/server
index 3470eb11..4734b305 100644
--- a/distdir/server
+++ b/distdir/server
@@ -6,7 +6,6 @@ inherit common
 define SILC_DIST_SERVER
 #define SILC_DIST_SERVERLIB
 define SILC_DIST_HTTP
-define SILC_DIST_SIM
 undef SILC_DIST_SFTP
 undef SILC_DIST_VCARD
 
diff --git a/distdir/silcmap b/distdir/silcmap
index 1bd92051..3e379889 100644
--- a/distdir/silcmap
+++ b/distdir/silcmap
@@ -8,7 +8,6 @@ define SILC_DIST_CLIENTLIB
 define SILC_DIST_APPS
 undef SILC_DIST_LIB
 undef SILC_DIST_DOC
-undef SILC_DIST_SIM
 undef SILC_DIST_MATH
 undef SILC_DIST_MPI
 
diff --git a/distdir/toolkit b/distdir/toolkit
index 9d32fc29..ddbb2732 100644
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -16,7 +16,6 @@ license-header distdir/GPL-header distdir/TOOLKIT-header
 define SILC_DIST_TOOLKIT
 define SILC_DIST_CLIENTLIB
 define SILC_DIST_HTTP
-define SILC_DIST_SIM
 
 # Includes
 include README.CVS
diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 5bc42fda..9f3cb467 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -73,11 +73,11 @@ endif
 
 if SILC_WIN32
 SILC_LINK_LIBS=$(LIBS)
-SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
 SILCSERVER_LIBS=$(LIBS) -lsilc
 else
 SILC_LINK_LIBS=
-SILCCLIENT_LIBS=
+SILCCLIENT_LINK_LIBS=
 SILCSERVER_LIBS=
 endif
 
@@ -159,8 +159,8 @@ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
 
 libsilcclient.a:
 	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LIBS) \
-	$(LIBTOOL_SILCCLIENT_VERSION) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB
 
-- 
2.24.0