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

fix netbsd skipping inet6

This commit is contained in:
Doug MacEachern 2008-04-27 01:59:44 +00:00
parent 606a050e3a
commit 23090b54b6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/darwin/darwin_sigar.c
View File

@ -2561,7 +2561,12 @@ static int net_connection_get(sigar_net_connection_walker_t *walker, int proto)
kread(sigar, &tcpcb, sizeof(tcpcb), (u_long)inpcb.inp_ppcb); kread(sigar, &tcpcb, sizeof(tcpcb), (u_long)inpcb.inp_ppcb);
} }
#ifndef __NetBSD__ #ifdef __NetBSD__
if (inpcb.inp_af == AF_INET6) {
/*XXX*/
continue;
}
#else
if (inpcb.inp_flags & INP_IPV6) { if (inpcb.inp_flags & INP_IPV6) {
sigar_net_address6_set(conn.local_address, sigar_net_address6_set(conn.local_address,
&inpcb.inp_laddr6.s6_addr); &inpcb.inp_laddr6.s6_addr);
@ -2569,16 +2574,15 @@ static int net_connection_get(sigar_net_connection_walker_t *walker, int proto)
sigar_net_address6_set(conn.remote_address, sigar_net_address6_set(conn.remote_address,
&inpcb.inp_faddr6.s6_addr); &inpcb.inp_faddr6.s6_addr);
} }
else {
#endif #endif
else {
sigar_net_address_set(conn.local_address, sigar_net_address_set(conn.local_address,
inpcb.inp_laddr.s_addr); inpcb.inp_laddr.s_addr);
sigar_net_address_set(conn.remote_address, sigar_net_address_set(conn.remote_address,
inpcb.inp_faddr.s_addr); inpcb.inp_faddr.s_addr);
#ifndef __NetBSD__
} }
#endif
conn.local_port = ntohs(inpcb.inp_lport); conn.local_port = ntohs(inpcb.inp_lport);
conn.remote_port = ntohs(inpcb.inp_fport); conn.remote_port = ntohs(inpcb.inp_fport);
conn.receive_queue = socket.so_rcv.sb_cc; conn.receive_queue = socket.so_rcv.sb_cc;