From patchwork Mon Dec 17 16:41:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 206918 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 A22B52C0095 for ; Tue, 18 Dec 2012 03:44:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753089Ab2LQQn6 (ORCPT ); Mon, 17 Dec 2012 11:43:58 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:44723 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752902Ab2LQQn5 (ORCPT ); Mon, 17 Dec 2012 11:43:57 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 82A9A5ABB6; Mon, 17 Dec 2012 17:43:55 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1TkdlB-00014q-Jo; Mon, 17 Dec 2012 17:41:45 +0100 From: Nicolas Dichtel To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [RESEND PATCH iproute2 2/2] ip: update man pages and usage() for 'ip monitor' Date: Mon, 17 Dec 2012 17:41:27 +0100 Message-Id: <1355762487-4082-2-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1355762487-4082-1-git-send-email-nicolas.dichtel@6wind.com> References: <20121217081026.5acd58a4@nehalam.linuxnetplumber.net> <1355762487-4082-1-git-send-email-nicolas.dichtel@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sync with the current code. Signed-off-by: Nicolas Dichtel --- ip/ipmonitor.c | 5 ++++- man/man8/ip-monitor.8 | 15 +++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c index 09a339c..a9ff1e8 100644 --- a/ip/ipmonitor.c +++ b/ip/ipmonitor.c @@ -29,7 +29,10 @@ int prefix_banner; static void usage(void) { - fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ]\n"); + fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ]\n"); + fprintf(stderr, "LISTofOBJECTS := link | address | route | mroute | prefix |\n"); + fprintf(stderr, " neigh | netconf\n"); + fprintf(stderr, "FILE := file FILENAME\n"); exit(-1); } diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8 index 351a744..b07cb0e 100644 --- a/man/man8/ip-monitor.8 +++ b/man/man8/ip-monitor.8 @@ -1,4 +1,4 @@ -.TH IP\-MONITOR 8 "20 Dec 2011" "iproute2" "Linux" +.TH IP\-MONITOR 8 "13 Dec 2012" "iproute2" "Linux" .SH "NAME" ip-monitor, rtmon \- state monitoring .SH "SYNOPSIS" @@ -6,8 +6,8 @@ ip-monitor, rtmon \- state monitoring .ad l .in +8 .ti -8 -.BR "ip monitor" " [ " all " |" -.IR LISTofOBJECTS " ]" +.BR "ip " " [ ip-OPTIONS ] " "monitor" " [ " all " |" +.IR LISTofOBJECTS " ] [ file " FILENAME " ] .sp .SH DESCRIPTION @@ -20,12 +20,13 @@ Namely, the command is the first in the command line and then the object list follows: .BR "ip monitor" " [ " all " |" -.IR LISTofOBJECTS " ]" +.IR LISTofOBJECTS " ] [ file " FILENAME " ] .I OBJECT-LIST is the list of object types that we want to monitor. It may contain -.BR link ", " address " and " route "." +.BR link ", " address ", " route ", " mroute ", " prefix ", " +.BR neigh " and " netconf "." If no .B file argument is given, @@ -34,7 +35,9 @@ opens RTNETLINK, listens on it and dumps state changes in the format described in previous sections. .P -If a file name is given, it does not listen on RTNETLINK, +If a +.I FILENAME +is given, it does not listen on RTNETLINK, but opens the file containing RTNETLINK messages saved in binary format and dumps them. Such a history file can be generated with the .B rtmon