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

Test that msp listen --service_name shuts down

Browse Source
This commit is contained in:
Jeremy Lakeman 2014-06-23 14:23:30 +09:30
parent ca8f651b8d
commit 9f6ace518a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
msp_proxy.c
View File

@ -299,6 +299,12 @@ static size_t msp_listener(MSP_SOCKET sock, msp_state_t state, const uint8_t *pa
// stop listening after the first incoming connection
msp_stop(listener);
listener=MSP_SOCKET_NULL;
if (service_sock.poll.fd!=-1){
if (is_watching(&service_sock))
unwatch(&service_sock);
mdp_close(service_sock.poll.fd);
service_sock.poll.fd=-1;
}
}
struct mdp_sockaddr remote;

6
tests/jni
View File

@ -125,7 +125,7 @@ teardown_DnaLookup() {
doc_serviceDiscovery="Serval JNI discover network services by name"
listen_service() {
executeOk_servald --timeout=20 msp listen --service=test_name 512 <<EOF
executeOk_servald --timeout=20 msp listen --once --service=test_name 512 <<EOF
Hi!
EOF
tfw_cat --stderr
@ -151,6 +151,10 @@ test_serviceDiscovery() {
assertStdoutGrep "$SIDB"
assertStdoutGrep "\<test_name\.msp\.port=512\>"
tfw_cat --stdout --stderr
executeOk_servald --timeout=20 msp connect $SIDB 512 <<EOF
Hi!
EOF
fork_wait %service
}
teardown_serviceDiscovery() {
stop_all_servald_servers