X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/userv-utils/blobdiff_plain/d32c2ba09c01c23863f105f8ccf240fa3e9aade3..4fa63592066debd9771e2e0e328277bd83f9a234:/ipif/udptunnel

diff --git a/ipif/udptunnel b/ipif/udptunnel
index ce60357..4f73acd 100755
--- a/ipif/udptunnel
+++ b/ipif/udptunnel
@@ -20,7 +20,7 @@
 #            <public-remote-addr>,<public-remote-port>
 #            <private-local-addr>,<private-remote-addr>,<mtu>,<proto>
 #            <keepalive>,<timeout>
-#            <extra-local-nets> <extra-remote-nets>
+#            <extra-nets-for-local-cmd> <extra-nets-for-remote-cmd>
 #          [ <remote-command> [<remote-args> ...] ]
 #
 # proto may be slip or cslip
@@ -42,7 +42,7 @@
 #                     <public-local-addr'>,<public-local-port'>
 #                     <private-remote-addr>,<private-local-addr>,<mtu>,<proto>
 #                     <keepalive>,<timeout>
-#                     <extra-remote-nets> <extra-local-nets>
+#                     <extra-nets-for-remote-cmd> <extra-nets-for-local-cmd>
 #
 
 # If it was given Print for <public-remote-foo'>, this command's first
@@ -67,12 +67,13 @@
 #   <public-local-foo>   <public-local-foo'>     <public-local-foo'>
 #                        (-m not specified)      (-m specified)
 #   actual addr/port     that addr/port       	 `Wait'
-#   `Wait'               the chosen address 	 `Wait'
 #   `Print'              the chosen address 	 `Wait'
+#   `Any'                `Wait' for addr, 	 `Wait'
+#                         chosen port for port
 #
 # udptunnel will userv ipif locally, as
 #    userv root ipif <private-local-addr>,<private-remote-addr>,<mtu>,<proto>
-#                    <extra-local-nets>
+#                    <extra-nets-for-local-cmd>
 # or, if -l was given, userv root ipif is replaced with the argument(s)
 # following -l option(s) until `.'.
 #
@@ -102,7 +103,7 @@
 # along with userv-utils; if not, write to the Free Software
 # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: udptunnel,v 1.16 2000/05/31 01:57:25 ian Exp $
+# $Id: udptunnel,v 1.17 2000/06/07 00:59:31 ian Exp $
 
 use Socket;
 use POSIX;
@@ -266,7 +267,7 @@ if (@ARGV) {
     @rcmd= (@ARGV,
 	    @remoteopts,
 	    "$rad,$rpd",
-	    $masq ? 'Wait,Wait' : $lapd,
+	    $masq ? 'Wait,Wait' : $las eq 'Any' ? "Wait,$lpd" : $lapd,
 	    "$rva,$lva,$mtu,$proto",
 	    "$keepalive,$timeout",
 	    $rexn, $lexn);