bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement sigar_net_connection_walk for solaris

This commit is contained in:
Doug MacEachern 2006-07-01 17:16:47 +00:00
parent b1798c3e2f
commit 525c16a5f9
2 changed files with 74 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/solaris/sigar_os.h
View File

@ -279,5 +279,7 @@ struct sigar_t {
#define SIGAR_EMIB2 (SIGAR_OS_START_ERROR+1) #define SIGAR_EMIB2 (SIGAR_OS_START_ERROR+1)
#define SIGAR_USE_NET_CONNECTION_LIST_WALKER
#endif /* SIGAR_OS_H */ #endif /* SIGAR_OS_H */

115
src/os/solaris/solaris_sigar.c
View File

@ -2028,12 +2028,13 @@ int sigar_net_interface_stat_get(sigar_t *sigar, const char *name,
#define TCPQ_SIZE(s) ((s) >= 0 ? (s) : 0) #define TCPQ_SIZE(s) ((s) >= 0 ? (s) : 0)
static int tcp_connection_list_get(sigar_t *sigar, static int tcp_connection_list_get(sigar_net_connection_walker_t *walker,
sigar_net_connection_list_t *connlist,
int flags,
struct mib2_tcpConnEntry *entry, struct mib2_tcpConnEntry *entry,
int len) int len)
{ {
sigar_t *sigar = walker->sigar;
int flags = walker->flags;
int status;
char *end = (char *)entry + len; char *end = (char *)entry + len;
while ((char *)entry < end) { while ((char *)entry < end) {
@ -2042,84 +2043,90 @@ static int tcp_connection_list_get(sigar_t *sigar,
if (((flags & SIGAR_NETCONN_SERVER) && (state == TCPS_LISTEN)) || if (((flags & SIGAR_NETCONN_SERVER) && (state == TCPS_LISTEN)) ||
((flags & SIGAR_NETCONN_CLIENT) && (state != TCPS_LISTEN))) ((flags & SIGAR_NETCONN_CLIENT) && (state != TCPS_LISTEN)))
{ {
sigar_net_connection_t *conn; sigar_net_connection_t conn;
SIGAR_NET_CONNLIST_GROW(connlist); SIGAR_ZERO(&conn);
conn = &connlist->data[connlist->number++];
sigar_inet_ntoa(sigar, entry->tcpConnLocalAddress, sigar_inet_ntoa(sigar, entry->tcpConnLocalAddress,
conn->local_address); conn.local_address);
sigar_inet_ntoa(sigar, entry->tcpConnRemAddress, sigar_inet_ntoa(sigar, entry->tcpConnRemAddress,
conn->remote_address); conn.remote_address);
conn->local_port = entry->tcpConnLocalPort; conn.local_port = entry->tcpConnLocalPort;
conn->remote_port = entry->tcpConnRemPort; conn.remote_port = entry->tcpConnRemPort;
conn->type = SIGAR_NETCONN_TCP; conn.type = SIGAR_NETCONN_TCP;
conn->send_queue = conn.send_queue =
TCPQ_SIZE(entry->tcpConnEntryInfo.ce_snxt - TCPQ_SIZE(entry->tcpConnEntryInfo.ce_snxt -
entry->tcpConnEntryInfo.ce_suna - 1); entry->tcpConnEntryInfo.ce_suna - 1);
conn->receive_queue = conn.receive_queue =
TCPQ_SIZE(entry->tcpConnEntryInfo.ce_rnxt - TCPQ_SIZE(entry->tcpConnEntryInfo.ce_rnxt -
entry->tcpConnEntryInfo.ce_rack); entry->tcpConnEntryInfo.ce_rack);
switch (state) { switch (state) {
case TCPS_CLOSED: case TCPS_CLOSED:
conn->state = SIGAR_TCP_CLOSE; conn.state = SIGAR_TCP_CLOSE;
break; break;
case TCPS_IDLE: case TCPS_IDLE:
conn->state = SIGAR_TCP_IDLE; conn.state = SIGAR_TCP_IDLE;
break; break;
case TCPS_BOUND: case TCPS_BOUND:
conn->state = SIGAR_TCP_BOUND; conn.state = SIGAR_TCP_BOUND;
break; break;
case TCPS_LISTEN: case TCPS_LISTEN:
conn->state = SIGAR_TCP_LISTEN; conn.state = SIGAR_TCP_LISTEN;
break; break;
case TCPS_SYN_SENT: case TCPS_SYN_SENT:
conn->state = SIGAR_TCP_SYN_SENT; conn.state = SIGAR_TCP_SYN_SENT;
break; break;
case TCPS_SYN_RCVD: case TCPS_SYN_RCVD:
conn->state = SIGAR_TCP_SYN_RECV; conn.state = SIGAR_TCP_SYN_RECV;
break; break;
case TCPS_ESTABLISHED: case TCPS_ESTABLISHED:
conn->state = SIGAR_TCP_ESTABLISHED; conn.state = SIGAR_TCP_ESTABLISHED;
break; break;
case TCPS_CLOSE_WAIT: case TCPS_CLOSE_WAIT:
conn->state = SIGAR_TCP_CLOSE_WAIT; conn.state = SIGAR_TCP_CLOSE_WAIT;
break; break;
case TCPS_FIN_WAIT_1: case TCPS_FIN_WAIT_1:
conn->state = SIGAR_TCP_FIN_WAIT1; conn.state = SIGAR_TCP_FIN_WAIT1;
break; break;
case TCPS_CLOSING: case TCPS_CLOSING:
conn->state = SIGAR_TCP_CLOSING; conn.state = SIGAR_TCP_CLOSING;
break; break;
case TCPS_LAST_ACK: case TCPS_LAST_ACK:
conn->state = SIGAR_TCP_LAST_ACK; conn.state = SIGAR_TCP_LAST_ACK;
break; break;
case TCPS_FIN_WAIT_2: case TCPS_FIN_WAIT_2:
conn->state = SIGAR_TCP_FIN_WAIT2; conn.state = SIGAR_TCP_FIN_WAIT2;
break; break;
case TCPS_TIME_WAIT: case TCPS_TIME_WAIT:
conn->state = SIGAR_TCP_TIME_WAIT; conn.state = SIGAR_TCP_TIME_WAIT;
break; break;
default: default:
conn->state = SIGAR_TCP_UNKNOWN; conn.state = SIGAR_TCP_UNKNOWN;
break; break;
} }
status = walker->add_connection(walker, &conn);
if (status != SIGAR_OK) {
return status;
} }
}
entry++; entry++;
} }
return SIGAR_OK; return SIGAR_OK;
} }
static int udp_connection_list_get(sigar_t *sigar, static int udp_connection_list_get(sigar_net_connection_walker_t *walker,
sigar_net_connection_list_t *connlist,
int flags,
struct mib2_udpEntry *entry, struct mib2_udpEntry *entry,
int len) int len)
{ {
sigar_t *sigar = walker->sigar;
int flags = walker->flags;
int status;
char *end = (char *)entry + len; char *end = (char *)entry + len;
while ((char *)entry < end) { while ((char *)entry < end) {
@ -2129,17 +2136,21 @@ static int udp_connection_list_get(sigar_t *sigar,
if (((flags & SIGAR_NETCONN_SERVER) && (state == MIB2_UDP_idle)) || if (((flags & SIGAR_NETCONN_SERVER) && (state == MIB2_UDP_idle)) ||
((flags & SIGAR_NETCONN_CLIENT) && (state != MIB2_UDP_idle))) ((flags & SIGAR_NETCONN_CLIENT) && (state != MIB2_UDP_idle)))
{ {
sigar_net_connection_t *conn; sigar_net_connection_t conn;
SIGAR_NET_CONNLIST_GROW(connlist); SIGAR_ZERO(&conn);
conn = &connlist->data[connlist->number++];
sigar_inet_ntoa(sigar, entry->udpLocalAddress, sigar_inet_ntoa(sigar, entry->udpLocalAddress,
conn->local_address); conn.local_address);
SIGAR_SSTRCPY(conn->remote_address, "0.0.0.0"); SIGAR_SSTRCPY(conn.remote_address, "0.0.0.0");
conn->local_port = entry->udpLocalPort; conn.local_port = entry->udpLocalPort;
conn->remote_port = 0; conn.remote_port = 0;
conn->type = SIGAR_NETCONN_UDP; conn.type = SIGAR_NETCONN_UDP;
status = walker->add_connection(walker, &conn);
if (status != SIGAR_OK) {
return status;
}
} }
entry++; entry++;
@ -2148,34 +2159,44 @@ static int udp_connection_list_get(sigar_t *sigar,
return SIGAR_OK; return SIGAR_OK;
} }
int sigar_net_connection_list_get(sigar_t *sigar, int sigar_net_connection_walk(sigar_net_connection_walker_t *walker)
sigar_net_connection_list_t *connlist,
int flags)
{ {
sigar_t *sigar = walker->sigar;
int flags = walker->flags;
int status;
int want_tcp = flags & SIGAR_NETCONN_TCP;
int want_udp = flags & SIGAR_NETCONN_UDP;
char *data; char *data;
int len; int len;
int rc; int rc;
struct opthdr *op; struct opthdr *op;
sigar_net_connection_list_create(connlist);
while ((rc = get_mib2(&sigar->mib2, &op, &data, &len)) == GET_MIB2_OK) { while ((rc = get_mib2(&sigar->mib2, &op, &data, &len)) == GET_MIB2_OK) {
if ((op->level == MIB2_TCP) && if ((op->level == MIB2_TCP) &&
(op->name == MIB2_TCP_13) && (op->name == MIB2_TCP_13) &&
(flags & SIGAR_NETCONN_TCP)) want_tcp)
{ {
tcp_connection_list_get(sigar, connlist, flags, status =
tcp_connection_list_get(walker,
(struct mib2_tcpConnEntry *)data, (struct mib2_tcpConnEntry *)data,
len); len);
} }
else if ((op->level == MIB2_UDP) && else if ((op->level == MIB2_UDP) &&
(op->name == MIB2_UDP_5) && (op->name == MIB2_UDP_5) &&
(flags & SIGAR_NETCONN_UDP)) want_udp)
{ {
udp_connection_list_get(sigar, connlist, flags, status =
udp_connection_list_get(walker,
(struct mib2_udpEntry *)data, (struct mib2_udpEntry *)data,
len); len);
} }
else {
status = SIGAR_OK;
}
if (status != SIGAR_OK) {
break;
}
} }
if (rc != GET_MIB2_EOD) { if (rc != GET_MIB2_EOD) {