ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 11:08:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove MDP and Monitor socket names from config

Browse Source 
Now they are fixed names under the instance path: "mdp.socket" and
"monitor.socket".
This commit is contained in:
Andrew Bettison 2013-09-25 15:48:43 +09:30
parent ba3f77e67c
commit c0aa4796a1
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf_schema.h
View File

@ -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

3
constants.h
View File

@ -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

2
monitor-client.c
View File

@ -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) {

2
monitor.c
View File

@ -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;