Skip to content

Initial attempt to bring networking to macOS #850

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

Open
baka0taku2022 wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Initial attempt to bring networking to macOS #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f9137d
Initial grafting of utun code
baka0taku2022 Jun 1, 2026
8fae9c2
Fixed autotool errors.
baka0taku2022 Jun 3, 2026
7b8b460
Added comments to utun.c
baka0taku2022 Jun 4, 2026
6dfed52
Merge branch 'develop' into develop
baka0taku2022 Jun 5, 2026
c7c0c78
Fix bug in configur.ac
baka0taku2022 Jun 5, 2026
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
39 changes: 35 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ else
HERCIFC =
endif

if BUILD_HERCUTUN
HERCUTUN = hercutun
else
HERCUTUN =
endif

HERCLIN = herclin

fthreads_SRC = fthreads.c
Expand Down Expand Up @@ -133,6 +139,7 @@ dyndev_SRC = \
tapeccws.c \
tapedev.c \
tuntap.c \
utun.c \
him.c \
dummydev.c \
zfcp.c
Expand Down Expand Up @@ -258,9 +265,10 @@ bin_PROGRAMS = \
card2txt \
vmfplc2 \
$(HERCIFC) \
$(HERCUTUN) \
$(HERCLIN)

EXTRA_PROGRAMS = hercifc
EXTRA_PROGRAMS = hercifc hercutun

#----------------------------------------------------------------------------
# For each module:
Expand Down Expand Up @@ -303,7 +311,7 @@ hdt3705_la_SOURCES = comm3705.c
hdt3705_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdt3705_la_LIBADD = $(DYNMOD_LD_ADD)

hdt3088_la_SOURCES = ctc_lcs.c ctc_ctci.c ctcadpt.c tuntap.c netsupp.c
hdt3088_la_SOURCES = ctc_lcs.c ctc_ctci.c ctcadpt.c utun.c tuntap.c netsupp.c
hdt3088_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdt3088_la_LIBADD = $(DYNMOD_LD_ADD)

Expand All @@ -323,7 +331,7 @@ hdt3525_la_SOURCES = cardpch.c sockdev.c
hdt3525_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdt3525_la_LIBADD = $(DYNMOD_LD_ADD)

hdtqeth_la_SOURCES = qeth.c mpc.c resolve.c tuntap.c
hdtqeth_la_SOURCES = qeth.c mpc.c resolve.c utun.c tuntap.c
hdtqeth_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdtqeth_la_LIBADD = $(DYNMOD_LD_ADD)

Expand All @@ -335,7 +343,7 @@ hdt1052c_la_SOURCES = con1052c.c
hdt1052c_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdt1052c_la_LIBADD = $(DYNMOD_LD_ADD)

hdtptp_la_SOURCES = ctc_ptp.c mpc.c resolve.c tuntap.c netsupp.c
hdtptp_la_SOURCES = ctc_ptp.c mpc.c resolve.c utun.c tuntap.c netsupp.c
hdtptp_la_LDFLAGS = $(DYNMOD_LD_FLAGS)
hdtptp_la_LIBADD = $(DYNMOD_LD_ADD)

Expand Down Expand Up @@ -758,6 +766,15 @@ card2txt_SOURCES = card2txt.c
card2txt_LDADD = $(tools_ADDLIBS)
card2txt_LDFLAGS = $(tools_LD_FLAGS)

#------------------------------------------------------------------------------
# macOS hercutun side binary
#------------------------------------------------------------------------------
if BUILD_HERCUTUN
hercutun_SOURCES = hercutun.c
hercutun_LDADD = $(tools_ADDLIBS)
hercutun_LDFLAGS = $(tools_LD_FLAGS)
endif

#------------------------------------------------------------------------------
# Files that are not 'built' per-se
# Also contains some WIN32 only source files
Expand Down Expand Up @@ -1067,6 +1084,7 @@ noinst_HEADERS = \
herc_getopt.h \
hercifc.h \
hercules.h \
hercutun.h \
hercwind.h \
herror.h \
hetlib.h \
Expand Down Expand Up @@ -1125,6 +1143,7 @@ noinst_HEADERS = \
tt32api.h \
tt32if.h \
tuntap.h \
utun.h \
version.h \
vmd250.h \
vstore.h \
Expand Down Expand Up @@ -1215,6 +1234,12 @@ endif
chmod +s $(DESTDIR)$(bindir)/hercifc
rm hercifc
endif
if SETUID_HERCUTUN
chown root $(DESTDIR)$(bindir)/hercutun
chmod 0750 $(DESTDIR)$(bindir)/hercutun
chmod +s $(DESTDIR)$(bindir)/hercutun
rm hercutun
endif
if OPTION_CAPABILITIES
(cd $(DESTDIR)$(bindir); setcap 'cap_sys_nice=eip' ./hercules$(EXEEXT))
(cd $(DESTDIR)$(bindir); setcap 'cap_sys_nice=eip' ./herclin$(EXEEXT))
Expand Down Expand Up @@ -1301,6 +1326,11 @@ if BUILD_HERCIFC
else
@echo ' BUILD_HERCIFC Undefined'
endif
if BUILD_HERCUTUN
@echo ' BUILD_HERCUTUN Defined'
else
@echo ' BUILD_HERCUTUN Undefined'
endif
if BUILD_FTHREADS
@echo ' BUILD_FTHREADS Defined'
else
Expand Down Expand Up @@ -1340,6 +1370,7 @@ endif
@echo ' $$HDEPS $(HDEPS)'
@echo ' $$HDLFLAGS $(HDLFLAGS)'
@echo ' $$HERCIFC $(HERCIFC)'
@echo ' $$HERCUTUN $(HERCUTUN)'
@echo ' $$HERCLIBS $(HERCLIBS)'
@echo ' $$HERCLIBS2 $(HERCLIBS2)'
@echo ' $$HERCLIN $(HERCLIN)'
Expand Down
Loading