Allow UDP and/or TCP redirections instead of just TCP.

Thanks to Marek Grzybowski for feedback and testing.

ok jmc@ (manpage bits)

1 files changed, 25 insertions, 4 deletions

diff --git a/usr.sbin/relayd/relayd.conf.5 b/usr.sbin/relayd/relayd.conf.5
index 1d550544e57..3078ebd4109 100644
--- a/usr.sbin/relayd/relayd.conf.5
+++ b/usr.sbin/relayd/relayd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.conf.5,v 1.103 2009/04/16 20:13:13 sobrado Exp $
+.\"	$OpenBSD: relayd.conf.5,v 1.104 2009/04/24 14:20:24 reyk Exp $
 .\"
 .\" Copyright (c) 2006, 2007 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 16 2009 $
+.Dd $Mdocdate: April 24 2009 $
 .Dt RELAYD.CONF 5
 .Os
 .Sh NAME
@@ -430,7 +430,9 @@ This directive can be specified twice \(en the second entry will be used
 as the backup table if all hosts in the main table are down.
 At least one entry for the main table is mandatory.
 .It Xo
-.Ic listen on Ar address Ic port Ar port
+.Ic listen on Ar address
+.Op ip-proto
+.Ic port Ar port
 .Op Ic interface Ar name
 .Xc
 Specify an
@@ -446,6 +448,14 @@ The
 argument can optionally specify a port range instead of a single port;
 the format is
 .Ar min-port : Ns Ar max-port .
+The optional argument
+.Ar ip-proto
+can be used to specify an IP protocol like
+.Ar tcp
+or
+.Ar udp ;
+it defaults to
+.Ar tcp .
 The rdr rule can be optionally restricted to a given interface name.
 .It Xo
 .Ic route to
@@ -1048,7 +1058,7 @@ Default location of the CA bundle that can be used with
 .Xr relayd 8 .
 .El
 .Sh EXAMPLES
-This configuration file would create a service
+This configuration file would create a redirection service
 .Dq www
 which load balances four hosts
 and falls back to one host containing a
@@ -1076,6 +1086,17 @@ redirect "www" {
 }
 .Ed
 .Pp
+It is possible to specify multiple listen directives with different IP
+protocols in a single redirection configuration:
+.Bd -literal -offset indent
+redirect "dns" {
+	listen on dns.example.com tcp port 53
+	listen on dns.example.com udp port 53
+
+	forward to \*(Ltdnshosts\*(Gt port 53 check tcp
+}
+.Ed
+.Pp
 The following configuration would add a relay to forward
 secure HTTPS connections to a pool of HTTP webservers
 using the