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 3/3] iproute2 and xfrm
Date: Thu, 15 Jul 2004 15:02:21 +0900 [thread overview]
Message-ID: <20040715150221.537fee7d@localhost> (raw)
In-Reply-To: <20040714174637.0ce79ae1@localhost>
This patch is for iproute2 and fixes minor output format.
Regards,
ChangeSet@1.57, 2004-07-12 20:01:23+09:00, nakam@linux-ipv6.org
fix message for protocol.
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
@@ -91,6 +91,23 @@
return str;
}
+const char *strxf_proto(__u8 proto)
+{
+ static char buf[32];
+ struct protoent *pp;
+ const char *p;
+
+ pp = getprotobynumber(proto);
+ if (pp)
+ p = pp->p_name;
+ else {
+ sprintf(buf, "%d", proto);
+ p = buf;
+ }
+
+ return p;
+}
+
void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id,
__u8 mode, __u32 reqid, __u16 family, FILE *fp,
const char *prefix)
diff -Nru a/ip/xfrm.h b/ip/xfrm.h
--- a/ip/xfrm.h 2004-07-14 16:35:49 +09:00
+++ b/ip/xfrm.h 2004-07-14 16:35:49 +09:00
@@ -80,6 +80,7 @@
const char *strxf_flags(__u8 flags);
const char *strxf_share(__u8 share);
+const char *strxf_proto(__u8 proto);
void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id,
__u8 mode, __u32 reqid, __u16 family, FILE *fp,
const char *prefix);
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
@@ -78,7 +78,12 @@
fprintf(stderr, "TMPL := ID [ mode MODE ] [ reqid REQID ] [ level LEVEL ]\n");
fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n");
- fprintf(stderr, "XFRM_PROTO := [ esp | ah | ipcomp ]\n");
+ //fprintf(stderr, "XFRM_PROTO := [ esp | ah | ipcomp ]\n");
+ fprintf(stderr, "XFRM_PROTO := [ ");
+ fprintf(stderr, "%s | ", strxf_proto(IPPROTO_ESP));
+ fprintf(stderr, "%s | ", strxf_proto(IPPROTO_AH));
+ fprintf(stderr, "%s", strxf_proto(IPPROTO_COMP));
+ fprintf(stderr, " ]\n");
fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
//fprintf(stderr, "REQID - number(default=0)\n");
diff -Nru a/ip/xfrm_state.c b/ip/xfrm_state.c
--- a/ip/xfrm_state.c 2004-07-14 16:35:49 +09:00
+++ b/ip/xfrm_state.c 2004-07-14 16:35:49 +09:00
@@ -63,7 +63,13 @@
fprintf(stderr, " [ FLAG_LIST ]\n");
fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n");
- fprintf(stderr, "XFRM_PROTO := [ esp | ah | ipcomp ]\n");
+ //fprintf(stderr, "XFRM_PROTO := [ esp | ah | ipcomp ]\n");
+ fprintf(stderr, "XFRM_PROTO := [ ");
+ fprintf(stderr, "%s | ", strxf_proto(IPPROTO_ESP));
+ fprintf(stderr, "%s | ", strxf_proto(IPPROTO_AH));
+ fprintf(stderr, "%s", strxf_proto(IPPROTO_COMP));
+ fprintf(stderr, " ]\n");
+
//fprintf(stderr, "SPI - security parameter index(default=0)\n");
fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
--
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 ` [PATCH 1/3] iproute2 and xfrm Masahide NAKAMURA
2004-07-16 22:22 ` 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 ` Masahide NAKAMURA [this message]
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=20040715150221.537fee7d@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.