diff options
| author | Vince Busam <vbusam@google.com> | 2008-09-02 09:55:49 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-04 21:17:10 -0400 |
| commit | 667a5f18162e803e30722af46ade1737e3b93198 (patch) | |
| tree | 28708212c9d8b2a19006c4745fdffda3f9dca83f /net/ipv4/ipvs/ip_vs_conn.c | |
| parent | 7937df1564783806c285d34a1c6fd63d8da29d7a (diff) | |
IPVS: Convert procfs files for IPv6 entry output
Correctly output IPv6 connection/service/dest entries in procfs files.
Signed-off-by: Vince Busam <vbusam@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_conn.c')
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index c2a42a62433..e7603d749c0 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c | |||
| @@ -815,8 +815,22 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v) | |||
| 815 | else { | 815 | else { |
| 816 | const struct ip_vs_conn *cp = v; | 816 | const struct ip_vs_conn *cp = v; |
| 817 | 817 | ||
| 818 | seq_printf(seq, | 818 | #ifdef CONFIG_IP_VS_IPV6 |
| 819 | "%-3s %08X %04X %08X %04X %08X %04X %-11s %7lu\n", | 819 | if (cp->af == AF_INET6) |
| 820 | seq_printf(seq, | ||
| 821 | "%-3s " NIP6_FMT " %04X " NIP6_FMT | ||
| 822 | " %04X " NIP6_FMT " %04X %-11s %7lu\n", | ||
| 823 | ip_vs_proto_name(cp->protocol), | ||
| 824 | NIP6(cp->caddr.in6), ntohs(cp->cport), | ||
| 825 | NIP6(cp->vaddr.in6), ntohs(cp->vport), | ||
| 826 | NIP6(cp->daddr.in6), ntohs(cp->dport), | ||
| 827 | ip_vs_state_name(cp->protocol, cp->state), | ||
| 828 | (cp->timer.expires-jiffies)/HZ); | ||
| 829 | else | ||
| 830 | #endif | ||
| 831 | seq_printf(seq, | ||
| 832 | "%-3s %08X %04X %08X %04X" | ||
| 833 | " %08X %04X %-11s %7lu\n", | ||
| 820 | ip_vs_proto_name(cp->protocol), | 834 | ip_vs_proto_name(cp->protocol), |
| 821 | ntohl(cp->caddr.ip), ntohs(cp->cport), | 835 | ntohl(cp->caddr.ip), ntohs(cp->cport), |
| 822 | ntohl(cp->vaddr.ip), ntohs(cp->vport), | 836 | ntohl(cp->vaddr.ip), ntohs(cp->vport), |
| @@ -864,8 +878,23 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v) | |||
| 864 | else { | 878 | else { |
| 865 | const struct ip_vs_conn *cp = v; | 879 | const struct ip_vs_conn *cp = v; |
| 866 | 880 | ||
| 867 | seq_printf(seq, | 881 | #ifdef CONFIG_IP_VS_IPV6 |
| 868 | "%-3s %08X %04X %08X %04X %08X %04X %-11s %-6s %7lu\n", | 882 | if (cp->af == AF_INET6) |
| 883 | seq_printf(seq, | ||
| 884 | "%-3s " NIP6_FMT " %04X " NIP6_FMT | ||
| 885 | " %04X " NIP6_FMT " %04X %-11s %-6s %7lu\n", | ||
| 886 | ip_vs_proto_name(cp->protocol), | ||
| 887 | NIP6(cp->caddr.in6), ntohs(cp->cport), | ||
| 888 | NIP6(cp->vaddr.in6), ntohs(cp->vport), | ||
| 889 | NIP6(cp->daddr.in6), ntohs(cp->dport), | ||
| 890 | ip_vs_state_name(cp->protocol, cp->state), | ||
| 891 | ip_vs_origin_name(cp->flags), | ||
| 892 | (cp->timer.expires-jiffies)/HZ); | ||
| 893 | else | ||
| 894 | #endif | ||
| 895 | seq_printf(seq, | ||
| 896 | "%-3s %08X %04X %08X %04X " | ||
| 897 | "%08X %04X %-11s %-6s %7lu\n", | ||
| 869 | ip_vs_proto_name(cp->protocol), | 898 | ip_vs_proto_name(cp->protocol), |
| 870 | ntohl(cp->caddr.ip), ntohs(cp->cport), | 899 | ntohl(cp->caddr.ip), ntohs(cp->cport), |
| 871 | ntohl(cp->vaddr.ip), ntohs(cp->vport), | 900 | ntohl(cp->vaddr.ip), ntohs(cp->vport), |