From: Masahide NAKAMURA <nakam@linux-ipv6.org>
To: Stephen Hemminger <shemminger@osdl.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
netdev@oss.sgi.com, nakam@linux-ipv6.org
Subject: [PATCH 1/3] iproute2 and xfrm
Date: Thu, 15 Jul 2004 15:02:14 +0900 [thread overview]
Message-ID: <20040715150214.6067a457@localhost> (raw)
In-Reply-To: <20040709125100.3edce4e9@localhost>
Hello,
This patch is minor fix for iproute2.
It consists of two small ChangeSets.
Regards,
ChangeSet@1.55, 2004-07-12 19:58:53+09:00, nakam@linux-ipv6.org
fix usage message for ipxfrm.
diff -Nru a/ip/xfrm_policy.c b/ip/xfrm_policy.c
--- a/ip/xfrm_policy.c 2004-07-14 16:35:49 +09:00
+++ b/ip/xfrm_policy.c 2004-07-14 16:35:49 +09:00
@@ -55,7 +55,6 @@
{
fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR sel SELECTOR [ index INDEX ] \n");
fprintf(stderr, " [ action ACTION ] [ priority PRIORITY ] [ LIMIT-LIST ] [ TMPL-LIST ]\n");
- fprintf(stderr, " [ sel SELECTOR | index INDEX ] [ TMPL-LIST ]\n");
fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ sel SELECTOR | index INDEX ]\n");
fprintf(stderr, "Usage: ip xfrm policy { flush | list } [ dir DIR ] [ sel SELECTOR ]\n");
fprintf(stderr, " [ index INDEX ] [ action ACTION ] [ priority PRIORITY ]\n");
@@ -75,7 +74,7 @@
fprintf(stderr, "LIMIT := [ [time-soft|time-hard|time-use-soft|time-use-hard] SECONDS ] |\n");
fprintf(stderr, " [ [byte-soft|byte-hard] SIZE ] | [ [packet-soft|packet-hard] NUMBER ]\n");
- fprintf(stderr, "TMPL-LIST := [ TMPL-LIST ] | [ tmpl TMPL ] | [ tmpl remain ](change only)\n");
+ fprintf(stderr, "TMPL-LIST := [ TMPL-LIST ] | [ tmpl TMPL ]\n");
fprintf(stderr, "TMPL := ID [ mode MODE ] [ reqid REQID ] [ level LEVEL ]\n");
fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n");
ChangeSet@1.54, 2004-07-12 19:57:50+09:00, nakam@linux-ipv6.org
fix command line option to understand "ip x p" and "ip x s".
diff -Nru a/ip/ipxfrm.c b/ip/ipxfrm.c
--- a/ip/ipxfrm.c 2004-07-14 16:35:49 +09:00
+++ b/ip/ipxfrm.c 2004-07-14 16:35:49 +09:00
@@ -793,13 +793,12 @@
if (argc < 1)
usage();
- if (strcmp(*argv, "state") == 0 ||
- strcmp(*argv, "sa") == 0) {
+ if (matches(*argv, "state") == 0 ||
+ matches(*argv, "sa") == 0) {
return do_xfrm_state(argc-1, argv+1);
- } else if (strcmp(*argv, "policy") == 0 ||
- strcmp(*argv, "pol") == 0) {
+ } else if (matches(*argv, "policy") == 0)
return do_xfrm_policy(argc-1, argv+1);
- } else if (strcmp(*argv, "help") == 0) {
+ else if (matches(*argv, "help") == 0) {
usage();
fprintf(stderr, "xfrm Object \"%s\" is unknown.\n", *argv);
exit(-1);
--
Masahide NAKAMURA
next prev parent reply other threads:[~2004-07-15 6:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-07-03 9:46 [PATCH] Add nl_open to libnetlink Herbert Xu
2004-07-05 7:05 ` Masahide NAKAMURA
2004-07-05 8:07 ` Herbert Xu
2004-07-06 21:05 ` Stephen Hemminger
2004-07-07 4:09 ` Masahide NAKAMURA
2004-07-07 5:05 ` Masahide NAKAMURA
2004-07-07 6:56 ` Masahide NAKAMURA
2004-07-07 11:03 ` Herbert Xu
2004-07-09 3:51 ` Masahide NAKAMURA
2004-07-15 6:02 ` Masahide NAKAMURA [this message]
2004-07-16 22:22 ` [PATCH 1/3] iproute2 and xfrm Stephen Hemminger
[not found] ` <20040714174233.2fc7dbc2@localhost>
2004-07-15 6:02 ` [PATCH 2/3] " Masahide NAKAMURA
2004-07-16 23:05 ` Herbert Xu
[not found] ` <20040714174637.0ce79ae1@localhost>
2004-07-15 6:02 ` [PATCH 3/3] " Masahide NAKAMURA
2004-07-07 18:08 ` [PATCH] Add nl_open to libnetlink Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040715150214.6067a457@localhost \
--to=nakam@linux-ipv6.org \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@oss.sgi.com \
--cc=shemminger@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).