add file and virtual server to fr_socket_t

in preparation for other cleanups

diff --git a/src/lib/bio/fd_open.c b/src/lib/bio/fd_open.c
index b48a6e5779dce2d7fa45066a05b04ecca61918ae..f08efd487246e01d745a38eb32208f6973b97a2a 100644 (file)
--- a/src/lib/bio/fd_open.c
+++ b/src/lib/bio/fd_open.c
@@ -1178,7 +1178,7 @@ int fr_bio_fd_open(fr_bio_t *bio, fr_bio_fd_config_t const *cfg)
                 */
                my->info.socket.af = AF_FR_FILENAME;
                my->info.socket.type = SOCK_STREAM;
-               my->info.socket.unix.path = cfg->filename;
+               my->info.socket.file.path = cfg->filename;
 
                /*
                 *      Allow hacks for stdout and stderr

diff --git a/src/lib/util/socket.h b/src/lib/util/socket.h
index 46c241f3adc0ec015c1bf226ac60b2380d867057..6a3b0f1554f53cee46e13f1f6ade9071bec04567 100644 (file)
--- a/src/lib/util/socket.h
+++ b/src/lib/util/socket.h
@@ -71,6 +71,14 @@ typedef struct {
                struct {
                        char const      *path;          //!< Unix socket path.
                } unix;
+
+               struct {
+                       char const      *path;          //!< Filename
+               } file;
+
+               struct {
+                       char const      *server;        //!< Virtual server filename
+               } virtual;
        };
        int af;                 //!< AF_INET, AF_INET6, or AF_UNIX
        int type;               //!< SOCK_STREAM, SOCK_DGRAM, etc.