- redirect localhost to internal interface when redirect requests occur. [1]

- some cosmetic fixes
- bump PORTREVISION

PR:		[1] 67780
Submitted by:	[1] Kensaku MASUDA <greg@greg.jp>
This commit is contained in:
Yen-Ming Lee 2004-06-11 04:35:35 +00:00
parent 660b7b5bc7
commit 0c1b0ad8a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=111246
3 changed files with 16 additions and 12 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= linuxigd
PORTVERSION= 0.92
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= linux-igd

View file

@ -4,12 +4,12 @@
CC=g++
-INCLUDES= -I/usr/include/upnp
-LIBS= -lpthread /usr/lib/libupnp.so
+INCLUDES= -I$(PREFIX)/include
+LIBS= $(PTHREAD_LIBS) $(PREFIX)/lib/libupnp.so
+INCLUDES= -I$(LOCALBASE)/include
+LIBS= $(PTHREAD_LIBS) $(LOCALBASE)/lib/libupnp.so
ifeq ($(DEBUG),1)
@@ -26,7 +26,7 @@
@@ -26,6 +26,6 @@
rm -f *.o $(APPS)
install: upnpd
@ -19,4 +19,3 @@
+ @install -d $(PREFIX)/etc/linuxigd
+ @$(BSD_INSTALL_DATA) etc/* $(PREFIX)/etc/linuxigd
+ @$(BSD_INSTALL_PROGRAM) upnpd $(PREFIX)/bin

View file

@ -1,5 +1,5 @@
--- pmlist.cpp.orig Fri Jan 3 03:14:24 2003
+++ pmlist.cpp Mon Jan 20 20:38:16 2003
--- pmlist.cpp.orig Fri Jan 3 04:14:24 2003
+++ pmlist.cpp Wed May 26 10:37:36 2004
@@ -31,6 +31,8 @@
#include <unistd.h>
#include <iostream>
@ -9,7 +9,7 @@
PortMapList::PortMapList()
{
@@ -182,8 +184,13 @@
@@ -182,8 +184,16 @@
{
char command[255];
@ -18,27 +18,32 @@
+ FILE *ipnat = popen("/sbin/ipnat -f -", "w");
+ if (ipnat == NULL)
+ return 0;
+ sprintf(command, "rdr %s %s/32 port %d -> %s port %d %s",
+ sprintf(command, "rdr %s %s/32 port %d -> %s port %d %s\n",
+ ExtIf, ExtIP, ExtPort, IntIP, IntPort, Proto);
+ fprintf(ipnat, command);
+ sprintf(command, "rdr lo0 %s/32 port %d -> %s port %d %s\n",
+ ExtIP, ExtPort, IntIP, IntPort, Proto);
+ fprintf(ipnat, command);
+ pclose(ipnat);
return (1);
}
@@ -218,9 +225,14 @@
@@ -218,8 +228,16 @@
{
char command[255];
+ FILE *ipnat = popen("/sbin/ipnat -rf -", "w");
+ if (ipnat == NULL)
+ return 0;
+ sprintf(command, "rdr %s %s/32 port %d -> %s port %d %s",
+ sprintf(command, "rdr %s %s/32 port %d -> %s port %d %s\n",
+ ExtIf, ExtIP, ExtPort, IntIP, IntPort, Proto);
+ fprintf(ipnat, command);
+ sprintf(command, "rdr lo0 %s/32 port %d -> %s port %d %s\n",
+ ExtIP, ExtPort, IntIP, IntPort, Proto);
+ fprintf(ipnat, command);
+ pclose(ipnat);
- sprintf(command, "/usr/sbin/iptables -t nat -D PREROUTING -p %s -d %s --dport %d -j DNAT --to %s:%d", Proto, ExtIP, ExtPort, IntIP, IntPort);
- system(command);
return (1);
}