X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fiptables.c;h=a81dfd7e709dc9f8c707a01514ff8d3f5e35b8a4;hb=b3315d59fb67edf77cfd90519c750ae1ce7e4146;hp=9abee364b1fc36b0e3906927d647ac8165cd738d;hpb=e8999694aac7184ac4eea29564a2892f188c4171;p=collectd.git

diff --git a/src/iptables.c b/src/iptables.c
index 9abee364..a81dfd7e 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/iptables.c
  * Copyright (C) 2007 Sjoerd van der Berg
+ * Copyright (C) 2007 Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -18,6 +19,7 @@
  *
  * Authors:
  *  Sjoerd van der Berg <harekiet at users.sourceforge.net>
+ *  Florian Forster <octo at verplant.org>
  **/
 
 #include "collectd.h"
@@ -26,12 +28,28 @@
 #include "configfile.h"
 
 #if OWN_LIBIPTC
-# include "libiptc/libiptc.h"
+# include "owniptc/libiptc.h"
 #else
 # include <libiptc/libiptc.h>
 #endif
 
 /*
+ * iptc_handle_t was available before libiptc was officially available as a
+ * shared library. Note, that when the shared lib was introduced, the API and
+ * ABI have changed slightly:
+ * 'iptc_handle_t' used to be 'struct iptc_handle *' and most functions used
+ * 'iptc_handle_t *' as an argument. Now, most functions use 'struct
+ * iptc_handle *' (thus removing one level of pointer indirection).
+ *
+ * HAVE_IPTC_HANDLE_T is used to determine which API ought to be used. While
+ * this is somewhat hacky, I didn't find better way to solve that :-/
+ * -tokkee
+ */
+#ifndef HAVE_IPTC_HANDLE_T
+typedef struct iptc_handle iptc_handle_t;
+#endif
+
+/*
  * (Module-)Global variables
  */
 
@@ -289,7 +307,12 @@ static int iptables_read (void)
     /* Init the iptc handle structure and query the correct table */    
     for (i = 0; i < chain_num; i++)
     {
-	iptc_handle_t handle;
+#ifdef HAVE_IPTC_HANDLE_T
+	iptc_handle_t _handle;
+	iptc_handle_t *handle = &_handle;
+#else
+	iptc_handle_t *handle;
+#endif
 	ip_chain_t *chain;
 	
 	chain = chain_list[i];
@@ -299,7 +322,11 @@ static int iptables_read (void)
 	    continue;
 	}
 
+#ifdef HAVE_IPTC_HANDLE_T
+	*handle = iptc_init (chain->table);
+#else
 	handle = iptc_init (chain->table);
+#endif
 	if (!handle)
 	{
 	    ERROR ("iptables plugin: iptc_init (%s) failed: %s",
@@ -308,8 +335,8 @@ static int iptables_read (void)
 	    continue;
 	}
 
-	submit_chain (&handle, chain);
-	iptc_free (&handle);
+	submit_chain (handle, chain);
+	iptc_free (handle);
     } /* for (i = 0 .. chain_num) */
 
     return ((num_failures < chain_num) ? 0 : -1);