Added SilcLocalNetSecurity flags for Local Net Stream Listener.

diff --git a/lib/silcutil/silclocalnetstream.c b/lib/silcutil/silclocalnetstream.c
index d93e909f1907a38d7721e004489da666560d436d..7ad1d764e13e5fb9c81fd7b9abe8bd44f7b2df87 100644 (file)
--- a/lib/silcutil/silclocalnetstream.c
+++ b/lib/silcutil/silclocalnetstream.c
@@ -60,6 +60,7 @@ static void silc_local_net_accept(SilcResult result, SilcStream stream,
 /* Create listener */
 
 SilcNetListener silc_local_net_create_listener(const char *filepath,
+                                              SilcLocalNetSecurity security,
                                               SilcSchedule schedule,
                                               SilcNetCallback callback,
                                               void *context)
@@ -68,6 +69,7 @@ SilcNetListener silc_local_net_create_listener(const char *filepath,
   SilcUInt16 *local_port;
   const char *addr = "127.0.0.1";
   char port[8];
+  int mode = 0;
 
   SILC_LOG_DEBUG(("Creating local network stream listener %s", filepath));
 
@@ -111,9 +113,17 @@ SilcNetListener silc_local_net_create_listener(const char *filepath,
     return NULL;
   }
 
+  /* Set mode */
+  if (!security)
+    mode = 0644;
+  if (security & SILC_LOCAL_NET_USER)
+    mode = 0600;
+  if (security & SILC_LOCAL_NET_GROUP)
+    mode += 040;
+
   /* Create the file */
   silc_snprintf(port, sizeof(port), "%d", *local_port);
-  if (silc_file_writefile(filepath, port, strlen(port) + 1)) {
+  if (silc_file_writefile_mode(filepath, port, strlen(port) + 1, mode)) {
     silc_free(local_port);
     silc_net_close_listener(listener->listener);
     silc_free(listener);
@@ -138,6 +148,7 @@ void silc_local_net_close_listener(SilcNetListener local_listener)
 
   unlink(listener->filepath);
   silc_net_close_listener(listener->listener);
+  silc_free(listener->filepath);
   silc_free(listener);
 }
 

diff --git a/lib/silcutil/silclocalnetstream.h b/lib/silcutil/silclocalnetstream.h
index 87f62d202e6efb2bce1a7964f9d673b28b16e234..5727bd9194be3160cee948a77c0c5562867e1156 100644 (file)
--- a/lib/silcutil/silclocalnetstream.h
+++ b/lib/silcutil/silclocalnetstream.h
@@ -22,33 +22,78 @@
  * DESCRIPTION
  *
  * Local network stream interface enables two or more processes to communicate
- * with each other in the local machine using local network start.  The
+ * with each other in the local machine using the local network.  The
  * interface provides a form of interprocess communication (IPC) using network
- * sockets.
+ * sockets (TCP).
+ *
+ * Since the implementation uses real TCP network socket the listener can be
+ * used for any TCP communication, however connections may be estalished only
+ * from the local machine.  The connections use the loopback network.
+ *
+ * EXAMPLE
+ *
+ * // Create listener
+ * listener = silc_local_net_create_listener("/tmp/conn1", 0, schedule,
+ *                                           accept_callback, ctx);
+ *
+ * // Connect to the listener
+ * silc_local_net_connect("/tmp/conn1", schedule, connected_callback, ctx);
+ *
+ * // Close listener
+ * silc_local_net_close_listener(listener);
  *
  ***/
 
 #ifndef SILCLOCALNETSTREAM_H
 #define SILCLOCALNETSTREAM_H
 
+/****d* silcutil/SilcLocalNetSecurity
+ *
+ * NAME
+ *
+ *    typedef enum { ... } SilcLocalNetSecurity
+ *
+ * DESCRIPTION
+ *
+ *    The security flags for the local network listener.  They specify
+ *    how the listener can be accessed.  The flags are a bitmasks and can
+ *    be combined.  Note that, these flags apply only when this API is
+ *    used.  Anyone in local machine is able to see the network listener
+ *    port by checking all bound network listeners and thus are able to
+ *    connect to it.
+ *
+ * SOURCE
+ */
+typedef enum {
+  SILC_LOCAL_NET_ALL    = 0x0000,     /* Anyone in local machine can connect */
+  SILC_LOCAL_NET_USER   = 0x0001,     /* Same user can connect */
+  SILC_LOCAL_NET_GROUP  = 0x0002,     /* Same group can connect */
+} SilcLocalNetSecurity;
+/***/
+
 /****f* silcutil/silc_local_net_create_listener
  *
  * SYNOPSIS
  *
- *    SilcNetListener silc_local_net_create_listener(const char *filepath,
- *                                                   SilcSchedule schedule,
- *                                                   SilcNetCallback callback,
- *                                                   void *context);
+ *    SilcNetListener
+ *    silc_local_net_create_listener(const char *filepath,
+ *                                   SilcLocalNetSecurity security,
+ *                                   SilcSchedule schedule,
+ *                                   SilcNetCallback callback,
+ *                                   void *context);
  *
  * DESCRIPTION
  *
  *    Creates a local network stream listener and returns a network server.
  *    The `filepath' is a local filepath that must be used by the clients to
- *    connect to the server.
+ *    connect to the server.  The `security' specify the access method to
+ *    the listener.  It can specify for example that only the user creating
+ *    the listener is able to connect to it.
  *
  *    The `callback' will be called when a client connects to the listener
- *    with the `context'.  The returned listener must be closed by calling
- *    silc_local_net_close_listener.
+ *    with the `context'.  The returned stream to the `callback' is a
+ *    socket stream (silcsocketstream.h).  The returned listener must be
+ *    closed by calling silc_local_net_close_listener.
  *
  *    Clients can connect to the listener by calling the
  *    silc_local_net_connect.
@@ -58,6 +103,7 @@
  *
  ***/
 SilcNetListener silc_local_net_create_listener(const char *filepath,
+                                              SilcLocalNetSecurity security,
                                               SilcSchedule schedule,
                                               SilcNetCallback callback,
                                               void *context);
@@ -91,7 +137,9 @@ void silc_local_net_close_listener(SilcNetListener local_listener);
  *    the connection will fail.
  *
  *    The `callback' with `context' will be called once the connection has
- *    been created.
+ *    been created.  The stream returned to `callback' is a socket stream
+ *    (silcsocketstream.h).  SilcStream API can be used with the returned
+ *    stream.  The stream must be destroyed by calling silc_stream_destroy.
  *
  *    If `schedule' is NULL this will call silc_schedule_get_global to try
  *    to get global scheduler.

diff --git a/lib/silcutil/tests/test_silclocalnetstream.c b/lib/silcutil/tests/test_silclocalnetstream.c
index 010936e4606e2b1f5412fb4836937cb1ba9014df..ec482c5660b1487f76222772298ab59bd91438bd 100644 (file)
--- a/lib/silcutil/tests/test_silclocalnetstream.c
+++ b/lib/silcutil/tests/test_silclocalnetstream.c
@@ -83,6 +83,8 @@ SILC_FSM_STATE(test_st_start)
 
   SILC_LOG_DEBUG(("Creating local network listener"));
   f->server = silc_local_net_create_listener("local_net",
+                                            SILC_LOCAL_NET_USER |
+                                            SILC_LOCAL_NET_GROUP,
                                             silc_fsm_get_schedule(fsm),
                                             test_accept_connection, f);
   if (!f->server) {