Attachment 191444 Details for Bug 226513 – revised patch against head

[patch] revised patch against head

igmp2.diff (text/plain), 5.85 KB, created by Franco Fichtner on 2018-03-12 06:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2018-03-12 06:40:00 UTC

Size: 5.85 KB

patch

obsolete

>--- files/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch	2018-03-11 10:28:34.000000000 +0100
>+++ /dev/null	2018-03-12 07:28:00.000000000 +0100
>@@ -1,84 +0,0 @@
>-This reverts commit c371602f5f499a29d1fb1c43a8d12f21ff56296b.
>----
>- src/ifvc.c | 23 ++++++++++-------------
>- 1 file changed, 10 insertions(+), 13 deletions(-)
>-
>-diff --git a/src/ifvc.c b/src/ifvc.c
>-index 3a7476d..2d487ed 100644
>---- a/src/ifvc.c
>-+++ b/src/ifvc.c
>-@@ -34,13 +34,6 @@
>- 
>- #include "igmpproxy.h"
>- 
>--/* We need a temporary copy to not break strict aliasing rules */
>--static inline uint32_t s_addr_from_sockaddr(const struct sockaddr *addr) {
>--    struct sockaddr_in addr_in;
>--    memcpy(&addr_in, addr, sizeof(addr_in));
>--    return addr_in.sin_addr.s_addr;
>--}
>--
>- struct IfDesc IfDescVc[ MAX_IF ], *IfDescEp = IfDescVc;
>- 
>- /* aimwang: add for detect interface and rebuild IfVc record */
>-@@ -112,15 +105,17 @@ void rebuildIfVc () {
>-         }
>- 
>-         // Get the interface adress...
>--        Dp->InAdr.s_addr = s_addr_from_sockaddr(&IfPt->ifr_addr);
>-+        Dp->InAdr = ((struct sockaddr_in *)&IfPt->ifr_addr)->sin_addr;
>-         addr = Dp->InAdr.s_addr;
>- 
>-         memcpy( IfReq.ifr_name, Dp->Name, sizeof( IfReq.ifr_name ) );
>-+        IfReq.ifr_addr.sa_family = AF_INET;
>-+        ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr = addr;
>- 
>-         // Get the subnet mask...
>-         if (ioctl(Sock, SIOCGIFNETMASK, &IfReq ) < 0)
>-             my_log(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", IfReq.ifr_name);
>--        mask = s_addr_from_sockaddr(&IfReq.ifr_netmask);
>-+        mask = ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr;
>-         subnet = addr & mask;
>- 
>-         if ( ioctl( Sock, SIOCGIFFLAGS, &IfReq ) < 0 )
>-@@ -131,7 +126,7 @@ void rebuildIfVc () {
>-         {
>-             if ( ioctl( Sock, SIOCGIFDSTADDR, &IfReq ) < 0 )
>-                 my_log(LOG_ERR, errno, "ioctl SIOCGIFDSTADDR for %s", IfReq.ifr_name);
>--            addr = s_addr_from_sockaddr(&IfReq.ifr_dstaddr);
>-+            addr = ((struct sockaddr_in *)&IfReq.ifr_dstaddr)->sin_addr.s_addr;
>-             subnet = addr & mask;
>-         }
>- 
>-@@ -263,15 +258,17 @@ void buildIfVc(void) {
>-             }
>- 
>-             // Get the interface adress...
>--            IfDescEp->InAdr.s_addr = s_addr_from_sockaddr(&IfPt->ifr_addr);
>-+            IfDescEp->InAdr = ((struct sockaddr_in *)&IfPt->ifr_addr)->sin_addr;
>-             addr = IfDescEp->InAdr.s_addr;
>- 
>-             memcpy( IfReq.ifr_name, IfDescEp->Name, sizeof( IfReq.ifr_name ) );
>-+            IfReq.ifr_addr.sa_family = AF_INET;
>-+            ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr = addr;
>- 
>-             // Get the subnet mask...
>-             if (ioctl(Sock, SIOCGIFNETMASK, &IfReq ) < 0)
>-                 my_log(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", IfReq.ifr_name);
>--            mask = s_addr_from_sockaddr(&IfReq.ifr_netmask);
>-+            mask = ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr;
>-             subnet = addr & mask;
>- 
>-             /* get if flags
>-@@ -293,7 +290,7 @@ void buildIfVc(void) {
>-             {
>-                 if ( ioctl( Sock, SIOCGIFDSTADDR, &IfReq ) < 0 )
>-                     my_log(LOG_ERR, errno, "ioctl SIOCGIFDSTADDR for %s", IfReq.ifr_name);
>--                addr = s_addr_from_sockaddr(&IfReq.ifr_dstaddr);
>-+                addr = ((struct sockaddr_in *)&IfReq.ifr_dstaddr)->sin_addr.s_addr;
>-                 subnet = addr & mask;
>-             }
>- 
>--- 
>-2.15.1
>-
>--- files/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch	2018-03-11 10:28:34.000000000 +0100
>+++ /dev/null	2018-03-12 07:28:48.000000000 +0100
>@@ -1,32 +0,0 @@
>-This reverts commit 7fcb7900b757b64cf58e6b2d1d473de289945e8d.
>----
>- src/igmpproxy.h | 6 +++---
>- 1 file changed, 3 insertions(+), 3 deletions(-)
>-
>-diff --git a/src/igmpproxy.h b/src/igmpproxy.h
>-index ad1063b..6980e35 100644
>---- a/src/igmpproxy.h
>-+++ b/src/igmpproxy.h
>-@@ -35,9 +35,6 @@
>- *   igmpproxy.h - Header file for common includes.
>- */
>- 
>--#include "config.h"
>--#include "os.h"
>--
>- #include <errno.h>
>- #include <stdarg.h>
>- #include <stdio.h>
>-@@ -60,6 +57,9 @@
>- #include <netinet/in.h>
>- #include <arpa/inet.h>
>- 
>-+#include "os.h"
>-+#include "config.h"
>-+
>- /*
>-  * Limit on length of route data
>-  */
>--- 
>-2.15.1
>-
>--- /dev/null	2018-03-12 07:28:48.000000000 +0100
>+++ files/patch-src_igmpproxy.h	2018-03-12 07:29:42.000000000 +0100
>@@ -0,0 +1,22 @@
>+--- src/igmpproxy.h.orig	2018-02-13 19:17:30 UTC
>++++ src/igmpproxy.h
>+@@ -35,9 +35,6 @@
>+ *   igmpproxy.h - Header file for common includes.
>+ */
>+ 
>+-#include "config.h"
>+-#include "os.h"
>+-
>+ #include <errno.h>
>+ #include <stdarg.h>
>+ #include <stdio.h>
>+@@ -60,6 +57,9 @@
>+ #include <netinet/in.h>
>+ #include <arpa/inet.h>
>+ 
>++#include "os.h"
>++#include "config.h"
>++
>+ /*
>+  * Limit on length of route data
>+  */
>--- Makefile.orig	2018-03-12 07:30:56.000000000 +0100
>+++ Makefile	2018-03-12 07:31:29.000000000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	igmpproxy
>-PORTVERSION=	0.2
>+PORTVERSION=	0.2.1
> PORTEPOCH=	1
> CATEGORIES=	net
> 
>@@ -19,9 +19,6 @@
> USES=		autoreconf
> GNU_CONFIGURE=	yes
> 
>-EXTRA_PATCHES+=	${FILESDIR}/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch:-p1
>-EXTRA_PATCHES+= ${FILESDIR}/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch:-p1
>-
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/igmpproxy.conf \
> 	    ${STAGEDIR}${PREFIX}/etc/igmpproxy.conf.sample
>--- distinfo.orig	2018-03-11 10:28:34.000000000 +0100
>+++ distinfo	2018-03-12 07:39:04.000000000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1513975936
>-SHA256 (pali-igmpproxy-0.2_GH0.tar.gz) = 48fdaaa698c2ebe1c674b9ba4f9cb1369453bc97295434b608c9d5dab18c9293
>-SIZE (pali-igmpproxy-0.2_GH0.tar.gz) = 41732
>+TIMESTAMP = 1520662869
>+SHA256 (pali-igmpproxy-0.2.1_GH0.tar.gz) = 6faa1f42ba323f60a9eb4958550e25b2e7e9c645da32c52ba12db0c9bdfce1ba
>+SIZE (pali-igmpproxy-0.2.1_GH0.tar.gz) = 42201

Flags:

franco: maintainer-approval+

Actions: View | Diff

Attachments on bug 226513: 191392 | 191443 | 191444