Attachment 312684 Details for Bug 456685 – fix route_in_same_subnet()

[patch] fix route_in_same_subnet()

NetworkManager-0.7.0-route-in-same-subnet.patch (text/plain), 1.09 KB, created by Fabrice Bellet on 2008-07-25 21:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabrice Bellet

Created: 2008-07-25 21:10:55 UTC

Size: 1.09 KB

patch

obsolete

>--- NetworkManager-0.7.0/src/NetworkManagerSystem.c.orig	2008-07-03 21:09:01.000000000 +0200
>+++ NetworkManager-0.7.0/src/NetworkManagerSystem.c	2008-07-25 21:56:55.000000000 +0200
>@@ -62,17 +62,21 @@
> #include <netlink/route/link.h>
> 
> static gboolean
>-route_in_same_subnet (NMIP4Config *config, guint32 prefix)
>+route_in_same_subnet (NMIP4Config *config, guint32 dest, guint32 prefix)
> {
> 	int num;
> 	int i;
>+	guint32 netmask;
> 
>+	netmask = nm_utils_ip4_prefix_to_netmask (prefix);
> 	num = nm_ip4_config_get_num_addresses (config);
> 	for (i = 0; i < num; i++) {
> 		const NMSettingIP4Address *addr;
> 
> 		addr = nm_ip4_config_get_address (config, i);
>-		if (prefix == addr->prefix)
>+		if (prefix == addr->prefix && \
>+			(addr->address & nm_utils_ip4_prefix_to_netmask (addr->prefix)) == \
>+			(dest & netmask))
> 			return TRUE;
> 	}
> 
>@@ -110,7 +114,7 @@
> 	struct nl_addr *gw_addr = NULL;
> 	int err, iface_idx;
> 
>-	if (iface_config && route_in_same_subnet (iface_config, ip4_prefix))
>+	if (iface_config && route_in_same_subnet (iface_config, ip4_dest, ip4_prefix))
> 		return;
> 
> 	nlh = nm_netlink_get_default_handle ();

Actions: View | Diff

Attachments on bug 456685: 312684 | 312716