Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/include config: Support including additional config files using new config file directive #623

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/include config: Support including additional config files using new config file directive #623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45710b1
Add ConfigLocations funtions to enable includable config
cpitchford-cloudcall Sep 11, 2022
3a7163d
Move to using ConfigLocations to enable support of include config dir…
cpitchford-cloudcall Sep 11, 2022
01400f9
Build the configlocations.c file
cpitchford-cloudcall Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Build the configlocations.c file 
Used in the options.c loop that reads from the config file
  • Loading branch information
@cpitchford-cloudcall
cpitchford-cloudcall committed Sep 11, 2022
commit 01400f9702fa0ee1945062d5d426943527d85fa4
2 changes: 1 addition & 1 deletion miniupnpd/Makefile.bsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ STDOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
pcplearndscp.o \
upnpevents.o upnputils.o getconnstatus.o \
upnpstun.o \
upnppinhole.o asyncsendto.o portinuse.o
upnppinhole.o asyncsendto.o portinuse.o configlocations.o
OS_OBJS = getifstats.o ifacewatcher.o getroute.o
PFOBJS = obsdrdr.o pfpinhole.o
IPFOBJS = ipfrdr.o
Expand Down
2 changes: 1 addition & 1 deletion miniupnpd/Makefile.macosx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ STD_OBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
options.o upnppermissions.o minissdp.o natpmp.o \
upnpevents.o getconnstatus.o upnputils.o \
upnpstun.o \
upnppinhole.o asyncsendto.o portinuse.o pcpserver.o
upnppinhole.o asyncsendto.o portinuse.o pcpserver.o configlocations.o
MAC_OBJS = mac/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
IPFW_OBJS = ipfw/ipfwrdr.o ipfw/ipfwaux.o
PF_OBJS = pf/obsdrdr.o
Expand Down
2 changes: 1 addition & 1 deletion miniupnpd/Makefile.sunos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ STDOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
options.o upnppermissions.o minissdp.o natpmp.o pcpserver.o \
upnpevents.o upnputils.o getconnstatus.o \
upnpstun.o \
upnppinhole.o asyncsendto.o portinuse.o
upnppinhole.o asyncsendto.o portinuse.o configlocations.o
BSDOBJS = bsd/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
SUNOSOBJS = solaris/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
MACOBJS = mac/getifstats.o bsd/ifacewatcher.o bsd/getroute.o
Expand Down
2 changes: 1 addition & 1 deletion miniupnpd/objects.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BASEOBJS = miniupnpd.o upnphttp.o upnpdescgen.o upnpsoap.o \
upnpredirect.o getifaddr.o daemonize.o \
options.o upnppermissions.o minissdp.o natpmp.o pcpserver.o \
upnpglobalvars.o upnpevents.o upnputils.o getconnstatus.o \
upnpstun.o upnppinhole.o pcplearndscp.o asyncsendto.o
upnpstun.o upnppinhole.o pcplearndscp.o asyncsendto.o configlocations.o

# sources in linux/ directory
LNXOBJS = getifstats.o ifacewatcher.o getroute.o