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-05-05 11:37:10 +02:00
parent bd4df1e3da
commit eda9b8986b
62 changed files with 7546 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+41 -156
View File
@@ -88,11 +88,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
sbin_PROGRAMS = helmetd$(EXEEXT) helmetcli$(EXEEXT)
noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
service_test$(EXEEXT) tunclient_test$(EXEEXT) \
rpcclient_test$(EXEEXT) rpcclient_msg_test$(EXEEXT) \
testconnect_test$(EXEEXT)
sbin_PROGRAMS = helmetd$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -103,46 +99,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = defines.h
CONFIG_HEADER = defines.hpp
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am__objects_1 = abrpchandler.$(OBJEXT) control.pb.$(OBJEXT) \
interface.$(OBJEXT) iprouter.$(OBJEXT) logger.$(OBJEXT) \
netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \
msgheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \
testconnect.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT)
am_helmetcli_OBJECTS = helmetcli.$(OBJEXT) $(am__objects_1)
helmetcli_OBJECTS = $(am_helmetcli_OBJECTS)
helmetcli_LDADD = $(LDADD)
PROGRAMS = $(sbin_PROGRAMS)
am__objects_1 = uxlogger.$(OBJEXT) tservice.$(OBJEXT) \
sockhand.$(OBJEXT) msgheader.$(OBJEXT)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
helmetd_OBJECTS = $(am_helmetd_OBJECTS)
helmetd_LDADD = $(LDADD)
am_rpcclient_msg_test_OBJECTS = rpcclient_msg_test.$(OBJEXT) \
$(am__objects_1)
rpcclient_msg_test_OBJECTS = $(am_rpcclient_msg_test_OBJECTS)
rpcclient_msg_test_LDADD = $(LDADD)
am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) $(am__objects_1)
rpcclient_test_OBJECTS = $(am_rpcclient_test_OBJECTS)
rpcclient_test_LDADD = $(LDADD)
am_service_test_OBJECTS = service_test.$(OBJEXT) $(am__objects_1)
service_test_OBJECTS = $(am_service_test_OBJECTS)
service_test_LDADD = $(LDADD)
am_tcpclient_test_OBJECTS = tcpclient_test.$(OBJEXT) $(am__objects_1)
tcpclient_test_OBJECTS = $(am_tcpclient_test_OBJECTS)
tcpclient_test_LDADD = $(LDADD)
am_testconnect_test_OBJECTS = testconnect_test.$(OBJEXT) \
$(am__objects_1)
testconnect_test_OBJECTS = $(am_testconnect_test_OBJECTS)
testconnect_test_LDADD = $(LDADD)
am_tunclient_test_OBJECTS = tunclient_test.$(OBJEXT) \
tunclient.$(OBJEXT) interface.$(OBJEXT)
tunclient_test_OBJECTS = $(am_tunclient_test_OBJECTS)
tunclient_test_LDADD = $(LDADD)
am_udpclient_test_OBJECTS = udpclient_test.$(OBJEXT) $(am__objects_1)
udpclient_test_OBJECTS = $(am_udpclient_test_OBJECTS)
udpclient_test_LDADD = $(LDADD)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -183,23 +149,15 @@ 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 = $(helmetcli_SOURCES) $(helmetd_SOURCES) \
$(rpcclient_msg_test_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES)
DIST_SOURCES = $(helmetcli_SOURCES) $(helmetd_SOURCES) \
$(rpcclient_msg_test_SOURCES) $(rpcclient_test_SOURCES) \
$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
$(testconnect_test_SOURCES) $(tunclient_test_SOURCES) \
$(udpclient_test_SOURCES)
SOURCES = $(helmetd_SOURCES)
DIST_SOURCES = $(helmetd_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
defines.h.in
defines.hpp.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -217,8 +175,8 @@ am__define_uniq_tagged_files = \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/defines.h.in compile \
install-sh missing
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/defines.hpp.in \
compile install-sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -338,40 +296,19 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
helmetcli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
helmetd_SOURCES = helmetd.cpp $(helmet_SOURCES)
helmet_SOURCES = \
abrpchandler.cpp abrpchandler.hpp \
control.pb.cc control.pb.h \
interface.cpp interface.hpp \
iprouter.cpp iprouter.hpp \
logger.cpp logger.hpp \
netclient.cpp netclient.hpp \
resolver.cpp resolver.hpp \
rpcclient.cpp rpcclient.hpp \
msgheader.cpp msgheader.hpp \
service.cpp service.hpp \
tcpclient.cpp tcpclient.hpp \
testconnect.cpp testconnect.hpp \
tunclient.cpp tunclient.hpp \
udpclient.cpp udpclient.hpp
uxlogger.cpp uxlogger.hpp \
tservice.cpp tservice.hpp \
sockhand.cpp dockhand.hpp \
msgheader.cpp msgheader.hpp
tunclient_test_SOURCES = tunclient_test.cpp \
tunclient.cpp tunclient.hpp \
interface.cpp interface.hpp
service_test_SOURCES = service_test.cpp $(helmet_SOURCES)
udpclient_test_SOURCES = udpclient_test.cpp $(helmet_SOURCES)
tcpclient_test_SOURCES = tcpclient_test.cpp $(helmet_SOURCES)
rpcclient_test_SOURCES = rpcclient_test.cpp $(helmet_SOURCES)
rpcclient_msg_test_SOURCES = rpcclient_msg_test.cpp $(helmet_SOURCES)
testconnect_test_SOURCES = testconnect_test.cpp $(helmet_SOURCES)
ASTYLE_OPTS = --indent=spaces=8 --style=java
all: defines.h
all: defines.hpp
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .cc .cpp .o .obj
.SUFFIXES: .cpp .o .obj
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -406,23 +343,20 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
defines.h: stamp-h1
defines.hpp: stamp-h1
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/defines.h.in $(top_builddir)/config.status
stamp-h1: $(srcdir)/defines.hpp.in $(top_builddir)/config.status
$(AM_V_at)rm -f stamp-h1
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status defines.h
$(srcdir)/defines.h.in: $(am__configure_deps)
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status defines.hpp
$(srcdir)/defines.hpp.in: $(am__configure_deps)
$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
$(AM_V_at)rm -f stamp-h1
$(AM_V_at)touch $@
distclean-hdr:
-rm -f defines.h stamp-h1
clean-noinstPROGRAMS:
-$(am__rm_f) $(noinst_PROGRAMS)
-rm -f defines.hpp stamp-h1
install-sbinPROGRAMS: $(sbin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
@@ -466,54 +400,16 @@ uninstall-sbinPROGRAMS:
clean-sbinPROGRAMS:
-$(am__rm_f) $(sbin_PROGRAMS)
helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES)
@rm -f helmetcli$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES)
@rm -f helmetd$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
rpcclient_msg_test$(EXEEXT): $(rpcclient_msg_test_OBJECTS) $(rpcclient_msg_test_DEPENDENCIES) $(EXTRA_rpcclient_msg_test_DEPENDENCIES)
@rm -f rpcclient_msg_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(rpcclient_msg_test_OBJECTS) $(rpcclient_msg_test_LDADD) $(LIBS)
rpcclient_test$(EXEEXT): $(rpcclient_test_OBJECTS) $(rpcclient_test_DEPENDENCIES) $(EXTRA_rpcclient_test_DEPENDENCIES)
@rm -f rpcclient_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(rpcclient_test_OBJECTS) $(rpcclient_test_LDADD) $(LIBS)
service_test$(EXEEXT): $(service_test_OBJECTS) $(service_test_DEPENDENCIES) $(EXTRA_service_test_DEPENDENCIES)
@rm -f service_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(service_test_OBJECTS) $(service_test_LDADD) $(LIBS)
tcpclient_test$(EXEEXT): $(tcpclient_test_OBJECTS) $(tcpclient_test_DEPENDENCIES) $(EXTRA_tcpclient_test_DEPENDENCIES)
@rm -f tcpclient_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(tcpclient_test_OBJECTS) $(tcpclient_test_LDADD) $(LIBS)
testconnect_test$(EXEEXT): $(testconnect_test_OBJECTS) $(testconnect_test_DEPENDENCIES) $(EXTRA_testconnect_test_DEPENDENCIES)
@rm -f testconnect_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(testconnect_test_OBJECTS) $(testconnect_test_LDADD) $(LIBS)
tunclient_test$(EXEEXT): $(tunclient_test_OBJECTS) $(tunclient_test_DEPENDENCIES) $(EXTRA_tunclient_test_DEPENDENCIES)
@rm -f tunclient_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(tunclient_test_OBJECTS) $(tunclient_test_LDADD) $(LIBS)
udpclient_test$(EXEEXT): $(udpclient_test_OBJECTS) $(udpclient_test_DEPENDENCIES) $(EXTRA_udpclient_test_DEPENDENCIES)
@rm -f udpclient_test$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(udpclient_test_OBJECTS) $(udpclient_test_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
.cc.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
.cc.obj:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cpp.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
@@ -752,7 +648,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) defines.h
all-am: Makefile $(PROGRAMS) defines.hpp
installdirs:
for dir in "$(DESTDIR)$(sbindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -789,8 +685,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-local clean-noinstPROGRAMS \
clean-sbinPROGRAMS mostlyclean-am
clean-am: clean-generic clean-local clean-sbinPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -861,40 +756,30 @@ uninstall-am: uninstall-sbinPROGRAMS
.MAKE: all install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
clean-cscope clean-generic clean-local clean-noinstPROGRAMS \
clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
dist-xz dist-zip dist-zstd distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
clean-cscope clean-generic clean-local clean-sbinPROGRAMS \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
dist-zstd distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-sbinPROGRAMS install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-sbinPROGRAMS
.PRECIOUS: Makefile
#test: testconnect_test
# ./testconnect_test
#test: rpcclient_test
# ./rpcclient_test
test: service_test rpcclient_test
proto:
$(PROTOC) --cpp_out=. control.proto
control.pb.cc control.pb.h: control.proto
$(PROTOC) --cpp_out=. control.proto
format:
$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp
proto:
$(PROTOC) --cpp_out=. uxcontrol.proto
clean-local:
rm -rf autom4te.cache
rm -f *~