From patchwork Fri Jul 27 04:57:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 173558 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 131E92C0078 for ; Fri, 27 Jul 2012 14:57:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753379Ab2G0E51 (ORCPT ); Fri, 27 Jul 2012 00:57:27 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40508 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753361Ab2G0E50 (ORCPT ); Fri, 27 Jul 2012 00:57:26 -0400 Received: from [10.30.22.37] ([10.30.22.37]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q6R4vM4u014558 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 27 Jul 2012 08:57:23 +0400 (MSK) Message-ID: <50121FB0.6060200@parallels.com> Date: Fri, 27 Jul 2012 08:57:20 +0400 From: Pavel Emelyanov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.1) Gecko/20120209 Thunderbird/10.0.1 MIME-Version: 1.0 To: Stephen Hemminger , Linux Netdev List Subject: [PATCH 2/2] iproute: Add route showdump command (v2) References: <50121F4D.8090606@parallels.com> In-Reply-To: <50121F4D.8090606@parallels.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- ip/iproute.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) 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);