|
@@ -358,22 +358,22 @@ static void icmp_put(struct seq_file *seq)
|
|
atomic_long_t *ptr = net->mib.icmpmsg_statistics->mibs;
|
|
atomic_long_t *ptr = net->mib.icmpmsg_statistics->mibs;
|
|
|
|
|
|
seq_puts(seq, "\nIcmp: InMsgs InErrors InCsumErrors");
|
|
seq_puts(seq, "\nIcmp: InMsgs InErrors InCsumErrors");
|
|
- for (i = 0; icmpmibmap[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; icmpmibmap[i].name; i++)
|
|
seq_printf(seq, " In%s", icmpmibmap[i].name);
|
|
seq_printf(seq, " In%s", icmpmibmap[i].name);
|
|
seq_puts(seq, " OutMsgs OutErrors");
|
|
seq_puts(seq, " OutMsgs OutErrors");
|
|
- for (i = 0; icmpmibmap[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; icmpmibmap[i].name; i++)
|
|
seq_printf(seq, " Out%s", icmpmibmap[i].name);
|
|
seq_printf(seq, " Out%s", icmpmibmap[i].name);
|
|
seq_printf(seq, "\nIcmp: %lu %lu %lu",
|
|
seq_printf(seq, "\nIcmp: %lu %lu %lu",
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_INMSGS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_INMSGS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_INERRORS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_INERRORS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_CSUMERRORS));
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_CSUMERRORS));
|
|
- for (i = 0; icmpmibmap[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; icmpmibmap[i].name; i++)
|
|
seq_printf(seq, " %lu",
|
|
seq_printf(seq, " %lu",
|
|
atomic_long_read(ptr + icmpmibmap[i].index));
|
|
atomic_long_read(ptr + icmpmibmap[i].index));
|
|
seq_printf(seq, " %lu %lu",
|
|
seq_printf(seq, " %lu %lu",
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_OUTMSGS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_OUTMSGS),
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_OUTERRORS));
|
|
snmp_fold_field(net->mib.icmp_statistics, ICMP_MIB_OUTERRORS));
|
|
- for (i = 0; icmpmibmap[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; icmpmibmap[i].name; i++)
|
|
seq_printf(seq, " %lu",
|
|
seq_printf(seq, " %lu",
|
|
atomic_long_read(ptr + (icmpmibmap[i].index | 0x100)));
|
|
atomic_long_read(ptr + (icmpmibmap[i].index | 0x100)));
|
|
}
|
|
}
|
|
@@ -390,7 +390,7 @@ static int snmp_seq_show_ipstats(struct seq_file *seq, void *v)
|
|
memset(buff64, 0, IPSTATS_MIB_MAX * sizeof(u64));
|
|
memset(buff64, 0, IPSTATS_MIB_MAX * sizeof(u64));
|
|
|
|
|
|
seq_puts(seq, "Ip: Forwarding DefaultTTL");
|
|
seq_puts(seq, "Ip: Forwarding DefaultTTL");
|
|
- for (i = 0; snmp4_ipstats_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_ipstats_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_ipstats_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_ipstats_list[i].name);
|
|
|
|
|
|
seq_printf(seq, "\nIp: %d %d",
|
|
seq_printf(seq, "\nIp: %d %d",
|
|
@@ -401,7 +401,7 @@ static int snmp_seq_show_ipstats(struct seq_file *seq, void *v)
|
|
snmp_get_cpu_field64_batch(buff64, snmp4_ipstats_list,
|
|
snmp_get_cpu_field64_batch(buff64, snmp4_ipstats_list,
|
|
net->mib.ip_statistics,
|
|
net->mib.ip_statistics,
|
|
offsetof(struct ipstats_mib, syncp));
|
|
offsetof(struct ipstats_mib, syncp));
|
|
- for (i = 0; snmp4_ipstats_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_ipstats_list[i].name; i++)
|
|
seq_printf(seq, " %llu", buff64[i]);
|
|
seq_printf(seq, " %llu", buff64[i]);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -416,13 +416,13 @@ static int snmp_seq_show_tcp_udp(struct seq_file *seq, void *v)
|
|
memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));
|
|
memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));
|
|
|
|
|
|
seq_puts(seq, "\nTcp:");
|
|
seq_puts(seq, "\nTcp:");
|
|
- for (i = 0; snmp4_tcp_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_tcp_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_tcp_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_tcp_list[i].name);
|
|
|
|
|
|
seq_puts(seq, "\nTcp:");
|
|
seq_puts(seq, "\nTcp:");
|
|
snmp_get_cpu_field_batch(buff, snmp4_tcp_list,
|
|
snmp_get_cpu_field_batch(buff, snmp4_tcp_list,
|
|
net->mib.tcp_statistics);
|
|
net->mib.tcp_statistics);
|
|
- for (i = 0; snmp4_tcp_list[i].name != NULL; i++) {
|
|
|
|
|
|
+ for (i = 0; snmp4_tcp_list[i].name; i++) {
|
|
/* MaxConn field is signed, RFC 2012 */
|
|
/* MaxConn field is signed, RFC 2012 */
|
|
if (snmp4_tcp_list[i].entry == TCP_MIB_MAXCONN)
|
|
if (snmp4_tcp_list[i].entry == TCP_MIB_MAXCONN)
|
|
seq_printf(seq, " %ld", buff[i]);
|
|
seq_printf(seq, " %ld", buff[i]);
|
|
@@ -435,10 +435,10 @@ static int snmp_seq_show_tcp_udp(struct seq_file *seq, void *v)
|
|
snmp_get_cpu_field_batch(buff, snmp4_udp_list,
|
|
snmp_get_cpu_field_batch(buff, snmp4_udp_list,
|
|
net->mib.udp_statistics);
|
|
net->mib.udp_statistics);
|
|
seq_puts(seq, "\nUdp:");
|
|
seq_puts(seq, "\nUdp:");
|
|
- for (i = 0; snmp4_udp_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_udp_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_udp_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_udp_list[i].name);
|
|
seq_puts(seq, "\nUdp:");
|
|
seq_puts(seq, "\nUdp:");
|
|
- for (i = 0; snmp4_udp_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_udp_list[i].name; i++)
|
|
seq_printf(seq, " %lu", buff[i]);
|
|
seq_printf(seq, " %lu", buff[i]);
|
|
|
|
|
|
memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));
|
|
memset(buff, 0, TCPUDP_MIB_MAX * sizeof(unsigned long));
|
|
@@ -447,10 +447,10 @@ static int snmp_seq_show_tcp_udp(struct seq_file *seq, void *v)
|
|
seq_puts(seq, "\nUdpLite:");
|
|
seq_puts(seq, "\nUdpLite:");
|
|
snmp_get_cpu_field_batch(buff, snmp4_udp_list,
|
|
snmp_get_cpu_field_batch(buff, snmp4_udp_list,
|
|
net->mib.udplite_statistics);
|
|
net->mib.udplite_statistics);
|
|
- for (i = 0; snmp4_udp_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_udp_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_udp_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_udp_list[i].name);
|
|
seq_puts(seq, "\nUdpLite:");
|
|
seq_puts(seq, "\nUdpLite:");
|
|
- for (i = 0; snmp4_udp_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_udp_list[i].name; i++)
|
|
seq_printf(seq, " %lu", buff[i]);
|
|
seq_printf(seq, " %lu", buff[i]);
|
|
|
|
|
|
seq_putc(seq, '\n');
|
|
seq_putc(seq, '\n');
|
|
@@ -493,21 +493,21 @@ static int netstat_seq_show(struct seq_file *seq, void *v)
|
|
struct net *net = seq->private;
|
|
struct net *net = seq->private;
|
|
|
|
|
|
seq_puts(seq, "TcpExt:");
|
|
seq_puts(seq, "TcpExt:");
|
|
- for (i = 0; snmp4_net_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_net_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_net_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_net_list[i].name);
|
|
|
|
|
|
seq_puts(seq, "\nTcpExt:");
|
|
seq_puts(seq, "\nTcpExt:");
|
|
- for (i = 0; snmp4_net_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_net_list[i].name; i++)
|
|
seq_printf(seq, " %lu",
|
|
seq_printf(seq, " %lu",
|
|
snmp_fold_field(net->mib.net_statistics,
|
|
snmp_fold_field(net->mib.net_statistics,
|
|
snmp4_net_list[i].entry));
|
|
snmp4_net_list[i].entry));
|
|
|
|
|
|
seq_puts(seq, "\nIpExt:");
|
|
seq_puts(seq, "\nIpExt:");
|
|
- for (i = 0; snmp4_ipextstats_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_ipextstats_list[i].name; i++)
|
|
seq_printf(seq, " %s", snmp4_ipextstats_list[i].name);
|
|
seq_printf(seq, " %s", snmp4_ipextstats_list[i].name);
|
|
|
|
|
|
seq_puts(seq, "\nIpExt:");
|
|
seq_puts(seq, "\nIpExt:");
|
|
- for (i = 0; snmp4_ipextstats_list[i].name != NULL; i++)
|
|
|
|
|
|
+ for (i = 0; snmp4_ipextstats_list[i].name; i++)
|
|
seq_printf(seq, " %llu",
|
|
seq_printf(seq, " %llu",
|
|
snmp_fold_field64(net->mib.ip_statistics,
|
|
snmp_fold_field64(net->mib.ip_statistics,
|
|
snmp4_ipextstats_list[i].entry,
|
|
snmp4_ipextstats_list[i].entry,
|