updates.

diff --git a/CHANGES b/CHANGES
index e0ca47c142ff5710a917b5572a031244550e06a0..e6a94ddaf328c30fa8e2b2ff236802fd0d8fdd77 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,23 @@
+Fri Dec 28 12:43:22 EET 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Cancel protocol and NULL sock->protocol if timeout
+         occurred during protocol.  Affected file silcd/server.c.
+
+       * Cancel protocol timeouts always before calling the final
+         callback, to assure that after final callback is called
+         no other state will be called for the protocol anymore.
+         Affected file silcd/protocol.c.
+
+       * Print error log if incoming connection configuration could
+         not be found.  Affected file silcd/server.c.
+
+       * Fixed JOIN command to correctly save the founder mode
+         to the client on normal SILC server, when the channel
+         was created by the router.  Affected file silcd/command.c.
+
+       * Fixed LIST command (hopefully) to send correct reply
+         packets.  Affected file silcd/command.c.
+

 Thu Dec 20 16:14:52 CET 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * The silc_packet_receive_process now returns FALSE if the
 Thu Dec 20 16:14:52 CET 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * The silc_packet_receive_process now returns FALSE if the


@@ -15,6 +35,23 @@ Wed Dec 19 21:31:25 EET 2001  Pekka Riikonen <priikone@silcnet.org>
          printed only once and not everytime it fails (produces
          too much useless log).  Affected file lib/silcutil/silclog.c.
 
          printed only once and not everytime it fails (produces
          too much useless log).  Affected file lib/silcutil/silclog.c.
 

+Wed Dec 19 18:21:51 CET 2001  Johnny Mnemonic <johnny@themnemonic.org>
+ 
+       * Made the silc_server_daemonise() function more readable.
+         Affected file silcd/server.c.
+ 
+       * Pid file is now optional, the user may comment it out from
+         the config file. Removed define SILC_SERVER_PID_FILE, we
+         don't need a default any longer.  Affected file
+         configure.in.pre, lib/Makefile.am.pre.
+ 
+       * Make some use of the pid file. The server now dies at startup
+         if it detects a valid pid file on his path. The server would
+         die anyway in this circumstance, because of the bind() failure.
+         Affected file silcd/silcd.c.
+ 
+       * No longer compiling lib/dotconf.
+

 Mon Dec 17 18:24:27 EET 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed JOIN command parsing not to crash.  Affected file
 Mon Dec 17 18:24:27 EET 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed JOIN command parsing not to crash.  Affected file

diff --git a/TODO b/TODO
index 28c16eec9e710a4161bd39acba094ac59e45b085..c9e41a32686bc6a1a1c57253da0c009cd67281d9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -47,8 +47,6 @@ TODO/bugs In SILC Client Library
    behaviour and maybe should be removed.  The changer should always
    get the one it wants and not have the formatted nickname.
 
    behaviour and maybe should be removed.  The changer should always
    get the one it wants and not have the formatted nickname.
 

- o strerror messages from premature EOF's to signoff messages.
-

  o Additions to do after protocol version 1.1:
 
        o Fix the NICK_CHANGE notify handling not to create new entry
  o Additions to do after protocol version 1.1:
 
        o Fix the NICK_CHANGE notify handling not to create new entry


@@ -62,14 +60,7 @@ TODO/bugs In SILC Client Library
 TODO/bugs In SILC Server
 ========================
 
 TODO/bugs In SILC Server
 ========================
 

- o User modes did not show correctly on normal server but looked ok
-   on router.  Join channel from normal server, join same from router
-   and see the user modes.  The founder of the channel (on normal server)
-   appears correctly on router but incorrectly (no modes) on normal 
-   server.
-
- o LIST command reply sending is broken.  It is possible it does not
-   end the list with LIST_END, but sends LIST_ENTRY as last entry.
+ o strerror messages from premature EOF's to signoff messages.

 
  o Backup router related issues
 
 
  o Backup router related issues
 

diff --git a/acconfig.h.pre b/acconfig.h.pre
index d8a1fccafa86389d77c56c1deaab9b06cb77c565..ff11e7d546ec68ae56ba64397a539abda264e3c4 100644 (file)
--- a/acconfig.h.pre
+++ b/acconfig.h.pre
@@ -10,9 +10,6 @@
 /* Default configuration file */
 #undef SILC_SERVER_CONFIG_FILE
 
 /* Default configuration file */
 #undef SILC_SERVER_CONFIG_FILE
 

