Merge lp:~asac/ntrack/lp686554 into lp:ntrack

[Alexander Sack]

waiting for feedback from lp:686554

[Alexander Sack (asac)]

merged

review: Approve

=== modified file 'common/ntrack-libnl.c'
--- common/ntrack-libnl.c	2010-12-19 02:10:10 +0000
+++ common/ntrack-libnl.c	2010-12-19 02:29:34 +0000
@@ -19,6 +19,9 @@
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with ntrack.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "config.h"
+
 #include "ntrackmonitor.h"
 #include "ntrack-arch.h"
 #include "ntracklist.h"
@@ -44,10 +47,49 @@
 #define ROUTE_ATTR_GATEWAY   0x000800
 #endif
 
+#ifdef HAVE_LIBNL1
+typedef struct nl_handle NTRACK_nl_handle;
+
+#define NL_CACHE_MNGR_ALLOC(handle,mngr_o) \
+	mngr_o = nl_cache_mngr_alloc (handle, \
+                                      NETLINK_ROUTE, \
+                                      NL_AUTO_PROVIDE)
+
+#define NL_CACHE_MNGR_ADD(mngr,name,cache_o) \
+	cache_o = nl_cache_mngr_add (mngr, \
+	                             name, \
+                                     0)
+#define NL_PRINT_ERROR(text,err) \
+	printf ("%s/%s\n", text, nl_geterror())
+
+#define RTNL_ROUTE_GET_PRIO rtnl_route_get_prio
+
+#else /* HAVE_LIBNL1 */
+#ifdef HAVE_LIBNL2
+typedef struct nl_sock NTRACK_nl_handle;
+
+#define NL_CACHE_MNGR_ALLOC(handle,mngr_o) \
+	nl_cache_mngr_alloc (handle, NETLINK_ROUTE, NL_AUTO_PROVIDE, &mngr_o)
+
+#define NL_CACHE_MNGR_ADD(mngr,name,cache_o) \
+	nl_cache_mngr_add (mngr, \
+	                   name, \
+	                   0, \
+	                   &cache_o)
+#define NL_PRINT_ERROR(text,err) \
+	printf ("%s/%s\n", text, nl_geterror(err))
+
+#define RTNL_ROUTE_GET_PRIO rtnl_route_get_priority
+
+#else
+#error no LIBNLx found
+#endif /* HAVE_LIBNL2 */
+#endif /* HAVE_LIBNL1 */
+
 struct _nl_info
 {
-	struct nl_handle *handle;
-	struct nl_handle *smart_update_handle;
+	NTRACK_nl_handle *handle;
+	NTRACK_nl_handle *smart_update_handle;
 
 	struct nl_cache_mngr *update_cache_mngr;
 	struct nl_cache_mngr *smart_update_cache_mngr;
@@ -102,9 +144,17 @@
 	arch->cb = callback;
 	arch->cb_user_data = user_data;
 
+#ifdef HAVE_LIBNL1
 	nl_info->handle = nl_handle_alloc();
 	nl_info->smart_update_handle = nl_handle_alloc();
-
+#else
+#ifdef HAVE_LIBNL2
+	nl_info->handle = nl_socket_alloc();
+	nl_info->smart_update_handle = nl_socket_alloc();
+#else
+#error "needs libnl-1 or -2.0"
+#endif
+#endif
 	if (!nl_info->handle)
 		error (1, 255, "OOM (nl_handle_alloc)");
 
@@ -185,40 +235,22 @@
 static void
 setup_main_handle (struct _nl_info *nl_info)
 {
-	nl_info->update_cache_mngr =
-	    nl_cache_mngr_alloc(nl_info->handle,
-	                        NETLINK_ROUTE,
-	                        NL_AUTO_PROVIDE);
+	NL_CACHE_MNGR_ALLOC (nl_info->handle, nl_info->update_cache_mngr);
 
 	if (!nl_info->addr_cache) {
-		nl_info->addr_cache = nl_cache_mngr_add (nl_info->update_cache_mngr,
-		                           "route/addr",
-		                           NULL /* change_func_t -
-		                                   we dont want those
-		                                   notifications */
-		                                        );
+		NL_CACHE_MNGR_ADD (nl_info->update_cache_mngr, "route/addr", nl_info->addr_cache);
 		if (!nl_info->addr_cache)
 			error (1, 366, "cache mngr add fail.");
 	}
 
 	if (!nl_info->link_cache) {
-		nl_info->link_cache = nl_cache_mngr_add (nl_info->update_cache_mngr,
-		                           "route/link",
-		                           NULL /* change_func_t -
-		                                   we dont want those
-		                                   notifications */
-		                                        );
+		NL_CACHE_MNGR_ADD (nl_info->update_cache_mngr, "route/link", nl_info->link_cache);
 		if (!nl_info->link_cache)
 			error (1, 367, "cache mngr add fail.");
 	}
 
 	if (!nl_info->route_cache) {
-		nl_info->route_cache = nl_cache_mngr_add (nl_info->update_cache_mngr,
-		                           "route/route",
-		                           NULL /* change_func_t -
-		                                   we dont want those
-		                                   notifications */
-		                                        );
+		NL_CACHE_MNGR_ADD (nl_info->update_cache_mngr, "route/route", nl_info->route_cache);
 		if (!nl_info->route_cache)
 			error (1, 368, "cache mngr add fail.");
 	}
@@ -228,10 +260,7 @@
 setup_smart_handle (struct _nl_info *nl_info)
 {
 	struct nl_cache *tmp_cache = 0;
-	nl_info->smart_update_cache_mngr =
-	    nl_cache_mngr_alloc(nl_info->smart_update_handle,
-	                        NETLINK_ROUTE,
-	                        NL_AUTO_PROVIDE);
+	NL_CACHE_MNGR_ALLOC (nl_info->smart_update_handle, nl_info->smart_update_cache_mngr);
 
 	if (!nl_info->smart_update_cache_mngr)
 		error (1, 265, "cache mngr alloc failed");
@@ -243,34 +272,20 @@
 	 * explicitly refill the primary caches and calculate
 	 * network status changes.
 	 */
-	tmp_cache = nl_cache_mngr_add (nl_info->smart_update_cache_mngr,
-	                           "route/addr",
-	                           NULL /* change_func_t -
-	                                   we dont want those
-	                                   notifications */
-	                                        );
+	
+	NL_CACHE_MNGR_ADD (nl_info->smart_update_cache_mngr, "route/addr", tmp_cache);
 
 	if (!tmp_cache)
 		error (1, 266, "cache mngr add fail.");
 
 	tmp_cache = 0;
-	tmp_cache = nl_cache_mngr_add (nl_info->smart_update_cache_mngr,
-	                           "route/link",
-	                           NULL /* change_func_t -
-	                                   we dont want those
-	                                   notifications */
-	                                        );
+	NL_CACHE_MNGR_ADD (nl_info->smart_update_cache_mngr, "route/link", tmp_cache);
 
 	if (!tmp_cache)
 		error (1, 267, "cache mngr add fail.");
 
 	tmp_cache = 0;
-	tmp_cache = nl_cache_mngr_add (nl_info->smart_update_cache_mngr,
-	                           "route/route",
-	                           NULL /* change_func_t -
-	                                   we dont want those
-	                                   notifications */
-	                                        );
+	NL_CACHE_MNGR_ADD (nl_info->smart_update_cache_mngr, "route/route", tmp_cache);
 
 	if (!tmp_cache)
 		error (1, 268, "cache mngr add fail.");
@@ -310,8 +325,8 @@
 	if (first_route == NULL || second_route == NULL)
 		return 0;
 
-	metric1 = rtnl_route_get_prio (first_route);
-	metric2 = rtnl_route_get_prio (second_route);
+	metric1 = RTNL_ROUTE_GET_PRIO (first_route);
+	metric2 = RTNL_ROUTE_GET_PRIO (second_route);
 
 	if (metric1 < metric2)
 		return -1;
@@ -400,10 +415,26 @@
 	iter = nl_cache_get_first (nl_info->route_cache);
 	while (iter) {
 		struct rtnl_link *iter_link;
+#ifdef HAVE_LIBNL2
+		struct rtnl_nexthop *nexth=0;
+		int nhops=0;
+#endif
 		if (!nl_object_match_filter (iter, OBJ_CAST(filter_route)))
 			goto next;
 
+#ifdef HAVE_LIBNL2
+		nhops = rtnl_route_get_nnexthops ((struct rtnl_route*) iter);
+		if (nhops > 0)
+			nexth = rtnl_route_nexthop_n ((struct rtnl_route*) iter, 0);
+			
+		iter_link = get_nl_link_by_index (self, link_list, rtnl_route_nh_get_ifindex (nexth));
+#else
+#ifdef HAVE_LIBNL1
 		iter_link = get_nl_link_by_index (self, link_list, rtnl_route_get_oif ((struct rtnl_route*) iter));
+#else
+#error "no libnl"
+#endif
+#endif
 
 		/* if we dont have a link for the current oif,
 		 * this is not a valid topmost_route */

=== modified file 'configure.ac'
--- configure.ac	2010-10-10 20:48:09 +0000
+++ configure.ac	2010-12-19 02:29:34 +0000
@@ -111,13 +111,25 @@
 
 AM_CONDITIONAL(HAVE_QT4, test $ac_have_qt4 = 1)
 
-PKG_CHECK_MODULES(LIBNL, libnl-1, ac_have_libnl=1,ac_have_libnl=0)
+PKG_CHECK_MODULES(LIBNL, libnl-2.0, ac_have_libnl=1,ac_have_libnl=0)
 AC_SUBST(LIBNL_CFLAGS)
 AC_SUBST(LIBNL_LIBS)
 AM_CONDITIONAL(HAVE_LIBNL, test $ac_have_libnl = 1)
 
+if test $ac_have_libnl = 1; then
+  AC_DEFINE([HAVE_LIBNL2], [], [HAVE_LIBNL1])
+else
+  PKG_CHECK_MODULES(LIBNL, libnl-1, ac_have_libnl=1,ac_have_libnl=0)
+  AC_SUBST(LIBNL_CFLAGS)
+  AC_SUBST(LIBNL_LIBS)
+  AM_CONDITIONAL(HAVE_LIBNL, test $ac_have_libnl = 1)
+  if test $ac_have_libnl = 1; then
+    AC_DEFINE([HAVE_LIBNL1], [], [HAVE_LIBNL1])
+  fi
+fi
+
 # consistency checks
-if ! test "$ac_have_libnl" = "1"; then
+if ! test "$ac_have_libnl" = "1" -o "$ac_have_libnl2" = 1; then
 	AC_ERROR([libnl is required])
 fi