From 526afe400887be9b3168ef3c92c6b6ec3e184f5f Mon Sep 17 00:00:00 2001 From: "net[shemminger]!shemminger" Date: Mon, 17 Jan 2005 23:27:23 +0000 Subject: [PATCH] Import patch iproute2.113 (Logical change 1.115) --- ChangeLog | 4 ++++ ip/iprule.c | 3 ++- man/man8/ip.8 | 9 +++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09ae633d..6cfba409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-01-12 Stephen Hemminger + + * Add warning about "ip route nat" no longer supported + 2005-01-12 Thomas Graf * Tc testsuite diff --git a/ip/iprule.c b/ip/iprule.c index 8c1fc276..c54b6672 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -35,7 +35,7 @@ static void usage(void) 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, " [ 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, " [ realms [SRCREALM/]DSTREALM ]\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 || matches(*argv, "map-to") == 0) { NEXT_ARG(); + fprintf(stderr, "Warning: route NAT is deprecated\n"); addattr32(&req.n, sizeof(req), RTA_GATEWAY, get_addr32(*argv)); req.r.rtm_type = RTN_NAT; } else { diff --git a/man/man8/ip.8 b/man/man8/ip.8 index 50e44192..cca6d1c1 100644 --- a/man/man8/ip.8 +++ b/man/man8/ip.8 @@ -907,8 +907,11 @@ error. are considered to be dummy (or external) addresses which require translation to real (or internal) ones before forwarding. The addresses to translate to are selected with the attribute -.BR "via" . +.B Warning: +Route NAT is no longer supported in Linux 2.6. + +.BR "via" . .sp .B anycast .RI "- " "not implemented" @@ -1794,7 +1797,6 @@ It prepends the history with the state snapshot dumped at the moment of starting. .SH HISTORY - .B ip was written by Alexey N. Kuznetsov and added in Linux 2.2. .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 .SH AUTHOR - -Manpage maintained by Michail Litvak +Original Manpage by Michail Litvak