-/* Default pid file */
-#undef SILC_SERVER_PID_FILE
-

 /* Multi-thread support */
 #undef SILC_THREADS
 #undef SILC_HAVE_PTHREAD
 /* Multi-thread support */
 #undef SILC_THREADS
 #undef SILC_HAVE_PTHREAD

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 46dc9c5576b929571ba3acb333c4aea54720ab21..7055636ae6ec285bffcc07a9a79f0c5761116972 100644 (file)
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -2103,7 +2103,7 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd,
                                    SilcChannelEntry *gch,
                                    uint32 gch_count)
 {
                                    SilcChannelEntry *gch,
                                    uint32 gch_count)
 {

-  int i;
+  int i, k;

   SilcBuffer packet, idp;
   SilcChannelEntry entry;
   SilcCommandStatus status;
   SilcBuffer packet, idp;
   SilcChannelEntry entry;
   SilcCommandStatus status;


@@ -2111,27 +2111,34 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd,
   char *topic;
   unsigned char usercount[4];
   uint32 users;
   char *topic;
   unsigned char usercount[4];
   uint32 users;

+  int valid_lcount = 0, valid_rcount = 0;

 
 

-  for (i = 0; i < lch_count; i++)
+  for (i = 0; i < lch_count; i++) {

     if (lch[i]->mode & SILC_CHANNEL_MODE_SECRET)
       lch[i] = NULL;
     if (lch[i]->mode & SILC_CHANNEL_MODE_SECRET)
       lch[i] = NULL;

-  for (i = 0; i < gch_count; i++)
+    else
+      valid_lcount++;
+  }
+  for (i = 0; i < gch_count; i++) {

     if (gch[i]->mode & SILC_CHANNEL_MODE_SECRET)
       gch[i] = NULL;
     if (gch[i]->mode & SILC_CHANNEL_MODE_SECRET)
       gch[i] = NULL;

+    else
+      valid_rcount++;
+  }

 
   status = SILC_STATUS_OK;
   if ((lch_count + gch_count) > 1)
     status = SILC_STATUS_LIST_START;
 
   /* Local list */
 
   status = SILC_STATUS_OK;
   if ((lch_count + gch_count) > 1)
     status = SILC_STATUS_LIST_START;
 
   /* Local list */

-  for (i = 0; i < lch_count; i++) {
+  for (i = 0, k = 0; i < lch_count; i++) {

     entry = lch[i];
     if (!entry)
       continue;
 
     entry = lch[i];
     if (!entry)
       continue;
 

-    if (i >= 1)
+    if (k >= 1)

       status = SILC_STATUS_LIST_ITEM;
       status = SILC_STATUS_LIST_ITEM;

-    if (i >= 1 && i == lch_count - 1 && !gch_count)
+    if (valid_lcount > 1 && k == valid_lcount - 1 && !valid_rcount)

       status = SILC_STATUS_LIST_END;
 
     idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL);
       status = SILC_STATUS_LIST_END;
 
     idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL);


@@ -2159,17 +2166,18 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd,
                            packet->len, FALSE);
     silc_buffer_free(packet);
     silc_buffer_free(idp);
                            packet->len, FALSE);
     silc_buffer_free(packet);
     silc_buffer_free(idp);

+    k++;

   }
 
   /* Global list */
   }
 
   /* Global list */

-  for (i = 0; i < gch_count; i++) {
+  for (i = 0, k = 0; i < gch_count; i++) {

     entry = gch[i];
     if (!entry)
       continue;
 
     entry = gch[i];
     if (!entry)
       continue;
 

-    if (i >= 1)
+    if (k >= 1)

       status = SILC_STATUS_LIST_ITEM;
       status = SILC_STATUS_LIST_ITEM;

-    if (i >= 1 && i == gch_count - 1)
+    if (valid_rcount > 1 && k == valid_rcount - 1)

       status = SILC_STATUS_LIST_END;
 
     idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL);
       status = SILC_STATUS_LIST_END;
 
     idp = silc_id_payload_encode(entry->id, SILC_ID_CHANNEL);


@@ -2197,6 +2205,7 @@ silc_server_command_list_send_reply(SilcServerCommandContext cmd,
                            packet->len, FALSE);
     silc_buffer_free(packet);
     silc_buffer_free(idp);
                            packet->len, FALSE);
     silc_buffer_free(packet);
     silc_buffer_free(idp);

