diff --git a/bindings/java/src/jni/generate.pl b/bindings/java/src/jni/generate.pl index 560cd320..263a14f6 100644 --- a/bindings/java/src/jni/generate.pl +++ b/bindings/java/src/jni/generate.pl @@ -1023,11 +1023,6 @@ my %classes = ( }, ], TcpStat => [ - { - name => 'max_conn', type => 'Int', - desc => '', - plat => '' - }, { name => 'active_opens', type => 'Long', desc => '', diff --git a/include/sigar.h b/include/sigar.h index 7867bb15..f46c8a8c 100644 --- a/include/sigar.h +++ b/include/sigar.h @@ -688,7 +688,6 @@ sigar_net_stat_port_get(sigar_t *sigar, /* TCP-MIB */ typedef struct { - sigar_uint32_t max_conn; sigar_uint64_t active_opens; sigar_uint64_t passive_opens; sigar_uint64_t attempt_fails; diff --git a/src/os/aix/aix_sigar.c b/src/os/aix/aix_sigar.c index 9a1cedcb..aaa41ea9 100644 --- a/src/os/aix/aix_sigar.c +++ b/src/os/aix/aix_sigar.c @@ -2280,7 +2280,6 @@ sigar_tcp_stat_get(sigar_t *sigar, return ENOENT; } - tcpstat->max_conn = -1; tcpstat->active_opens = proto.u.tcp.initiated; tcpstat->passive_opens = proto.u.tcp.accepted; tcpstat->attempt_fails = proto.u.tcp.dropped; diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c index d8df827f..c3564915 100644 --- a/src/os/darwin/darwin_sigar.c +++ b/src/os/darwin/darwin_sigar.c @@ -2223,7 +2223,6 @@ sigar_tcp_stat_get(sigar_t *sigar, return errno; } - tcpstat->max_conn = -1; tcpstat->active_opens = mib.tcps_connattempt; tcpstat->passive_opens = mib.tcps_accepts; tcpstat->attempt_fails = mib.tcps_conndrops; diff --git a/src/os/hpux/hpux_sigar.c b/src/os/hpux/hpux_sigar.c index e6b53827..120940bf 100644 --- a/src/os/hpux/hpux_sigar.c +++ b/src/os/hpux/hpux_sigar.c @@ -1053,8 +1053,8 @@ static struct { { ID_tcpRtoAlgorithm, tcpsoff(xxx) }, { ID_tcpRtoMin, tcpsoff(xxx) }, { ID_tcpRtoMax, tcpsoff(xxx) }, -#endif { ID_tcpMaxConn, tcpsoff(max_conn) }, +#endif { ID_tcpActiveOpens, tcpsoff(active_opens) }, { ID_tcpPassiveOpens, tcpsoff(passive_opens) }, { ID_tcpAttemptFails, tcpsoff(attempt_fails) }, diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c index 6a3ce5ef..21874e62 100644 --- a/src/os/linux/linux_sigar.c +++ b/src/os/linux/linux_sigar.c @@ -2150,9 +2150,8 @@ sigar_tcp_stat_get(sigar_t *sigar, if (status == SIGAR_OK) { /* assuming field order, same in 2.2, 2.4 and 2.6 kernels */ - /* Tcp: RtoAlgorithm RtoMin RtoMax */ - ptr = sigar_skip_multiple_token(ptr, 4); - tcpstat->max_conn = sigar_strtoul(ptr); + /* Tcp: RtoAlgorithm RtoMin RtoMax MaxConn */ + ptr = sigar_skip_multiple_token(ptr, 5); tcpstat->active_opens = sigar_strtoull(ptr); tcpstat->passive_opens = sigar_strtoull(ptr); tcpstat->attempt_fails = sigar_strtoull(ptr); diff --git a/src/os/solaris/solaris_sigar.c b/src/os/solaris/solaris_sigar.c index d795a1b5..8eabeb86 100644 --- a/src/os/solaris/solaris_sigar.c +++ b/src/os/solaris/solaris_sigar.c @@ -2403,7 +2403,6 @@ sigar_tcp_stat_get(sigar_t *sigar, } if (mib) { - tcpstat->max_conn = mib->tcpMaxConn; tcpstat->active_opens = mib->tcpActiveOpens; tcpstat->passive_opens = mib->tcpPassiveOpens; tcpstat->attempt_fails = mib->tcpAttemptFails; diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c index 51221e12..f363ea35 100644 --- a/src/os/win32/win32_sigar.c +++ b/src/os/win32/win32_sigar.c @@ -2804,7 +2804,6 @@ sigar_tcp_stat_get(sigar_t *sigar, return status; } - tcpstat->max_conn = mib.dwMaxConn; tcpstat->active_opens = mib.dwActiveOpens; tcpstat->passive_opens = mib.dwPassiveOpens; tcpstat->attempt_fails = mib.dwAttemptFails;