1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00

miracle-wfdctl: clarify teardown procedure of session

This commit is contained in:
Derek Dai 2017-02-23 14:20:34 +08:00
parent b0419509b8
commit 155060919e
No known key found for this signature in database
GPG key ID: E109CC97553EF009
8 changed files with 183 additions and 141 deletions

View file

@ -103,10 +103,10 @@ get_prop()
cleanup()
{
kill 0
set -x
for (( i=${#cleanup[@]}-1; i>=0; --i )); do
eval ${cleanup[$i]} || true
set +e
while (( 0 != ${#cleanup[@]} )); do
eval ${cleanup[${#cleanup[@]}-1]}
unset cleanup[${#cleanup[@]}-1]
done
}
@ -115,6 +115,14 @@ cleanup_push()
cleanup+=("$*")
}
nm_manage()
{
set_prop org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager/Devices/"$nm_link_index" \
org.freedesktop.NetworkManager.Device \
Managed b true
}
link_unmanage()
{
set_prop org.freedesktop.miracle.wifi \
@ -149,6 +157,7 @@ set_prop org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager/Devices/"$nm_link_index" \
org.freedesktop.NetworkManager.Device \
Managed b false
cleanup_push nm_manage
set_prop org.freedesktop.miracle.wifi \
/org/freedesktop/miracle/wifi/link/$link_index \
org.freedesktop.miracle.wifi.Link \
@ -179,6 +188,8 @@ get_prop org.freedesktop.miracle.wifi \
org.freedesktop.miracle.wifi.Peer \
Interface p2p_iface
tcpdump -nnvvXS -s 0 -i $p2p_iface port 7236 or port 67 or port 68 &
cleanup_push "kill $!"
while ! killall -0 miracle-wfdctl && [[ -z "$nocheck" ]] &>/dev/null; do
echo please run miracle-wfdctl manually
sleep 3