matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import patch iproute2.113 

(Logical change 1.115)
This commit is contained in:
net[shemminger]!shemminger 2005-01-17 23:27:23 +00:00
parent 540cea7cf1
commit 526afe4008
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-01-12 Stephen Hemminger <shemminger@dxpl.pdx.osdl.net>
* Add warning about "ip route nat" no longer supported
2005-01-12 Thomas Graf <tgraf@suug.ch> 2005-01-12 Thomas Graf <tgraf@suug.ch>
* Tc testsuite * Tc testsuite

3
ip/iprule.c
View File

@ -35,7 +35,7 @@ static void usage(void)
fprintf(stderr, "Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n"); fprintf(stderr, "Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n");
fprintf(stderr, "SELECTOR := [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK ]\n"); fprintf(stderr, "SELECTOR := [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK ]\n");
fprintf(stderr, " [ dev STRING ] [ pref NUMBER ]\n"); fprintf(stderr, " [ dev STRING ] [ pref NUMBER ]\n");
fprintf(stderr, "ACTION := [ table TABLE_ID ] [ nat ADDRESS ]\n"); fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
fprintf(stderr, " [ prohibit | reject | unreachable ]\n"); fprintf(stderr, " [ prohibit | reject | unreachable ]\n");
fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n"); fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n");
fprintf(stderr, "TABLE_ID := [ local | main | default | NUMBER ]\n"); fprintf(stderr, "TABLE_ID := [ local | main | default | NUMBER ]\n");
@ -270,6 +270,7 @@ static int iprule_modify(int cmd, int argc, char **argv)
} else if (strcmp(*argv, "nat") == 0 || } else if (strcmp(*argv, "nat") == 0 ||
matches(*argv, "map-to") == 0) { matches(*argv, "map-to") == 0) {
NEXT_ARG(); NEXT_ARG();
fprintf(stderr, "Warning: route NAT is deprecated\n");
addattr32(&req.n, sizeof(req), RTA_GATEWAY, get_addr32(*argv)); addattr32(&req.n, sizeof(req), RTA_GATEWAY, get_addr32(*argv));
req.r.rtm_type = RTN_NAT; req.r.rtm_type = RTN_NAT;
} else { } else {

9
man/man8/ip.8
View File

@ -907,8 +907,11 @@ error.
are considered to be dummy (or external) addresses which require translation are considered to be dummy (or external) addresses which require translation
to real (or internal) ones before forwarding. The addresses to translate to to real (or internal) ones before forwarding. The addresses to translate to
are selected with the attribute are selected with the attribute
.BR "via" . .B Warning:
Route NAT is no longer supported in Linux 2.6.
.BR "via" .
.sp .sp
.B anycast .B anycast
.RI "- " "not implemented" .RI "- " "not implemented"
@ -1794,7 +1797,6 @@ It prepends the history with the state snapshot dumped at the moment
of starting. of starting.
.SH HISTORY .SH HISTORY
.B ip .B ip
was written by Alexey N. Kuznetsov and added in Linux 2.2. was written by Alexey N. Kuznetsov and added in Linux 2.2.
.SH SEE ALSO .SH SEE ALSO
@ -1805,5 +1807,4 @@ was written by Alexey N. Kuznetsov and added in Linux 2.2.
.RB "IP tunnels " ip-cref.ps .RB "IP tunnels " ip-cref.ps
.SH AUTHOR .SH AUTHOR
Original Manpage by Michail Litvak <mci@owl.openwall.com>
Manpage maintained by Michail Litvak <mci@owl.openwall.com>