ziggi/stvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working commit

Browse Source
This commit is contained in:
Олег Бородин
2026-04-29 14:14:44 +02:00
parent 6ae4f017f9
commit 47542499fc
3 changed files with 87 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+41 -25
View File
@@ -88,7 +88,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
sbin_PROGRAMS = helmetd$(EXEEXT) sbin_PROGRAMS = helmetd$(EXEEXT) helmetcli$(EXEEXT)
noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \ noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
service_test$(EXEEXT) tunclient_test$(EXEEXT) \ service_test$(EXEEXT) tunclient_test$(EXEEXT) \
rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT) rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT)
@@ -107,11 +107,15 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) interface.$(OBJEXT) \ helmetcli_SOURCES = helmetcli.c
iprouter.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) \ helmetcli_OBJECTS = helmetcli.$(OBJEXT)
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) service.$(OBJEXT) \ helmetcli_LDADD = $(LDADD)
tcpclient.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT) \ am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \
control.pb.$(OBJEXT) logger.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \
rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \
tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \
logger.$(OBJEXT)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
helmetd_OBJECTS = $(am_helmetd_OBJECTS) helmetd_OBJECTS = $(am_helmetd_OBJECTS)
helmetd_LDADD = $(LDADD) helmetd_LDADD = $(LDADD)
am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \ am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
@@ -158,6 +162,18 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I. DEFAULT_INCLUDES = -I.
depcomp = depcomp =
am__maybe_remake_depfiles = am__maybe_remake_depfiles =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_$(V))
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_$(V))
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_$(V)) AM_V_CXX = $(am__v_CXX_$(V))
@@ -171,26 +187,14 @@ AM_V_CXXLD = $(am__v_CXXLD_$(V))
am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 = am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_$(V))
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_$(V))
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES)
DIST_SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \ $(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES) $(udpclient_test_SOURCES)
DIST_SOURCES = helmetcli.c $(helmetd_SOURCES) \
$(rpcclient_test_SOURCES) $(service_test_SOURCES) \
$(tcpclient_test_SOURCES) $(testconnect_test_SOURCES) \
$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
@@ -336,7 +340,9 @@ top_build_prefix =
top_builddir = . top_builddir = .
top_srcdir = . top_srcdir = .
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
helmetd_SOURCES = helmetd.cpp \ helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES)
helmet_SOURCES = \
interface.cpp interface.hpp \ interface.cpp interface.hpp \
iprouter.cpp iprouter.hpp \ iprouter.cpp iprouter.hpp \
netclient.cpp netclient.hpp \ netclient.cpp netclient.hpp \
@@ -397,7 +403,7 @@ all: defines.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .cpp .o .obj .SUFFIXES: .c .cc .cpp .o .obj
am--refresh: Makefile am--refresh: Makefile
@: @:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -492,6 +498,10 @@ uninstall-sbinPROGRAMS:
clean-sbinPROGRAMS: clean-sbinPROGRAMS:
-$(am__rm_f) $(sbin_PROGRAMS) -$(am__rm_f) $(sbin_PROGRAMS)
helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES)
@rm -f helmetcli$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES)
@rm -f helmetd$(EXEEXT) @rm -f helmetd$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
@@ -526,6 +536,12 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
.c.o:
$(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.o: .cc.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $< $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
Makefile.am
+5 -2
View File
@@ -5,9 +5,12 @@ CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
LDFLAGS = -pthread LDFLAGS = -pthread
LIBS = -Wl,--as-need -lprotobuf LIBS = -Wl,--as-need -lprotobuf
sbin_PROGRAMS = helmetd sbin_PROGRAMS = helmetd helmetcli
helmetd_SOURCES = helmetd.cpp \ helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES)
helmet_SOURCES = \
interface.cpp interface.hpp \ interface.cpp interface.hpp \
iprouter.cpp iprouter.hpp \ iprouter.cpp iprouter.hpp \
netclient.cpp netclient.hpp \ netclient.cpp netclient.hpp \
Makefile.in
+41 -25
View File
@@ -88,7 +88,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
sbin_PROGRAMS = helmetd$(EXEEXT) sbin_PROGRAMS = helmetd$(EXEEXT) helmetcli$(EXEEXT)
noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \ noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
service_test$(EXEEXT) tunclient_test$(EXEEXT) \ service_test$(EXEEXT) tunclient_test$(EXEEXT) \
rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT) rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT)
@@ -107,11 +107,15 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) interface.$(OBJEXT) \ helmetcli_SOURCES = helmetcli.c
iprouter.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) \ helmetcli_OBJECTS = helmetcli.$(OBJEXT)
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) service.$(OBJEXT) \ helmetcli_LDADD = $(LDADD)
tcpclient.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT) \ am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \
control.pb.$(OBJEXT) logger.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \
rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \
tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \
logger.$(OBJEXT)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
helmetd_OBJECTS = $(am_helmetd_OBJECTS) helmetd_OBJECTS = $(am_helmetd_OBJECTS)
helmetd_LDADD = $(LDADD) helmetd_LDADD = $(LDADD)
am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \ am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
@@ -158,6 +162,18 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = depcomp =
am__maybe_remake_depfiles = am__maybe_remake_depfiles =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_@AM_V@) AM_V_CXX = $(am__v_CXX_@AM_V@)
@@ -171,26 +187,14 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 = am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES)
DIST_SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \ $(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \ $(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES) $(udpclient_test_SOURCES)
DIST_SOURCES = helmetcli.c $(helmetd_SOURCES) \
$(rpcclient_test_SOURCES) $(service_test_SOURCES) \
$(tcpclient_test_SOURCES) $(testconnect_test_SOURCES) \
$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
@@ -336,7 +340,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
helmetd_SOURCES = helmetd.cpp \ helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES)
helmet_SOURCES = \
interface.cpp interface.hpp \ interface.cpp interface.hpp \
iprouter.cpp iprouter.hpp \ iprouter.cpp iprouter.hpp \
netclient.cpp netclient.hpp \ netclient.cpp netclient.hpp \
@@ -397,7 +403,7 @@ all: defines.h
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .cc .cpp .o .obj .SUFFIXES: .c .cc .cpp .o .obj
am--refresh: Makefile am--refresh: Makefile
@: @:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -492,6 +498,10 @@ uninstall-sbinPROGRAMS:
clean-sbinPROGRAMS: clean-sbinPROGRAMS:
-$(am__rm_f) $(sbin_PROGRAMS) -$(am__rm_f) $(sbin_PROGRAMS)
helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES)
@rm -f helmetcli$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES)
@rm -f helmetd$(EXEEXT) @rm -f helmetd$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
@@ -526,6 +536,12 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
.c.o:
$(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.o: .cc.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $< $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<