Attachment 943140 Details for Bug 1147240 – possible patch

[patch] possible patch

0001-dhcrelay-fix-setting-of-UPSTREAM-DOWNSTREAM-flags-of.patch (text/plain), 2.21 KB, created by Jiri Popelka on 2014-10-01 16:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2014-10-01 16:18:54 UTC

Size: 2.21 KB

patch

obsolete

>From 623ee783f794808ddb2647fbcaf6140875226a84 Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Wed, 1 Oct 2014 18:04:57 +0200
>Subject: [PATCH] dhcrelay: fix setting of UPSTREAM/DOWNSTREAM flags of
> interfaces.
>
>When an interface is specified as both lower & upper, it get's
>only one of the INTERFACE_DOWNSTREAM, INTERFACE_UPSTREAM flags,
>depending on the order of '-l', '-u', while it should get both.
>
>Also pair unused HOP_COUNT_LIMIT constant with magic number 32.
>Also add an info output into parse_upstream(), same as in parse_downstream().
>---
> common/socket.c  | 2 +-
> relay/dhcrelay.c | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/common/socket.c b/common/socket.c
>index b8b44a6..5e3d51f 100644
>--- a/common/socket.c
>+++ b/common/socket.c
>@@ -302,7 +302,7 @@ if_register_socket(struct interface_info *info, int family,
> 
> 	if ((family == AF_INET6) &&
> 	    ((info->flags & INTERFACE_UPSTREAM) != 0)) {
>-		int hop_limit = 32;
>+		int hop_limit = HOP_COUNT_LIMIT;
> 		if (setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
> 			       &hop_limit, sizeof(int)) < 0) {
> 			log_fatal("setsockopt: IPV6_MULTICAST_HOPS: %m");
>diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
>index 80ebc39..b76bab7 100644
>--- a/relay/dhcrelay.c
>+++ b/relay/dhcrelay.c
>@@ -1211,8 +1211,8 @@ parse_downstream(char *arg) {
> 			interface_dereference(&interfaces, MDL);
> 		}
> 		interface_reference(&interfaces, ifp, MDL);
>-		ifp->flags |= INTERFACE_REQUESTED | INTERFACE_DOWNSTREAM;
> 	}
>+	ifp->flags |= INTERFACE_REQUESTED | INTERFACE_DOWNSTREAM;
> 
> 	/* New downstream. */
> 	dp = (struct stream_list *) dmalloc(sizeof(*dp), MDL);
>@@ -1263,6 +1263,8 @@ parse_upstream(char *arg) {
> 	}
> 	for (dp = downstreams; dp; dp = dp->next) {
> 		if (strcmp(ifname, dp->ifp->name) == 0) {
>+			log_info("Interface '%s' is both down and up.",
>+				 ifname);
> 			ifp = dp->ifp;
> 			break;
> 		}
>@@ -1280,8 +1282,8 @@ parse_upstream(char *arg) {
> 			interface_dereference(&interfaces, MDL);
> 		}
> 		interface_reference(&interfaces, ifp, MDL);
>-		ifp->flags |= INTERFACE_REQUESTED | INTERFACE_UPSTREAM;
> 	}
>+	ifp->flags |= INTERFACE_REQUESTED | INTERFACE_UPSTREAM;
> 
> 	/* New upstream. */
> 	up = (struct stream_list *) dmalloc(sizeof(*up), MDL);
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1147240: 943140 | 945419