matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tunnel: factorize printout of GRE key and flags 

print_tunnel() functions in ip6tunnel.c and iptunnel.c contains
the same code to print out GRE key and flags

This commit factorize the code in a helper function in tunnel.c

Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Andrea Claudi 2019-07-12 19:02:14 +02:00 committed by David Ahern
parent 1f250b6c53
commit ee713339d3
4 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ip/ip6tunnel.c
View File

@ -120,26 +120,8 @@ static void print_tunnel(const void *t)
if (p->flags & IP6_TNL_F_ALLOW_LOCAL_REMOTE) if (p->flags & IP6_TNL_F_ALLOW_LOCAL_REMOTE)
printf(" allow-localremote"); printf(" allow-localremote");
if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && tnl_print_gre_flags(p->proto, p->i_flags, p->o_flags,
p->o_key == p->i_key) p->i_key, p->o_key);
printf(" key %u", ntohl(p->i_key));
else {
if (p->i_flags & GRE_KEY)
printf(" ikey %u", ntohl(p->i_key));
if (p->o_flags & GRE_KEY)
printf(" okey %u", ntohl(p->o_key));
}
if (p->proto == IPPROTO_GRE) {
if (p->i_flags & GRE_SEQ)
printf("%s Drop packets out of sequence.", _SL_);
if (p->i_flags & GRE_CSUM)
printf("%s Checksum in received packet is required.", _SL_);
if (p->o_flags & GRE_SEQ)
printf("%s Sequence packets on output.", _SL_);
if (p->o_flags & GRE_CSUM)
printf("%s Checksum output packets.", _SL_);
}
} }
static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p) static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p)

19
ip/iptunnel.c
View File

@ -354,23 +354,8 @@ static void print_tunnel(const void *t)
} }
} }
if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key) tnl_print_gre_flags(p->iph.protocol, p->i_flags, p->o_flags,
printf(" key %u", ntohl(p->i_key)); p->i_key, p->o_key);
else if ((p->i_flags | p->o_flags) & GRE_KEY) {
if (p->i_flags & GRE_KEY)
printf(" ikey %u", ntohl(p->i_key));
if (p->o_flags & GRE_KEY)
printf(" okey %u", ntohl(p->o_key));
}
if (p->i_flags & GRE_SEQ)
printf("%s Drop packets out of sequence.", _SL_);
if (p->i_flags & GRE_CSUM)
printf("%s Checksum in received packet is required.", _SL_);
if (p->o_flags & GRE_SEQ)
printf("%s Sequence packets on output.", _SL_);
if (p->o_flags & GRE_CSUM)
printf("%s Checksum output packets.", _SL_);
} }

26
ip/tunnel.c
View File

@ -308,6 +308,32 @@ void tnl_print_endpoint(const char *name, const struct rtattr *rta, int family)
} }
} }
void tnl_print_gre_flags(__u8 proto,
__be16 i_flags, __be16 o_flags,
__be32 i_key, __be32 o_key)
{
if ((i_flags & GRE_KEY) && (o_flags & GRE_KEY) &&
o_key == i_key) {
printf(" key %u", ntohl(i_key));
} else {
if (i_flags & GRE_KEY)
printf(" ikey %u", ntohl(i_key));
if (o_flags & GRE_KEY)
printf(" okey %u", ntohl(o_key));
}
if (proto == IPPROTO_GRE) {
if (i_flags & GRE_SEQ)
printf("%s Drop packets out of sequence.", _SL_);
if (i_flags & GRE_CSUM)
printf("%s Checksum in received packet is required.", _SL_);
if (o_flags & GRE_SEQ)
printf("%s Sequence packets on output.", _SL_);
if (o_flags & GRE_CSUM)
printf("%s Checksum output packets.", _SL_);
}
}
static void tnl_print_stats(const struct rtnl_link_stats64 *s) static void tnl_print_stats(const struct rtnl_link_stats64 *s)
{ {
printf("%s", _SL_); printf("%s", _SL_);

3
ip/tunnel.h
View File

@ -55,5 +55,8 @@ void tnl_print_encap(struct rtattr *tb[],
int encap_sport, int encap_dport); int encap_sport, int encap_dport);
void tnl_print_endpoint(const char *name, void tnl_print_endpoint(const char *name,
const struct rtattr *rta, int family); const struct rtattr *rta, int family);
void tnl_print_gre_flags(__u8 proto,
__be16 i_flags, __be16 o_flags,
__be32 i_key, __be32 o_key);
#endif #endif