From abefb6c6d0fd5693aa77fdb4bc04045da96d48c4 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Thu, 21 May 2020 02:21:49 +0200 Subject: [PATCH] miniupnpd/pf: fix test --- miniupnpd/pf/Makefile | 8 +++++--- miniupnpd/pf/testpfpinhole.c | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/miniupnpd/pf/Makefile b/miniupnpd/pf/Makefile index f94c074..ac15798 100644 --- a/miniupnpd/pf/Makefile +++ b/miniupnpd/pf/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.4 2012/04/18 20:45:33 nanard Exp $ +# $Id: Makefile,v 1.7 2020/05/21 00:10:56 nanard Exp $ # made for GNU Make (and BSD make) CFLAGS = -Wall -g -DTEST CFLAGS += -Wextra +CFLAGS += -I.. EXECUTABLES = testobsdrdr testpfpinhole all: $(EXECUTABLES) @@ -9,10 +10,10 @@ all: $(EXECUTABLES) clean: rm -f *.o $(EXECUTABLES) -testobsdrdr: testobsdrdr.o obsdrdr.o +testobsdrdr: testobsdrdr.o obsdrdr.o getifaddr.o $(CC) $(CFLAGS) -o $@ $> -testpfpinhole: testpfpinhole.o obsdrdr.o pfpinhole.o +testpfpinhole: testpfpinhole.o obsdrdr.o pfpinhole.o getifaddr.o $(CC) $(CFLAGS) -o $@ $> obsdrdr.o: obsdrdr.c obsdrdr.h @@ -23,3 +24,4 @@ testobsdrdr.o: testobsdrdr.c obsdrdr.h testpfpinhole.o: testpfpinhole.c pfpinhole.h +getifaddr.o: ../getifaddr.c diff --git a/miniupnpd/pf/testpfpinhole.c b/miniupnpd/pf/testpfpinhole.c index de3d4e0..5d4e201 100644 --- a/miniupnpd/pf/testpfpinhole.c +++ b/miniupnpd/pf/testpfpinhole.c @@ -1,8 +1,8 @@ -/* $Id: testpfpinhole.c,v 1.12 2014/05/15 21:23:43 nanard Exp $ */ +/* $Id: testpfpinhole.c,v 1.15 2020/05/21 00:11:41 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * MiniUPnP project - * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ - * (c) 2012-2017 Thomas Bernard + * http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ + * (c) 2012-2020 Thomas Bernard * This software is subject to the conditions detailed * in the LICENCE file provided within the distribution */ @@ -22,6 +22,8 @@ const char * tag = NULL; const char * anchor_name = "miniupnpd"; const char * queue = NULL; +const char * use_ext_ip_addr = "42.42.42.42"; + #ifdef ENABLE_IPV6 static int print_pinhole(int uid) {