ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MDP socket name can now be changed by config option mdp.socket.

Browse Source 
DNA tests now passing again.
This commit is contained in:
gardners 2012-06-21 14:45:09 +09:30
parent 01712ab67e
commit 48a1d7e20f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overlay_mdp.c
View File

@ -42,7 +42,8 @@ int overlay_mdp_setup_sockets()
/* XXX The 100 should be replaced with the actual maximum allowed.
Apparently POSIX requires it to be at least 100, but I would still feel
more comfortable with using the appropriate constant. */
snprintf(&name.sun_path[1],100,"org.servalproject.mesh.overlay.mdp");
snprintf(&name.sun_path[1],100,
confValueGet("mdp.socket",DEFAULT_MDP_SOCKET_NAME);
len = 1+strlen(&name.sun_path[1]) + sizeof(name.sun_family);
mdp_abstract_socket = socket(AF_UNIX, SOCK_DGRAM, 0);

1
serval.h
View File

@ -1532,3 +1532,4 @@ void sigPipeHandler(int signal);
void sigIoHandler(int signal);
#define DEFAULT_MONITOR_SOCKET_NAME "org.servalproject.servald.monitor.socket"
#define DEFAULT_MDP_SOCKET_NAME "org.servalproject.servald.mdp.socket"

5
tests/dnaprotocol
View File

@ -28,7 +28,8 @@ setup() {
}
teardown() {
stop_all_servald_servers
# TODO Disabled until stopping multiple-instances are supported
# TODO stop_all_servald_servers
kill_all_servald_processes
assert_no_servald_processes
}
@ -39,6 +40,7 @@ setup_servald_instance() {
touch "$SERVALINSTANCE_PATH/dummynet"
executeOk_servald config set interfaces "+>dummynet"
executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.A"
executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.A"
executeOk_servald keyring add
assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
executeOk_servald keyring list
@ -54,6 +56,7 @@ setup_servald_instance() {
set_instance B
executeOk_servald config set interfaces "+>$INSTANCEPATH_A/dummynet"
executeOk_servald config set monitor.socket "org.servalproject.servald.monitor.socket.B"
executeOk_servald config set mdp.socket "org.servalproject.servald.mdp.socket.B"
executeOk_servald keyring add
assert [ -e "$SERVALINSTANCE_PATH/serval.keyring" ]
executeOk_servald keyring list