jab2870/sxmo-utils
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix remaining issue with states cause of dangling event files

Browse source 
We also have to remove them on outgoing call. We use find instead of rm
with a wildcard cause wildcard look not expanded here.

Signed-off-by: Stacy Harper <contact@stacyharper.net>
Signed-off-by: Maarten van Gompel <proycon@anaproy.nl>
This commit is contained in:
Stacy Harper 2021-07-27 09:09:36 +02:00 • committed by Maarten van Gompel
parent 25913ebaf1
commit 61a138a153
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/modem/sxmo_modemdial.sh
View file

@ -1,6 +1,10 @@
#!/usr/bin/env sh #!/usr/bin/env sh
trap "gracefulexit" INT TERM trap "gracefulexit" INT TERM
# include common definitions
# shellcheck source=scripts/core/sxmo_common.sh
. "$(dirname "$0")/sxmo_common.sh"
fatalerr() { fatalerr() {
# E.g. hangup all calls, switch back to default audio, notify user, and die # E.g. hangup all calls, switch back to default audio, notify user, and die
mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all
@ -49,6 +53,7 @@ dialmenu() {
grep -Eo "Call/[0-9]+" | grep -Eo "Call/[0-9]+" |
grep -oE "[0-9]+" grep -oE "[0-9]+"
)" )"
find "$CACHEDIR" -name "$CALLID.*" -delete # we cleanup all dangling event files
echo "Starting call with CALLID: $CALLID" >&2 echo "Starting call with CALLID: $CALLID" >&2
echo "$CALLID" echo "$CALLID"
} }

2
scripts/modem/sxmo_modemmonitor.sh
View file

@ -150,7 +150,7 @@ checkforincomingcalls() {
[ -z "$VOICECALLID" ] && return [ -z "$VOICECALLID" ] && return
[ -f "$CACHEDIR/${VOICECALLID}.monitoredcall" ] && return # prevent multiple rings [ -f "$CACHEDIR/${VOICECALLID}.monitoredcall" ] && return # prevent multiple rings
rm -f "$CACHEDIR/${VOICECALLID}.*" # we cleanup all dangling event files find "$CACHEDIR" -name "$VOICECALLID.*" -delete # we cleanup all dangling event files
touch "$CACHEDIR/${VOICECALLID}.monitoredcall" #this signals that we handled the call touch "$CACHEDIR/${VOICECALLID}.monitoredcall" #this signals that we handled the call
cat "$LASTSTATE" > "$CACHEDIR/${VOICECALLID}.laststate" cat "$LASTSTATE" > "$CACHEDIR/${VOICECALLID}.laststate"