From c0aa4796a148720b7f162b2aae0756ea3f2a3cfe Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrew@servalproject.org>
Date: Wed, 25 Sep 2013 15:48:43 +0930
Subject: [PATCH] Remove MDP and Monitor socket names from config

Now they are fixed names under the instance path: "mdp.socket" and
"monitor.socket".
---
 conf_schema.h    | 2 --
 constants.h      | 3 ---
 monitor-client.c | 2 +-
 monitor.c        | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/conf_schema.h b/conf_schema.h
index 4d9cb827..e33a57e0 100644
--- a/conf_schema.h
+++ b/conf_schema.h
@@ -321,7 +321,6 @@ ATOM(bool_t,                respawn_on_crash, 0, boolean,, "If true, server will
 END_STRUCT
 
 STRUCT(monitor)
-STRING(256,                 socket,     DEFAULT_MONITOR_SOCKET_NAME, str_nonempty,, "Name of socket for monitor interface")
 ATOM(uint32_t,              uid,        0, uint32_nonzero,, "Allowed UID for monitor socket client")
 END_STRUCT
 
@@ -336,7 +335,6 @@ VALUE_SUB_STRUCT(mdp_iftype)
 END_ARRAY(5)
 
 STRUCT(mdp)
-STRING(256,                 socket,     DEFAULT_MDP_SOCKET_NAME, str_nonempty,, "Name of socket for MDP client interface")
 SUB_STRUCT(mdp_iftypelist,  iftype,)
 END_STRUCT
 
diff --git a/constants.h b/constants.h
index 36a66dc5..4a28f0b9 100644
--- a/constants.h
+++ b/constants.h
@@ -209,9 +209,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // force state packet interval
 #define VOMP_CALL_STATUS_INTERVAL 1000
 
-#define DEFAULT_MONITOR_SOCKET_NAME "org.servalproject.servald.monitor.socket"
-#define DEFAULT_MDP_SOCKET_NAME "org.servalproject.servald.mdp.socket"
-
 #define SOCK_FILE 0xFF
 #define SOCK_UNSPECIFIED 0
 
diff --git a/monitor-client.c b/monitor-client.c
index 01f5d1a1..a404a2f1 100644
--- a/monitor-client.c
+++ b/monitor-client.c
@@ -74,7 +74,7 @@ int monitor_client_open(struct monitor_state **res)
     return WHYF_perror("socket(AF_UNIX, SOCK_STREAM, 0)");
   struct sockaddr_un addr;
   socklen_t addrlen;
-  if (make_local_sockaddr(&addr, &addrlen, "%s", config.monitor.socket) == -1)
+  if (make_local_sockaddr(&addr, &addrlen, "monitor.socket") == -1)
     return -1;
   INFOF("Attempting to connect to %s", alloca_sockaddr(&addr, addrlen));
   if (socket_connect(fd, (struct sockaddr*)&addr, addrlen) == -1) {
diff --git a/monitor.c b/monitor.c
index 1248525e..5981b2a5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -82,7 +82,7 @@ int monitor_setup_sockets()
     goto error;
   struct sockaddr_un addr;
   socklen_t addrlen;
-  if (make_local_sockaddr(&addr, &addrlen, "%s", config.monitor.socket) == -1)
+  if (make_local_sockaddr(&addr, &addrlen, "monitor.socket") == -1)
     goto error;
   if (socket_bind(sock, (struct sockaddr*)&addr, addrlen) == -1)
     goto error;