From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 2 Jul 2017 18:52:18 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~129
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=867ad628dc6fcd05bd584b605d7093cfc00c3d07;hp=a93cc6815226436b310ac8bf50c41d6c69ac5999

Merge branch 'collectd-5.7'
---

diff --git a/src/tcpconns.c b/src/tcpconns.c
index 419d8c19..f12ce5c6 100644
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -774,9 +774,15 @@ static int conn_read(void) {
   for (in_ptr = (struct xinpgen *)(((char *)in_orig) + in_orig->xig_len);
        in_ptr->xig_len > sizeof(struct xinpgen);
        in_ptr = (struct xinpgen *)(((char *)in_ptr) + in_ptr->xig_len)) {
+#if __FreeBSD_version >= 1200026
+    struct xtcpcb *tp = (struct xtcpcb *)in_ptr;
+    struct xinpcb *inp = &tp->xt_inp;
+    struct xsocket *so = &inp->xi_socket;
+#else
     struct tcpcb *tp = &((struct xtcpcb *)in_ptr)->xt_tp;
     struct inpcb *inp = &((struct xtcpcb *)in_ptr)->xt_inp;
     struct xsocket *so = &((struct xtcpcb *)in_ptr)->xt_socket;
+#endif
 
     /* Ignore non-TCP sockets */
     if (so->xso_protocol != IPPROTO_TCP)