+    k++;

   }
 }
 
   }
 }
 


@@ -3473,11 +3482,15 @@ SILC_SERVER_CMD_FUNC(join)
   if (cmd->pending && context2) {
     SilcServerCommandReplyContext reply = 
       (SilcServerCommandReplyContext)context2;
   if (cmd->pending && context2) {
     SilcServerCommandReplyContext reply = 
       (SilcServerCommandReplyContext)context2;

+

     if (silc_command_get(reply->payload) == SILC_COMMAND_JOIN) {
       tmp = silc_argument_get_arg_type(reply->args, 6, NULL);
       SILC_GET32_MSB(created, tmp);
       create_key = FALSE;      /* Router returned the key already */
     }
     if (silc_command_get(reply->payload) == SILC_COMMAND_JOIN) {
       tmp = silc_argument_get_arg_type(reply->args, 6, NULL);
       SILC_GET32_MSB(created, tmp);
       create_key = FALSE;      /* Router returned the key already */
     }

+
+    if (silc_command_get(reply->payload) == SILC_COMMAND_WHOIS)
+      created = TRUE;

   }
 
   /* If the channel does not have global users and is also empty the client
   }
 
   /* If the channel does not have global users and is also empty the client

diff --git a/apps/silcd/protocol.c b/apps/silcd/protocol.c
index e8f55d87c9080b43dc02aec8eba1081629ff0e77..cede19b5aa91d70b627cf6a3d19d2a8da8e57c0b 100644 (file)
--- a/apps/silcd/protocol.c
+++ b/apps/silcd/protocol.c
@@ -653,6 +653,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+      /* Assure that after calling final callback there cannot be pending
+        executions for this protocol anymore. This just unregisters any 
+        timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+

       /* Call the final callback */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);
       /* Call the final callback */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);


@@ -675,6 +680,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+

     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);


@@ -693,6 +703,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_key_exchange)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    

     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);


@@ -1171,6 +1186,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+      /* Assure that after calling final callback there cannot be pending
+        executions for this protocol anymore. This just unregisters any 
+        timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+    

       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);
       /* Protocol has ended, call the final callback */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);


@@ -1197,6 +1217,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
       if (ctx->timeout_task)
        silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+      /* Assure that after calling final callback there cannot be pending
+        executions for this protocol anymore. This just unregisters any 
+        timeout callbacks for this protocol. */
+      silc_protocol_cancel(protocol, server->schedule);
+    

       /* On error the final callback is always called. */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);
       /* On error the final callback is always called. */
       if (protocol->final_callback)
        silc_protocol_execute_final(protocol, server->schedule);


@@ -1216,6 +1241,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_connection_auth)
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 
     if (ctx->timeout_task)
       silc_schedule_task_del(server->schedule, ctx->timeout_task);
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    

     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);


@@ -1585,6 +1615,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
        encrypted with the new key so set the decryption key to the new key */
     silc_server_protocol_rekey_generate(server, ctx, FALSE);
 
        encrypted with the new key so set the decryption key to the new key */
     silc_server_protocol_rekey_generate(server, ctx, FALSE);
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    

     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* Protocol has ended, call the final callback */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);


@@ -1602,6 +1637,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
       silc_ske_abort(ctx->ske, ctx->ske->status);
     }
 
       silc_ske_abort(ctx->ske, ctx->ske->status);
     }
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    

     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);


@@ -1614,6 +1654,11 @@ SILC_TASK_CALLBACK(silc_server_protocol_rekey)
      * We have received failure from remote
      */
 
      * We have received failure from remote
      */
 

+    /* Assure that after calling final callback there cannot be pending
+       executions for this protocol anymore. This just unregisters any 
+       timeout callbacks for this protocol. */
+    silc_protocol_cancel(protocol, server->schedule);
+    

     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);
     /* On error the final callback is always called. */
     if (protocol->final_callback)
       silc_protocol_execute_final(protocol, server->schedule);

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 170d5e564bb27ca4c106b800c6bb97d13532672d..ccb2838823dcd3dedf22eeacf49b4ec03810689f 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -357,27 +357,26 @@ int silc_server_init(SilcServer server)
   return FALSE;
 }
 
   return FALSE;
 }
 

