mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 20:50:31 -04:00
97d81944e8
- Take maintainership. PR: 247298 Submitted by: /me Approved by: stephen (previous maintainer) Differential Revision: D24195
86 lines
2.4 KiB
Diff
86 lines
2.4 KiB
Diff
--- a/psutil/arch/bsd/freebsd_socks.c.orig 2017-03-21 00:28:50.234080000 -0700
|
|
+++ b/psutil/arch/bsd/freebsd_socks.c 2017-03-21 00:35:53.545508000 -0700
|
|
@@ -112,10 +112,17 @@
|
|
}
|
|
|
|
|
|
+#if __FreeBSD_version >= 1200026
|
|
+static struct xtcpcb *
|
|
+psutil_search_tcplist(char *buf, struct kinfo_file *kif) {
|
|
+ struct xtcpcb *tp;
|
|
+ struct xinpcb *inp;
|
|
+#else
|
|
static struct tcpcb *
|
|
psutil_search_tcplist(char *buf, struct kinfo_file *kif) {
|
|
struct tcpcb *tp;
|
|
struct inpcb *inp;
|
|
+#endif
|
|
struct xinpgen *xig, *oxig;
|
|
struct xsocket *so;
|
|
|
|
@@ -123,9 +130,15 @@
|
|
for (xig = (struct xinpgen *)((char *)xig + xig->xig_len);
|
|
xig->xig_len > sizeof(struct xinpgen);
|
|
xig = (struct xinpgen *)((char *)xig + xig->xig_len)) {
|
|
+#if __FreeBSD_version >= 1200026
|
|
+ tp = (struct xtcpcb *)xig;
|
|
+ inp = &tp->xt_inp;
|
|
+ so = &inp->xi_socket;
|
|
+#else
|
|
tp = &((struct xtcpcb *)xig)->xt_tp;
|
|
inp = &((struct xtcpcb *)xig)->xt_inp;
|
|
so = &((struct xtcpcb *)xig)->xt_socket;
|
|
+#endif
|
|
|
|
if (so->so_type != kif->kf_sock_type ||
|
|
so->xso_family != kif->kf_sock_domain ||
|
|
@@ -208,7 +221,11 @@
|
|
struct xinpgen *xig, *exig;
|
|
struct xinpcb *xip;
|
|
struct xtcpcb *xtp;
|
|
+#if __FreeBSD_version >= 1200026
|
|
+ struct xinpcb *inp;
|
|
+#else
|
|
struct inpcb *inp;
|
|
+#endif
|
|
struct xsocket *so;
|
|
const char *varname = NULL;
|
|
size_t len, bufsize;
|
|
@@ -273,8 +290,13 @@
|
|
goto error;
|
|
}
|
|
inp = &xtp->xt_inp;
|
|
+#if __FreeBSD_version >= 1200026
|
|
+ so = &inp->xi_socket;
|
|
+ status = xtp->t_state;
|
|
+#else
|
|
so = &xtp->xt_socket;
|
|
status = xtp->xt_tp.t_state;
|
|
+#endif
|
|
break;
|
|
case IPPROTO_UDP:
|
|
xip = (struct xinpcb *)xig;
|
|
@@ -283,7 +305,11 @@
|
|
"struct xinpcb size mismatch");
|
|
goto error;
|
|
}
|
|
+#if __FreeBSD_version >= 1200026
|
|
+ inp = xip;
|
|
+#else
|
|
inp = &xip->xi_inp;
|
|
+#endif
|
|
so = &xip->xi_socket;
|
|
status = PSUTIL_CONN_NONE;
|
|
break;
|
|
@@ -477,7 +503,11 @@
|
|
struct kinfo_file *freep = NULL;
|
|
struct kinfo_file *kif;
|
|
char *tcplist = NULL;
|
|
+#if __FreeBSD_version >= 1200026
|
|
+ struct xtcpcb *tcp;
|
|
+#else
|
|
struct tcpcb *tcp;
|
|
+#endif
|
|
|
|
PyObject *py_retlist = PyList_New(0);
|
|
PyObject *py_tuple = NULL;
|