Patch for upnp syntax
Posted: Mon May 31, 2021 1:09 pm
Some time ago there was a patch added to PiStar that fixed up the syntax used for the upnpc daemon arguments, but it was reversed for some reason and never reappeared.
I've been using the following patched version for many months and it works reliably for me so here it is, if you want to put it into PiStar Andy please feel free. I don't make any claim of ownership, this is just following what the man page says It also uses the hostname so you can see which host has requested the route. Unified diff follows...
--- pistar-upnp.service.old 2021-05-31 13:39:35.689836298 +0100
+++ pistar-upnp.service 2021-05-31 13:55:05.741203221 +0100
@@ -17,6 +17,8 @@
KILL=/bin/kill
SLEEP=/bin/sleep
ipVar=`hostname -I | cut -d' ' -f1`
+DURATION=600
+DESC=`hostname | cut -d'.' -f1`
# Pre-flight checks...
test -x ${DAEMON_PATH}${DAEMON} || exit 1
@@ -28,37 +30,37 @@
case "$1" in
start)
-# $DAEMON -a $ipVar 22 22 TCP > /dev/null 2>&1 &
-# $DAEMON -a $ipVar 80 80 TCP > /dev/null 2>&1 &
-# $DAEMON -a $ipVar 10022 10022 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 20001 20001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30001 30001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30051 30051 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30061 30061 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30062 30062 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30063 30063 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30064 30064 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 40000 40000 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42000 42000 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42001 42001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42010 42010 UDP > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 22 22 TCP $DURATION > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 80 80 TCP $DURATION > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 10022 10022 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 20001 20001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30001 30001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30051 30051 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30061 30061 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30062 30062 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30063 30063 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30064 30064 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 40000 40000 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42000 42000 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42001 42001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42010 42010 UDP $DURATION > /dev/null 2>&1 &
;;
stop)
- $DAEMON -d $ipVar 22 22 TCP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 80 80 TCP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 10022 10022 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 20001 20001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30001 30001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30051 30051 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30061 30061 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30062 30062 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30063 30063 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30064 30064 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 40000 40000 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42000 42000 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42001 42001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42010 42010 UDP > /dev/null 2>&1 &
+ $DAEMON -d 22 TCP > /dev/null 2>&1 &
+ $DAEMON -d 80 TCP > /dev/null 2>&1 &
+ $DAEMON -d 10022 UDP > /dev/null 2>&1 &
+ $DAEMON -d 20001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30051 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30061 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30062 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30063 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30064 UDP > /dev/null 2>&1 &
+ $DAEMON -d 40000 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42000 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42010 UDP > /dev/null 2>&1 &
;;
*)
I've been using the following patched version for many months and it works reliably for me so here it is, if you want to put it into PiStar Andy please feel free. I don't make any claim of ownership, this is just following what the man page says It also uses the hostname so you can see which host has requested the route. Unified diff follows...
--- pistar-upnp.service.old 2021-05-31 13:39:35.689836298 +0100
+++ pistar-upnp.service 2021-05-31 13:55:05.741203221 +0100
@@ -17,6 +17,8 @@
KILL=/bin/kill
SLEEP=/bin/sleep
ipVar=`hostname -I | cut -d' ' -f1`
+DURATION=600
+DESC=`hostname | cut -d'.' -f1`
# Pre-flight checks...
test -x ${DAEMON_PATH}${DAEMON} || exit 1
@@ -28,37 +30,37 @@
case "$1" in
start)
-# $DAEMON -a $ipVar 22 22 TCP > /dev/null 2>&1 &
-# $DAEMON -a $ipVar 80 80 TCP > /dev/null 2>&1 &
-# $DAEMON -a $ipVar 10022 10022 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 20001 20001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30001 30001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30051 30051 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30061 30061 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30062 30062 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30063 30063 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 30064 30064 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 40000 40000 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42000 42000 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42001 42001 UDP > /dev/null 2>&1 &
- $DAEMON -a $ipVar 42010 42010 UDP > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 22 22 TCP $DURATION > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 80 80 TCP $DURATION > /dev/null 2>&1 &
+# $DAEMON -e $DESC -a $ipVar 10022 10022 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 20001 20001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30001 30001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30051 30051 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30061 30061 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30062 30062 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30063 30063 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 30064 30064 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 40000 40000 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42000 42000 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42001 42001 UDP $DURATION > /dev/null 2>&1 &
+ $DAEMON -e $DESC -a $ipVar 42010 42010 UDP $DURATION > /dev/null 2>&1 &
;;
stop)
- $DAEMON -d $ipVar 22 22 TCP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 80 80 TCP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 10022 10022 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 20001 20001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30001 30001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30051 30051 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30061 30061 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30062 30062 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30063 30063 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 30064 30064 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 40000 40000 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42000 42000 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42001 42001 UDP > /dev/null 2>&1 &
- $DAEMON -d $ipVar 42010 42010 UDP > /dev/null 2>&1 &
+ $DAEMON -d 22 TCP > /dev/null 2>&1 &
+ $DAEMON -d 80 TCP > /dev/null 2>&1 &
+ $DAEMON -d 10022 UDP > /dev/null 2>&1 &
+ $DAEMON -d 20001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30051 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30061 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30062 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30063 UDP > /dev/null 2>&1 &
+ $DAEMON -d 30064 UDP > /dev/null 2>&1 &
+ $DAEMON -d 40000 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42000 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42001 UDP > /dev/null 2>&1 &
+ $DAEMON -d 42010 UDP > /dev/null 2>&1 &
;;
*)