Date: Mon, 4 Sep 2017 00:00:38 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449222 - head/sysutils/py-psutil/files Message-ID: <201709040000.v8400cke056008@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Sep 4 00:00:38 2017 New Revision: 449222 URL: https://svnweb.freebsd.org/changeset/ports/449222 Log: Re-add ino64 support which was not merged upstream yet Added: head/sysutils/py-psutil/files/ - copied from r442229, head/sysutils/py-psutil/files/ head/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c - copied, changed from r442229, head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c Deleted: head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c Copied and modified: head/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c (from r442229, head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c) ============================================================================== --- head/sysutils/py-psutil/files/patch-psutil-arch-bsd-freebsd_socks.c Wed May 31 17:29:44 2017 (r442229, copy source) +++ head/sysutils/py-psutil/files/patch-psutil-arch-freebsd-proc_socks.c Mon Sep 4 00:00:38 2017 (r449222) @@ -1,170 +1,61 @@ ---- psutil/arch/bsd/freebsd_socks.c.orig 2017-03-26 08:09:27 UTC -+++ psutil/arch/bsd/freebsd_socks.c -@@ -112,10 +112,17 @@ psutil_sockaddr_matches(int family, int - } - - -+#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 @@ psutil_search_tcplist(char *buf, struct - 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 || -@@ -135,20 +148,36 @@ psutil_search_tcplist(char *buf, struct +--- psutil/arch/freebsd/proc_socks.c.orig 2017-08-03 16:14:27 UTC ++++ psutil/arch/freebsd/proc_socks.c +@@ -136,7 +136,11 @@ psutil_search_tcplist(char *buf, struct if (kif->kf_sock_domain == AF_INET) { if (!psutil_sockaddr_matches( AF_INET, inp->inp_lport, &inp->inp_laddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)) -+#else ++#if __FreeBSD_version >= 1200031 + &kif->kf_un.kf_sock.kf_sa_local)) ++#else + &kif->kf_sa_local)) +#endif continue; if (!psutil_sockaddr_matches( AF_INET, inp->inp_fport, &inp->inp_faddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)) -+#endif - continue; +@@ -145,7 +149,11 @@ psutil_search_tcplist(char *buf, struct } else { if (!psutil_sockaddr_matches( AF_INET6, inp->inp_lport, &inp->in6p_laddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)) -+#else ++#if __FreeBSD_version >= 1200031 + &kif->kf_un.kf_sock.kf_sa_local)) ++#else + &kif->kf_sa_local)) +#endif continue; if (!psutil_sockaddr_matches( AF_INET6, inp->inp_fport, &inp->in6p_faddr, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer)) -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)) -+#endif - continue; - } - -@@ -208,7 +237,11 @@ int psutil_gather_inet(int proto, PyObje - 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 +306,13 @@ int psutil_gather_inet(int proto, PyObje - 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 +321,11 @@ int psutil_gather_inet(int proto, PyObje - "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 +519,11 @@ psutil_proc_connections(PyObject *self, - 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; -@@ -547,19 +593,35 @@ psutil_proc_connections(PyObject *self, +@@ -243,7 +251,11 @@ psutil_proc_connections(PyObject *self, inet_ntop( kif->kf_sock_domain, psutil_sockaddr_addr(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local), -+#else ++#if __FreeBSD_version >= 1200031 + &kif->kf_un.kf_sock.kf_sa_local), ++#else + &kif->kf_sa_local), +#endif lip, sizeof(lip)); inet_ntop( - kif->kf_sock_domain, - psutil_sockaddr_addr(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_peer), -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer), -+#endif +@@ -253,7 +265,11 @@ psutil_proc_connections(PyObject *self, rip, sizeof(rip)); lport = htons(psutil_sockaddr_port(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 - &kif->kf_sa_local)); -+#else ++#if __FreeBSD_version >= 1200031 + &kif->kf_un.kf_sock.kf_sa_local)); ++#else + &kif->kf_sa_local)); +#endif rport = htons(psutil_sockaddr_port(kif->kf_sock_domain, -+#if __FreeBSD_version < 1200031 &kif->kf_sa_peer)); -+#else -+ &kif->kf_un.kf_sock.kf_sa_peer)); -+#endif - // construct python tuple/list - py_laddr = Py_BuildValue("(si)", lip, lport); -@@ -590,7 +652,11 @@ psutil_proc_connections(PyObject *self, +@@ -287,7 +303,11 @@ psutil_proc_connections(PyObject *self, else if (kif->kf_sock_domain == AF_UNIX) { struct sockaddr_un *sun; -+#if __FreeBSD_version < 1200031 - sun = (struct sockaddr_un *)&kif->kf_sa_local; -+#else ++#if __FreeBSD_version >= 1200031 + sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local; ++#else + sun = (struct sockaddr_un *)&kif->kf_sa_local; +#endif snprintf( path, sizeof(path), "%.*s",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709040000.v8400cke056008>