xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

devip: allow setting the "trans" flag on a logical interface

Browse source 
This makes the interface route have the "t"-flag,
which causes packets routed to the interface to get
source translated.
This commit is contained in:
cinap_lenrek 2022-03-13 17:16:54 +00:00
parent d2a7d88662
commit 6e4a1fda8c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/src/9/ip/ipifc.c
View file

@ -465,8 +465,10 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
memset(rem, 0, IPaddrlen); memset(rem, 0, IPaddrlen);
switch(argc){ switch(argc){
case 6: case 6:
if(strcmp(argv[5], "proxy") == 0) if(strstr(argv[5], "proxy") != 0)
type |= Rproxy; type |= Rproxy;
if(strstr(argv[5], "trans") != 0)
type |= Rtrans;
/* fall through */ /* fall through */
case 5: case 5:
mtu = strtoul(argv[4], 0, 0); mtu = strtoul(argv[4], 0, 0);
@ -523,7 +525,7 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
if(!lifc->onlink && lifcp->onlink){ if(!lifc->onlink && lifcp->onlink){
lifc->onlink = 1; lifc->onlink = 1;
addroute(f, lifc->remote, lifc->mask, ip, IPallbits, addroute(f, lifc->remote, lifc->mask, ip, IPallbits,
lifc->remote, lifc->type, ifc, tifc); lifc->remote, lifc->type&~Rtrans, ifc, tifc);
if(v6addrtype(ip) != linklocalv6) if(v6addrtype(ip) != linklocalv6)
addroute(f, lifc->remote, lifc->mask, ip, IPnoaddr, addroute(f, lifc->remote, lifc->mask, ip, IPnoaddr,
lifc->remote, lifc->type, ifc, tifc); lifc->remote, lifc->type, ifc, tifc);
@ -569,7 +571,7 @@ ipifcadd(Ipifc *ifc, char **argv, int argc, int tentative, Iplifc *lifcp)
/* add route for this logical interface */ /* add route for this logical interface */
if(lifc->onlink){ if(lifc->onlink){
addroute(f, rem, mask, ip, IPallbits, rem, type, ifc, tifc); addroute(f, rem, mask, ip, IPallbits, rem, type&~Rtrans, ifc, tifc);
if(v6addrtype(ip) != linklocalv6) if(v6addrtype(ip) != linklocalv6)
addroute(f, rem, mask, ip, IPnoaddr, rem, type, ifc, tifc); addroute(f, rem, mask, ip, IPnoaddr, rem, type, ifc, tifc);
} }
@ -664,7 +666,7 @@ ipifcremlifc(Ipifc *ifc, Iplifc **l)
if(lifc->onlink){ if(lifc->onlink){
remroute(f, lifc->remote, lifc->mask, remroute(f, lifc->remote, lifc->mask,
lifc->local, IPallbits, lifc->local, IPallbits,
lifc->remote, lifc->type, ifc, tifc); lifc->remote, lifc->type&~Rtrans, ifc, tifc);
if(v6addrtype(lifc->local) != linklocalv6) if(v6addrtype(lifc->local) != linklocalv6)
remroute(f, lifc->remote, lifc->mask, remroute(f, lifc->remote, lifc->mask,
lifc->local, IPnoaddr, lifc->local, IPnoaddr,
@ -907,6 +909,8 @@ addselfcache(Fs *f, Ipifc *ifc, Iplifc *lifc, uchar *a, int type)
int h; int h;
type |= (lifc->type & Rv4); type |= (lifc->type & Rv4);
type &= ~Rtrans;
qlock(f->self); qlock(f->self);
if(waserror()){ if(waserror()){
qunlock(f->self); qunlock(f->self);