Changeset 13:af2a928f0e63 in xplcommon

Timestamp:

12/29/12 09:23:04 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 2 'hg:/home/ivaradi/xplane/hg/xplcommon' '/'>, 'public')

Message:

Added the deleting of the socket file when the socket object is destroyed

Location:

src/xplcommon/posix

Files:

• LocalServerSocket.cc (modified) (3 diffs)
• LocalServerSocket.h (modified) (3 diffs)

src/xplcommon/posix/LocalServerSocket.cc

@@ -39 +39 @@
 
 #include <sys/socket.h>
-#include <sys/un.h>
 
 //------------------------------------------------------------------------------
@@ -64 +63 @@
     acceptor(this)
 {
-    struct sockaddr_un sun;
     sun.sun_family = AF_UNIX;
     setupPath(sun, name);
@@ -83 +81 @@
 //------------------------------------------------------------------------------
 
+LocalServerSocket::~LocalServerSocket()
+{
+    unlink(sun.sun_path);
+}
+
+//------------------------------------------------------------------------------
+
 // Local Variables:
 // mode: C++

src/xplcommon/posix/LocalServerSocket.h

@@ -37 +37 @@
 #include "LocalAcceptor.h"
 
-//------------------------------------------------------------------------------
-
-struct sockaddr_un;
+#include <sys/un.h>
 
 //------------------------------------------------------------------------------
@@ -62 +60 @@
 
     /**
+     * Our address (to be used when deleting the file in the
+     * destructor.
+     */
+    struct sockaddr_un sun;
+
+    /**
      * The acceptor to use for accepting connections.
      */
@@ -79 +83 @@
      */
     LocalServerSocket(const char* name, Waiter* waiter = 0);
+
+    /**
+     * Destroy the socket by deleting the file.
+     */
+    virtual ~LocalServerSocket();
 
     /**