Date: Fri, 15 Oct 2004 01:30:32 +0400 (MSD) From: Dmitry Morozovsky <marck@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72710: [patch] www/oops for multiple redir modules Message-ID: <200410142130.i9ELUW7S050987@woozle.rinet.ru> Resent-Message-ID: <200410142140.i9ELeUgL072103@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72710
>Category: ports
>Synopsis: [patch] www/oops for multiple redir modules
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 14 21:40:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Morozovsky
>Release: FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE
>Description:
Some unexpected (by the author) behaviour had been found by testing oops in our
corporate environment. After brief discussion and further testing with the
author, the following patch were created (and committed to the author's CVS
tree):
>How-To-Repeat:
Install www/oops port
Configure more than one redir modules via more than one ``ipfw fwd'' rules
Watch every but the first redir modules are ignored.
>Fix:
Index: www/oops/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/oops/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- www/oops/Makefile 12 Oct 2004 15:03:52 -0000 1.32
+++ www/oops/Makefile 14 Oct 2004 21:25:31 -0000
@@ -7,7 +7,7 @@
PORTNAME= oops
PORTVERSION= ${OOPSVERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://oops-cache.org/
DISTNAME= ${PORTNAME}-${OOPSVERSION}
--- /dev/null Fri Oct 15 01:25:56 2004
+++ www/oops/files/patch-src_modules_redir.c Sun Oct 3 19:26:59 2004
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- src/modules/redir.c.orig Thu Oct 16 18:21:59 2003
++++ src/modules/redir.c Sun Oct 3 17:23:08 2004
+@@ -349,11 +349,9 @@
+
+ /* if this is not on my port */
+ while( n ) {
+- if ( mp->port == port
+- && ( (mp->in_addr.s_addr == INADDR_ANY)
+- ||(mp->in_addr.s_addr == rq->my_sa.sin_addr.s_addr) ) )
+- break;
++ if ( mp->so == rq->accepted_so )
++ break;
+ n--;mp++;
+ }
+ if ( !n ) return(MOD_CODE_OK); /* not my */
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410142130.i9ELUW7S050987>