| Message ID | 50121FB0.6060200@parallels.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
Stephen, I have a question regarding the save and restore in iproute tool. As you know, the save/restore pair for routes works in a very simple and elegant manner -- on save the raw kernel rtnl stream is just put into a file, on restore the _very_ _same_ messages are pushed back to the kernel. Is the same trick possible to save and restore the addresses (the ip addr command) as well? Or the RTM_GETADDR messages cannot be just read from and written back to the network stack in a generic case? Thanks, Pavel -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 27 Jul 2012 08:57:20 +0400 Pavel Emelyanov <xemul@parallels.com> wrote: > Some time ago the save+restore commands were added to ip route (git > id f4ff11e3, Add ip route save/restore). These two save the raw rtnl > stream into a file and restore one (reading it from stdin). > > The problem is that there's no way to get the contents of the dump > file in a human readable form. The proposal is to add a command that > reads the rtnl stream from stdin and prints the data in a way the > usual "ip route list" does? > > changes since v1: > > * Take the magic at the beginning of the dump file into account > * Check for stdin (the dump is taken from) is not a tty > > Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Applied this and the magic number change. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/ip/iproute.c b/ip/iproute.c index bbb3923..572e2e8 100644 --- a/ip/iproute.c +++ b/ip/iproute.c @@ -60,6 +60,7 @@ static void usage(void) fprintf(stderr, "Usage: ip route { list | flush } SELECTOR\n"); fprintf(stderr, " ip route save SELECTOR\n"); fprintf(stderr, " ip route restore\n"); + fprintf(stderr, " ip route showdump\n"); fprintf(stderr, " ip route get ADDRESS [ from ADDRESS iif STRING ]\n"); fprintf(stderr, " [ oif STRING ] [ tos TOS ]\n"); fprintf(stderr, " [ mark NUMBER ]\n"); @@ -1566,6 +1567,20 @@ int iproute_restore(void) exit(rtnl_from_file(stdin, &restore_handler, NULL)); } +static int show_handler(const struct sockaddr_nl *nl, struct nlmsghdr *n, void *arg) +{ + print_route(nl, n, stdout); + return 0; +} + +static int iproute_showdump(void) +{ + if (route_dump_check_magic()) + exit(-1); + + exit(rtnl_from_file(stdin, &show_handler, NULL)); +} + void iproute_reset_filter() { memset(&filter, 0, sizeof(filter)); @@ -1610,6 +1625,8 @@ int do_iproute(int argc, char **argv) return iproute_list_flush_or_save(argc-1, argv+1, IPROUTE_SAVE); if (matches(*argv, "restore") == 0) return iproute_restore(); + if (matches(*argv, "showdump") == 0) + return iproute_showdump(); if (matches(*argv, "help") == 0) usage(); fprintf(stderr, "Command \"%s\" is unknown, try \"ip route help\".\n", *argv);
Some time ago the save+restore commands were added to ip route (git id f4ff11e3, Add ip route save/restore). These two save the raw rtnl stream into a file and restore one (reading it from stdin). The problem is that there's no way to get the contents of the dump file in a human readable form. The proposal is to add a command that reads the rtnl stream from stdin and prints the data in a way the usual "ip route list" does? changes since v1: * Take the magic at the beginning of the dump file into account * Check for stdin (the dump is taken from) is not a tty Signed-off-by: Pavel Emelyanov <xemul@parallels.com> --- ip/iproute.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-)