ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-11 05:12:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change monitor.socket and mdp.socket prefs to be a suffix which is applied to the instance directory (normal) or org.servalproject.servald (abstract)

Browse Source
This commit is contained in:
Daniel O'Connor 2012-06-24 14:26:43 +09:30
parent 719d1fe72c
commit 626ddee8da
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
serval.h
View File

@ -1541,11 +1541,9 @@ void sigPipeHandler(int signal);
void sigIoHandler(int signal); void sigIoHandler(int signal);
#ifdef USE_ABSTRACT_NAMESPACE #ifdef USE_ABSTRACT_NAMESPACE
/* Long ones for abstract name space */ #define DEFAULT_ABSTRACT_PREFIX "org.servalproject.servald"
#define DEFAULT_MONITOR_SOCKET_NAME "org.servalproject.servald.monitor.socket" #endif
#define DEFAULT_MDP_SOCKET_NAME "org.servalproject.servald.mdp.socket"
#else
/* Short ones elsewhere */
#define DEFAULT_MONITOR_SOCKET_NAME "monitor.socket" #define DEFAULT_MONITOR_SOCKET_NAME "monitor.socket"
#define DEFAULT_MDP_SOCKET_NAME "mdp.socket" #define DEFAULT_MDP_SOCKET_NAME "mdp.socket"
#endif

3
socket.c
View File

@ -78,7 +78,8 @@ socket_setname(struct sockaddr_un *sockname, const char *name, socklen_t *len) {
#ifdef USE_ABSTRACT_NAMESPACE #ifdef USE_ABSTRACT_NAMESPACE
sockname->sun_path[0] = 0; sockname->sun_path[0] = 0;
/* Note: -2 here not -1 because sprintf will put the trailling nul in */ /* Note: -2 here not -1 because sprintf will put the trailling nul in */
*len = snprintf(sockname->sun_path + 1, sizeof(sockname->sun_path) - 2, "%s", name); *len = snprintf(sockname->sun_path + 1, sizeof(sockname->sun_path) - 2, "%s.%s",
DEFAULT_ABSTRACT_PREFIX, name);
if (*len > sizeof(sockname->sun_path) - 2) if (*len > sizeof(sockname->sun_path) - 2)
FATALF("Socket path too long (%d > %d)", *len, sizeof(sockname->sun_path) - 2); FATALF("Socket path too long (%d > %d)", *len, sizeof(sockname->sun_path) - 2);

4
tests/dnaprotocol
View File

@ -37,8 +37,8 @@ setup_servald_instance() {
push_instance push_instance
set_instance "$1" set_instance "$1"
executeOk_servald config set interfaces "+>$2" executeOk_servald config set interfaces "+>$2"
executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.$1" executeOk_servald config set monitor.socket "monitor.socket.$1"
executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.$1" executeOk_servald config set mdp.socket "mdp.socket.$1"
executeOk_servald keyring add executeOk_servald keyring add
assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ] assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
executeOk_servald keyring list executeOk_servald keyring list