diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-03-25 10:54:23 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2011-03-25 10:54:23 +0000 |
| commit | f8085cb4f10da81f64e6026fe132a9bcbcf50a6a (patch) | |
| tree | d727e4b0bd7d69020f23d4dc26576ebb48875f88 /sys/net | |
| parent | f413c7b6ba164b0760742257a5b7740c7709e1bf (diff) | |
Include original rdomain in DIOCNATLOOK. This allows userland proxies
to establish cross rdomain proxy sessions.
OK henning@, mpf@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pf_ioctl.c | 3 | ||||
| -rw-r--r-- | sys/net/pfvar.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 1ccc46a027a..43062c18989 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.236 2010/12/15 14:22:25 claudio Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.237 2011/03/25 10:54:22 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1511,6 +1511,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) pnl->rsport = sk->port[sidx]; PF_ACPY(&pnl->rdaddr, &sk->addr[didx], sk->af); pnl->rdport = sk->port[didx]; + pnl->rrdomain = sk->rdomain; } else error = ENOENT; } diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 584d95ecefe..4945d2ff5c1 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.323 2011/03/24 20:09:44 bluhm Exp $ */ +/* $OpenBSD: pfvar.h,v 1.324 2011/03/25 10:54:22 claudio Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1470,6 +1470,7 @@ struct pfioc_natlook { struct pf_addr rsaddr; struct pf_addr rdaddr; u_int16_t rdomain; + u_int16_t rrdomain; u_int16_t sport; u_int16_t dport; u_int16_t rsport; |