-/* Fork server to background and set gid+uid to non-root */
+/* Fork server to background */

 
 void silc_server_daemonise(SilcServer server)
 {
   int i;
 
 
 void silc_server_daemonise(SilcServer server)
 {
   int i;
 

-  i = fork ();
+  SILC_LOG_DEBUG(("Forking SILC server to background"));

 
 

-  if (i) {
-    if (i > 0) {
-      if (geteuid())
-        SILC_LOG_DEBUG(("Server started as user"));
-      else
-        SILC_LOG_DEBUG(("Server started as root. Dropping privileges."));
+  i = fork();

 
 

-      SILC_LOG_DEBUG(("Forking SILC server to background"));
-      exit(0);
-    } else {
-      SILC_LOG_DEBUG(("fork() failed, cannot proceed"));
-      exit(1);
-    }
+  if (i < 0) {
+    SILC_LOG_DEBUG(("fork() failed, cannot proceed"));
+    exit(1);
+  }
+  else if (i) {
+    if (geteuid())
+      SILC_LOG_DEBUG(("Server started as user"));
+    else
+      SILC_LOG_DEBUG(("Server started as root. Dropping privileges."));
+    exit(0);

   }
   setsid();
 }
   }
   setsid();
 }


@@ -388,7 +387,6 @@ void silc_server_drop(SilcServer server)
 {
   /* Are we executing silcd as root or a regular user? */
   if (!geteuid()) {
 {
   /* Are we executing silcd as root or a regular user? */
   if (!geteuid()) {

-

     struct passwd *pw;
     struct group *gr;
     char *user, *group;
     struct passwd *pw;
     struct group *gr;
     char *user, *group;


@@ -1085,6 +1083,8 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock,
                                                  sock->hostname, 
                                                  port);
   if (!cconfig && !sconfig && !rconfig) {
                                                  sock->hostname, 
                                                  port);
   if (!cconfig && !sconfig && !rconfig) {

+    SILC_LOG_INFO(("Connection %s (%s) is not allowed", 
+                   sock->hostname, sock->ip));

     silc_server_disconnect_remote(server, sock, 
                                  "Server closed connection: "
                                  "Connection refused");
     silc_server_disconnect_remote(server, sock, 
                                  "Server closed connection: "
                                  "Connection refused");

diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c
index 085a2522faa1c55093b0c99e68f768f299839be9..ace7c3ce463709c3689ebf491816a67eae593584 100644 (file)
--- a/apps/silcd/silcd.c
+++ b/apps/silcd/silcd.c
@@ -97,6 +97,33 @@ Usage: silcd [options]\n\
   exit(0);
 }
 
   exit(0);
 }
 

+/* Dies if a *valid* pid file exists already */
+
+static void silc_checkpid(SilcServer silcd)
+{
+  if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
+    int oldpid;
+    char *buf;
+    uint32 buf_len;
+
+    SILC_LOG_DEBUG(("Checking for another silcd running"));
+    buf = silc_file_readfile(silcd->config->pidfile->pid_file, &buf_len);
+    if (!buf)
+      return;
+    oldpid = atoi(buf);
+    silc_free(buf);
+    if (oldpid <= 0)
+      return;
+    kill(oldpid, SIGCHLD); /* this signal does nothing, check if alive */
+    if (errno != ESRCH) {
+      fprintf(stderr, "\nI detected another daemon running with the same pid file.\n");
+      fprintf(stderr, "Please change the config file, or erase the %s\n",
+       silcd->config->pidfile->pid_file);
+      exit(1);
+    }
+  }
+}
+

 int main(int argc, char **argv)
 {
   int ret;
 int main(int argc, char **argv)
 {
   int ret;


@@ -105,7 +132,6 @@ int main(int argc, char **argv)
   char *config_file = NULL;
   SilcServer silcd;
   struct sigaction sa;
   char *config_file = NULL;
   SilcServer silcd;
   struct sigaction sa;

-  char pid[10];

 
   silc_debug = FALSE;
 
 
   silc_debug = FALSE;
 


@@ -130,6 +156,7 @@ int main(int argc, char **argv)
          silc_debug = TRUE;
          silc_debug_hexdump = TRUE;
          silc_log_set_debug_string(optarg);
          silc_debug = TRUE;
          silc_debug_hexdump = TRUE;
          silc_log_set_debug_string(optarg);

+         foreground = TRUE;

 #ifndef SILC_DEBUG
          fprintf(stdout, 
                  "Run-time debugging is not enabled. To enable it recompile\n"
 #ifndef SILC_DEBUG
          fprintf(stdout, 
                  "Run-time debugging is not enabled. To enable it recompile\n"


@@ -196,6 +223,9 @@ int main(int argc, char **argv)
   if (silcd->config == NULL)
     goto fail;
 
   if (silcd->config == NULL)
     goto fail;
 

+  /* Check for another silcd running */
+  silc_checkpid(silcd);
+

   /* Initialize the server */
   ret = silc_server_init(silcd);
   if (ret == FALSE)
   /* Initialize the server */
   ret = silc_server_init(silcd);
   if (ret == FALSE)


@@ -207,20 +237,18 @@ int main(int argc, char **argv)
   sigemptyset(&sa.sa_mask);
   sigaction(SIGPIPE, &sa, NULL);
 
   sigemptyset(&sa.sa_mask);
   sigaction(SIGPIPE, &sa, NULL);
 

-  if ((silc_debug == FALSE) && (foreground == FALSE))
-    /* Before running the server, fork to background. */    
+  /* Before running the server, fork to background. */
+  if (!foreground)

     silc_server_daemonise(silcd);
 
     silc_server_daemonise(silcd);
 

-  /* Set /var/run/silcd.pid */
-  unlink(SILC_SERVER_PID_FILE);
-  memset(pid, 0, sizeof(pid));
-  snprintf(pid, sizeof(pid) - 1, "%d\n", getpid());
+  /* If set, write pid to file */

   if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
   if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {

-    silc_file_writefile(silcd->config->pidfile->pid_file, pid, strlen(pid));
-  } else {
-    silc_file_writefile(SILC_SERVER_PID_FILE, pid, strlen(pid));
+    char buf[10];
+    unlink(silcd->config->pidfile->pid_file);
+    snprintf(buf, sizeof(buf) - 1, "%d\n", getpid());
+    silc_file_writefile(silcd->config->pidfile->pid_file, buf, strlen(buf));

   }
   }

-  
+

   /* Drop root. */
   silc_server_drop(silcd);
 
   /* Drop root. */
   silc_server_drop(silcd);
 

diff --git a/apps/silcd/silcd.h b/apps/silcd/silcd.h
index a9d7b6f30431ef30d37b5b8fbb6562a835cdba33..512ce94a3e44e807bf7eabefbbe211bc5a21a5ff 100644 (file)
--- a/apps/silcd/silcd.h
+++ b/apps/silcd/silcd.h
@@ -28,10 +28,6 @@
 #define SILC_SERVER_CONFIG_FILE "/etc/silc/silcd.conf"
 #endif
 
 #define SILC_SERVER_CONFIG_FILE "/etc/silc/silcd.conf"
 #endif
 

-#ifndef SILC_SERVER_PID_FILE
-#define SILC_SERVER_PID_FILE "/var/run/silcd.pid"
-#endif
-

 #define SILC_SERVER_PUBLIC_KEY_NAME "/silcd.pub"
 #define SILC_SERVER_PRIVATE_KEY_NAME "/silcd.prv"
 
 #define SILC_SERVER_PUBLIC_KEY_NAME "/silcd.pub"
 #define SILC_SERVER_PRIVATE_KEY_NAME "/silcd.prv"
 

diff --git a/configure.in.pre b/configure.in.pre
index d7722afa39c23d2f0ec7f21f2b74757b8a6561e0..831465cbe18e0371dd080856da943dee82e295c6 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -597,7 +597,6 @@ AC_ARG_WITH(silcd-pid-file,
        esac ],
 )
 AC_SUBST(PIDFILE)
        esac ],
 )
 AC_SUBST(PIDFILE)

-AC_DEFINE_UNQUOTED(SILC_SERVER_PID_FILE, "$PIDFILE")

 
 #
 # Native WIN32 compilation under cygwin
 
 #
 # Native WIN32 compilation under cygwin


@@ -756,7 +755,7 @@ fi
 #
 # Other configure scripts
 #
 #
 # Other configure scripts
 #

-AC_CONFIG_SUBDIRS(lib/dotconf)
+#AC_CONFIG_SUBDIRS(lib/dotconf)

 AC_CONFIG_SUBDIRS(lib/trq)
 AC_CONFIG_SUBDIRS(irssi)
 AC_CONFIG_SUBDIRS(lib/silcmath/mpi)
 AC_CONFIG_SUBDIRS(lib/trq)
 AC_CONFIG_SUBDIRS(irssi)
 AC_CONFIG_SUBDIRS(lib/silcmath/mpi)

diff --git a/distributions b/distributions
index c628aa46ff9fd2febcfe98e3860695c90d334aa6..0c1eb928140fafc7a3d50f7b004a1b0dceb3038e 100644 (file)
--- a/distributions
+++ b/distributions
@@ -64,7 +64,7 @@ client_EXTRA_DIST=#
 
 # SILC Server distribution
 server_SUBDIRS=lib silcd doc includes
 
 # SILC Server distribution
 server_SUBDIRS=lib silcd doc includes

-server_SUBDIRS_lib=contrib silccore silccrypt silcsim silcmath silcske silcutil trq dotconf silcsftp
+server_SUBDIRS_lib=contrib silccore silccrypt silcsim silcmath silcske silcutil trq silcsftp

 server_SUBDIRS_doc=$(COMMONDIRS)
 server_DISTLABEL=SILC_DIST_SERVER
 server_EXTRA_DIST=#
 server_SUBDIRS_doc=$(COMMONDIRS)
 server_DISTLABEL=SILC_DIST_SERVER
 server_EXTRA_DIST=#

diff --git a/doc/whitepaper/silc_protocol.html b/doc/whitepaper/silc_protocol.html
index 5b1734cbdf057309416fcef442a01cb4ae53e0e8..4cf585f2016a2caa1bd0b3787830ff7511e2e0e5 100644 (file)
--- a/doc/whitepaper/silc_protocol.html
+++ b/doc/whitepaper/silc_protocol.html
@@ -14,7 +14,7 @@
 <font face="Helvetica">
 
 <font size="6"><b>SILC Protocol White Paper</b></font><br>
 <font face="Helvetica">
 
 <font size="6"><b>SILC Protocol White Paper</b></font><br>

-<font size="2">Version 1.0 / 03 Aug 2001</font>
+<font size="2">Version 1.1 / 01 Jan 2002</font>

 
 <p>
 <h1>Introduction</h1>
 
 <p>
 <h1>Introduction</h1>


@@ -66,7 +66,7 @@ in this document.
 <p>
 
 <p>
 <p>
 
 <p>

-(c) Copyright 2001 Pekka Riikonen 
+(c) Copyright 2001 - 2002 Pekka Riikonen 

 (<a href="mailto:priikone at silcnet.org">priikone at silcnet.org</a>)
 <p>
 This document is free document; you can redistribute it and/or modify
 (<a href="mailto:priikone at silcnet.org">priikone at silcnet.org</a>)
 <p>
 This document is free document; you can redistribute it and/or modify


@@ -739,6 +739,10 @@ If both of the clients trust that the public keys are authentic using this
 method of private message delivery is very simple and recommended.
 
 
 method of private message delivery is very simple and recommended.
 
 

+<p><br>
+<h1>Secure File Transfers</h1>
+
+

 <p><br>
 <h1>Conclusion</h1>
 
 <p><br>
 <h1>Conclusion</h1>
 

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 83a39e0315f182bf54de0998f2e4f9fa1e859ca6..d7770ce1443b9fda155b48ee7b61fbaf50f0ae99 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -28,9 +28,9 @@ COMMONDIRS = \
        silcutil \
        silcclient \
        silcsftp \
        silcutil \
        silcclient \
        silcsftp \

-       dotconf \

        trq
        trq

-#        zlib
+#      dotconf
+#      zlib

 
 SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS


@@ -45,8 +45,8 @@ SILCLIB_DIRS = \
        silcske \
        silcutil \
        silcsftp \
        silcske \
        silcutil \
        silcsftp \

-       trq \
-       dotconf
+       trq
+#      dotconf

 
 # SILC Client Library dirs
 SILCCLIENTLIB_DIRS = \
 
 # SILC Client Library dirs
 SILCCLIENTLIB_DIRS = \