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 18:49:19 +02:00
parent 47542499fc
commit bd4df1e3da
19 changed files with 250 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -10,3 +10,4 @@ defines.h
*.bin
*.tar*
*.bkp
*.d
Makefile
+70 -101
View File
@@ -91,7 +91,8 @@ 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) testconnect_test$(EXEEXT)
rpcclient_test$(EXEEXT) rpcclient_msg_test$(EXEEXT) \
testconnect_test$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -107,44 +108,39 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
helmetcli_SOURCES = helmetcli.c
helmetcli_OBJECTS = helmetcli.$(OBJEXT)
helmetcli_LDADD = $(LDADD)
am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \
am__objects_1 = abrpchandler.$(OBJEXT) control.pb.$(OBJEXT) \
interface.$(OBJEXT) iprouter.$(OBJEXT) logger.$(OBJEXT) \
netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \
rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \
tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \
logger.$(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)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
helmetd_OBJECTS = $(am_helmetd_OBJECTS)
helmetd_LDADD = $(LDADD)
am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
nethandler.$(OBJEXT) testconnect.$(OBJEXT) tcpclient.$(OBJEXT) \
control.pb.$(OBJEXT)
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) tunclient.$(OBJEXT) \
service.$(OBJEXT) interface.$(OBJEXT) rpcheader.$(OBJEXT) \
logger.$(OBJEXT) nethandler.$(OBJEXT) control.pb.$(OBJEXT)
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 = resolver.$(OBJEXT) netclient.$(OBJEXT) \
tcpclient.$(OBJEXT) tcpclient_test.$(OBJEXT)
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) \
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
nethandler.$(OBJEXT) testconnect.$(OBJEXT) \
control.pb.$(OBJEXT) logger.$(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 = resolver.$(OBJEXT) udpclient.$(OBJEXT) \
udpclient_test.$(OBJEXT)
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_$(V))
@@ -162,18 +158,6 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.
depcomp =
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) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_$(V))
@@ -187,14 +171,28 @@ AM_V_CXXLD = $(am__v_CXXLD_$(V))
am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
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 =
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)
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 = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -242,13 +240,13 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
distcleancheck_listfiles = \
find . \( -type f -a \! \
\( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' aclocal-1.17
ACLOCAL = ${SHELL} '/home/ziggi/Projects/stvpn/missing' aclocal-1.17
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
ASTYLE = /bin/astyle
AUTOCONF = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' autoconf
AUTOHEADER = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' autoheader
AUTOMAKE = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' automake-1.17
AUTOCONF = ${SHELL} '/home/ziggi/Projects/stvpn/missing' autoconf
AUTOHEADER = ${SHELL} '/home/ziggi/Projects/stvpn/missing' autoheader
AUTOMAKE = ${SHELL} '/home/ziggi/Projects/stvpn/missing' automake-1.17
AWK = mawk
CC = gcc
CCDEPMODE = depmode=none
@@ -258,7 +256,7 @@ CSCOPE = cscope
CTAGS = ctags
CXX = g++
CXXDEPMODE = depmode=none
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1 -MMD -MP
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -276,7 +274,7 @@ LDFLAGS = -pthread
LIBOBJS =
LIBS = -Wl,--as-need -lprotobuf
LTLIBOBJS =
MAKEINFO = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' makeinfo
MAKEINFO = ${SHELL} '/home/ziggi/Projects/stvpn/missing' makeinfo
MKDIR_P = /bin/mkdir -p
OBJEXT = o
PACKAGE = helmet
@@ -293,10 +291,10 @@ SET_MAKE =
SHELL = /bin/bash
STRIP =
VERSION = 0.0.1
abs_builddir = /home/ziggi/Projects/tcpserv09
abs_srcdir = /home/ziggi/Projects/tcpserv09
abs_top_builddir = /home/ziggi/Projects/tcpserv09
abs_top_srcdir = /home/ziggi/Projects/tcpserv09
abs_builddir = /home/ziggi/Projects/stvpn
abs_srcdir = /home/ziggi/Projects/stvpn
abs_top_builddir = /home/ziggi/Projects/stvpn
abs_top_srcdir = /home/ziggi/Projects/stvpn
ac_ct_CC = gcc
ac_ct_CXX = g++
am__include = include
@@ -318,7 +316,7 @@ host_alias =
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /home/ziggi/Projects/tcpserv09/install-sh
install_sh = ${SHELL} /home/ziggi/Projects/stvpn/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
@@ -340,70 +338,40 @@ top_build_prefix =
top_builddir = .
top_srcdir = .
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
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 \
rpcheader.cpp rpcheader.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 \
control.pb.cc control.pb.h \
logger.cpp logger.hpp
udpclient.cpp udpclient.hpp
tunclient_test_SOURCES = tunclient_test.cpp \
tunclient.cpp tunclient.hpp \
interface.cpp interface.hpp
service_test_SOURCES = service_test.cpp \
tunclient.cpp tunclient.hpp \
service.cpp service.hpp \
interface.cpp interface.hpp \
rpcheader.cpp rpcheader.hpp \
logger.cpp logger.hpp \
nethandler.cpp nethandler.hpp \
control.pb.cc control.pb.h
udpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
udpclient.cpp udpclient.hpp \
udpclient_test.cpp
tcpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
netclient.cpp netclient.hpp \
tcpclient.cpp tcpclient.hpp \
tcpclient_test.cpp
rpcclient_test_SOURCES = rpcclient_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
tcpclient.cpp tcpclient.hpp \
control.pb.cc control.pb.h
testconnect_test_SOURCES = testconnect_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
control.pb.cc control.pb.h \
logger.cpp logger.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
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .o .obj
.SUFFIXES: .cc .cpp .o .obj
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -500,12 +468,16 @@ clean-sbinPROGRAMS:
helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES)
@rm -f helmetcli$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
$(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)
@@ -536,12 +508,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
.c.o:
$(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
@@ -934,6 +900,9 @@ clean-local:
rm -f *~
rm -f *.o
rm -f *.orig
rm -f *.d
-include *.d
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Makefile.am
+17 -43
View File
@@ -1,28 +1,30 @@
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1 -MMD -MP
LDFLAGS = -pthread
LIBS = -Wl,--as-need -lprotobuf
sbin_PROGRAMS = helmetd helmetcli
helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
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 \
rpcheader.cpp rpcheader.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 \
control.pb.cc control.pb.h \
logger.cpp logger.hpp
udpclient.cpp udpclient.hpp
noinst_PROGRAMS = \
tcpclient_test \
@@ -30,50 +32,20 @@ noinst_PROGRAMS = \
service_test \
tunclient_test \
rpcclient_test \
rpcclient_msg_test \
testconnect_test
tunclient_test_SOURCES = tunclient_test.cpp \
tunclient.cpp tunclient.hpp \
interface.cpp interface.hpp
service_test_SOURCES = service_test.cpp \
tunclient.cpp tunclient.hpp \
service.cpp service.hpp \
interface.cpp interface.hpp \
rpcheader.cpp rpcheader.hpp \
logger.cpp logger.hpp \
nethandler.cpp nethandler.hpp \
control.pb.cc control.pb.h
udpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
udpclient.cpp udpclient.hpp \
udpclient_test.cpp
tcpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
netclient.cpp netclient.hpp \
tcpclient.cpp tcpclient.hpp \
tcpclient_test.cpp
rpcclient_test_SOURCES = rpcclient_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
tcpclient.cpp tcpclient.hpp \
control.pb.cc control.pb.h
testconnect_test_SOURCES = testconnect_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
control.pb.cc control.pb.h \
logger.cpp logger.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)
#test: testconnect_test
# ./testconnect_test
@@ -97,5 +69,7 @@ clean-local:
rm -f *~
rm -f *.o
rm -f *.orig
rm -f *.d
-include *.d
Makefile.in
+60 -91
View File
@@ -91,7 +91,8 @@ 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) testconnect_test$(EXEEXT)
rpcclient_test$(EXEEXT) rpcclient_msg_test$(EXEEXT) \
testconnect_test$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -107,44 +108,39 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)"
PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
helmetcli_SOURCES = helmetcli.c
helmetcli_OBJECTS = helmetcli.$(OBJEXT)
helmetcli_LDADD = $(LDADD)
am__objects_1 = interface.$(OBJEXT) iprouter.$(OBJEXT) \
am__objects_1 = abrpchandler.$(OBJEXT) control.pb.$(OBJEXT) \
interface.$(OBJEXT) iprouter.$(OBJEXT) logger.$(OBJEXT) \
netclient.$(OBJEXT) resolver.$(OBJEXT) rpcclient.$(OBJEXT) \
rpcheader.$(OBJEXT) service.$(OBJEXT) tcpclient.$(OBJEXT) \
tunclient.$(OBJEXT) udpclient.$(OBJEXT) control.pb.$(OBJEXT) \
logger.$(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)
am_helmetd_OBJECTS = helmetd.$(OBJEXT) $(am__objects_1)
helmetd_OBJECTS = $(am_helmetd_OBJECTS)
helmetd_LDADD = $(LDADD)
am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
nethandler.$(OBJEXT) testconnect.$(OBJEXT) tcpclient.$(OBJEXT) \
control.pb.$(OBJEXT)
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) tunclient.$(OBJEXT) \
service.$(OBJEXT) interface.$(OBJEXT) rpcheader.$(OBJEXT) \
logger.$(OBJEXT) nethandler.$(OBJEXT) control.pb.$(OBJEXT)
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 = resolver.$(OBJEXT) netclient.$(OBJEXT) \
tcpclient.$(OBJEXT) tcpclient_test.$(OBJEXT)
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) \
rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
nethandler.$(OBJEXT) testconnect.$(OBJEXT) \
control.pb.$(OBJEXT) logger.$(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 = resolver.$(OBJEXT) udpclient.$(OBJEXT) \
udpclient_test.$(OBJEXT)
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@)
@@ -162,18 +158,6 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp =
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) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_@AM_V@)
@@ -187,14 +171,28 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = helmetcli.c $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
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 =
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)
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 = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -258,7 +256,7 @@ CSCOPE = @CSCOPE@
CTAGS = @CTAGS@
CXX = @CXX@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1 -MMD -MP
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -340,70 +338,40 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
helmetxli_SOURCES = helmetcli.cpp $(helmet_SOURCES)
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 \
rpcheader.cpp rpcheader.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 \
control.pb.cc control.pb.h \
logger.cpp logger.hpp
udpclient.cpp udpclient.hpp
tunclient_test_SOURCES = tunclient_test.cpp \
tunclient.cpp tunclient.hpp \
interface.cpp interface.hpp
service_test_SOURCES = service_test.cpp \
tunclient.cpp tunclient.hpp \
service.cpp service.hpp \
interface.cpp interface.hpp \
rpcheader.cpp rpcheader.hpp \
logger.cpp logger.hpp \
nethandler.cpp nethandler.hpp \
control.pb.cc control.pb.h
udpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
udpclient.cpp udpclient.hpp \
udpclient_test.cpp
tcpclient_test_SOURCES = \
resolver.cpp resolver.hpp \
netclient.cpp netclient.hpp \
tcpclient.cpp tcpclient.hpp \
tcpclient_test.cpp
rpcclient_test_SOURCES = rpcclient_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
tcpclient.cpp tcpclient.hpp \
control.pb.cc control.pb.h
testconnect_test_SOURCES = testconnect_test.cpp \
rpcclient.cpp rpcclient.hpp \
rpcheader.cpp rpcheader.hpp \
netclient.cpp netclient.hpp \
nethandler.cpp nethandler.hpp \
testconnect.cpp testconnect.hpp \
control.pb.cc control.pb.h \
logger.cpp logger.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
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .o .obj
.SUFFIXES: .cc .cpp .o .obj
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -500,12 +468,16 @@ clean-sbinPROGRAMS:
helmetcli$(EXEEXT): $(helmetcli_OBJECTS) $(helmetcli_DEPENDENCIES) $(EXTRA_helmetcli_DEPENDENCIES)
@rm -f helmetcli$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(helmetcli_OBJECTS) $(helmetcli_LDADD) $(LIBS)
$(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)
@@ -536,12 +508,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
.c.o:
$(AM_V_CC)$(COMPILE) -c -o $@ $<
.c.obj:
$(AM_V_CC)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.cc.o:
$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
@@ -934,6 +900,9 @@ clean-local:
rm -f *~
rm -f *.o
rm -f *.orig
rm -f *.d
-include *.d
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
nethandler.cpp → abrpchandler.cpp
+4 -4
View File
@@ -21,13 +21,13 @@ extern "C" {
#include <iostream>
#include <sstream>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
NetHandler::NetHandler() {}
AbstractRPCHandler::AbstractRPCHandler() {}
std::expected<void, std::string> NetHandler::Handle(std::string& req, std::string& res) {
std::expected<void, std::string> AbstractRPCHandler::Handle(std::string& req, std::string& res) {
return {};
}
NetHandler::~NetHandler() {}
AbstractRPCHandler::~AbstractRPCHandler() {}
nethandler.hpp → abrpchandler.hpp
+5 -5
View File
@@ -13,14 +13,14 @@
#include <netclient.hpp>
class NetHandler {
class AbstractRPCHandler {
public:
NetHandler(void);
AbstractRPCHandler(void);
virtual std::expected<void, std::string> Handle(std::string& req, std::string& res);
virtual ~NetHandler(void);
virtual ~AbstractRPCHandler(void);
NetHandler(const NetHandler&) = delete;
NetHandler& operator=(const NetHandler&) = delete;
AbstractRPCHandler(const AbstractRPCHandler&) = delete;
AbstractRPCHandler& operator=(const AbstractRPCHandler&) = delete;
};
#endif
helmetcli.cpp
+12
View File
@@ -0,0 +1,12 @@
#include <expected>
#include <string>
#include <cstring>
#include <interface.hpp>
#include <service.hpp>
int main(int argc, char** argv) {
return 0;
}
rpcheader.cpp → msgheader.cpp
+6 -6
View File
@@ -10,17 +10,17 @@ extern "C" {
#include <format>
#include <cstdint>
#include <rpcheader.hpp>
#include <msgheader.hpp>
RPCHeader::RPCHeader(const uint32_t ipSize) {
MessageHeader::MessageHeader(const uint32_t ipSize) {
pSize = ipSize;
}
RPCHeader::RPCHeader(void) {
MessageHeader::MessageHeader(void) {
pSize = 0;
}
std::string RPCHeader::Encode() {
std::string MessageHeader::Encode() {
std::string buffer, tmp;
auto magic = htonl(MAGIC);
tmp = std::string(reinterpret_cast<const char*>(&magic), sizeof(magic));
@@ -32,7 +32,7 @@ std::string RPCHeader::Encode() {
return buffer;
}
std::expected<void, std::string> RPCHeader::Decode(const std::string rawHeader) {
std::expected<void, std::string> MessageHeader::Decode(const std::string rawHeader) {
uint32_t tmp;
std::memcpy(&tmp, rawHeader.data(), sizeof(uint32_t));
auto magic = ntohl(tmp);
@@ -44,6 +44,6 @@ std::expected<void, std::string> RPCHeader::Decode(const std::string rawHeader)
return {};
}
uint32_t RPCHeader::PacketSize() {
uint32_t MessageHeader::PacketSize() {
return pSize;
}
rpcheader.hpp → msgheader.hpp
+3 -3
View File
@@ -4,12 +4,12 @@
constexpr uint32_t MAGIC = 0xABBA;
constexpr int rpcHeaderSize = 8;
class RPCHeader {
class MessageHeader {
private:
uint32_t pSize = 0;
public:
RPCHeader(const uint32_t pSize);
RPCHeader(void);
MessageHeader(const uint32_t pSize);
MessageHeader(void);
std::string Encode(void);
std::expected<void, std::string> Decode(const std::string buffer);
uint32_t PacketSize(void);
rpcheader_test.cpp → msgheader_test.cpp
+3 -3
View File
@@ -5,13 +5,13 @@
#include <iostream>
#include <format>
#include <rpcheader.hpp>
#include <msgheader.hpp>
int main(int argc, char** argv) {
RPCHeader primary(1021);
MessageHeader primary(1021);
auto rawHeader = primary.Encode();
RPCHeader second;
MessageHeader second;
second.Decode(rawHeader);
std::cout << std::format("{}\n", second.PacketSize());
rpcclient.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include <control.pb.h>
#include <rpcclient.hpp>
#include <rpcheader.hpp>
#include <msgheader.hpp>
#include <netclient.hpp>
RPCClient::RPCClient(NetClient& iconnector) {
@@ -22,7 +22,7 @@ std::expected<void, std::string> RPCClient::DoTransaction(const pbMessage& pbReq
std::string rawRequest;
pbReq.SerializeToString(&rawRequest);
RPCHeader reqHeader(rawRequest.size());
MessageHeader reqHeader(rawRequest.size());
auto rawReqHeader = reqHeader.Encode();
std::string reqPacket;
@@ -34,7 +34,7 @@ std::expected<void, std::string> RPCClient::DoTransaction(const pbMessage& pbReq
const int headerSize = rpcHeaderSize;
std::string rawResHeader;
connector->Read(rawResHeader, headerSize);
RPCHeader resHeader;
MessageHeader resHeader;
resHeader.Decode(rawResHeader);
std::string rawResponse;
rpcclient_memtest.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <control.pb.h>
#include <rpcclient.hpp>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
#include <testconnect.hpp>
class TestHandler : public NetHandler {
rpcclient_msg_test.cpp
+42
View File
@@ -0,0 +1,42 @@
#include <expected>
#include <string>
#include <cstring>
#include <iostream>
#include <format>
#include <control.pb.h>
#include <rpcclient.hpp>
#include <abrpchandler.hpp>
#include <testconnect.hpp>
class TestRCPHanlder : public AbstractRPCHandler {
public:
std::expected<void, std::string> Handle(std::string& req, std::string& res) override;
};
std::expected<void, std::string> TestRCPHanlder::Handle(std::string& rawReq, std::string& rawRes) {
control::HelloRequest pbReq;
pbReq.ParseFromString(rawReq);
std::cout << std::format("kind: {}\n", pbReq.meta().kind());
std::cout << std::format("req message: {}\n", pbReq.message());
return {};
}
int main(int argc, char** argv) {
TestRCPHanlder handler;
TestConnector connector(handler);
RPCClient rpcCli(connector);
control::HelloRequest pbReq;
auto reqMeta = pbReq.mutable_meta();
reqMeta->set_kind("getHello");
pbReq.set_message("What's your name?");
control::HelloResult pbRes;
auto trRes = rpcCli.DoTransaction(pbReq, pbRes);
std::cout << std::format("res message: {}\n", pbRes.message());
}
rpcclient_test.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <control.pb.h>
#include <rpcclient.hpp>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
#include <testconnect.hpp>
#include <tcpclient.hpp>
service.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ extern "C" {
#include <service.hpp>
#include <logger.hpp>
#include <rpcheader.hpp>
#include <msgheader.hpp>
#include <control.pb.h>
service_test.cpp
+8 -8
View File
@@ -8,13 +8,13 @@
#include <control.pb.h>
#include <rpcclient.hpp>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
#include <service.hpp>
#include <logger.hpp>
#include <rpcheader.hpp>
#include <msgheader.hpp>
class TestRPCHandler : public NetHandler {
class TestRPCHandler : public AbstractRPCHandler {
public:
std::expected<void, std::string> Handle(std::string& req, std::string& res) override;
};
@@ -39,14 +39,14 @@ std::expected<void, std::string> TestRPCHandler::Handle(std::string& rawReq, st
class TestSocketHandler : public SocketHandler {
private:
NetHandler* nextHandler;
AbstractRPCHandler* nextHandler;
public:
TestSocketHandler(NetHandler& rcpHandler);
TestSocketHandler(AbstractRPCHandler& rcpHandler);
virtual void Handle(int sock) override;
virtual ~TestSocketHandler(void) override;
};
TestSocketHandler::TestSocketHandler(NetHandler& rpcHandler) {
TestSocketHandler::TestSocketHandler(AbstractRPCHandler& rpcHandler) {
nextHandler = &rpcHandler;
}
@@ -66,7 +66,7 @@ void TestSocketHandler::Handle(int sock) {
}
logger.Log(std::format("header read size {}", rsize));
RPCHeader inHeader;
MessageHeader inHeader;
inHeader.Decode(inRawHeader);
int inPacketSize = inHeader.PacketSize();
logger.Log(std::format("rpc packet size {}", inPacketSize));
@@ -82,7 +82,7 @@ void TestSocketHandler::Handle(int sock) {
std::string outRawResult;
nextHandler->Handle(inRawRequest, outRawResult);
RPCHeader outHeader(outRawResult.size());
MessageHeader outHeader(outRawResult.size());
auto rawPacket = outHeader.Encode();
rawPacket.append(outRawResult);
testconnect.cpp
+5 -5
View File
@@ -9,11 +9,11 @@
#include <memory>
#include <testconnect.hpp>
#include <nethandler.hpp>
#include <rpcheader.hpp>
#include <abrpchandler.hpp>
#include <msgheader.hpp>
TestConnector::TestConnector(NetHandler& hand) {
TestConnector::TestConnector(AbstractRPCHandler& hand) {
handler = &hand;
}
@@ -25,7 +25,7 @@ std::expected<int, std::string> TestConnector::Write(std::string reqNetPacket) {
reqRawHeader.resize(rhSize);
ss.read(reqRawHeader.data(), rhSize);
// Decode header
RPCHeader reqHeader;
MessageHeader reqHeader;
reqHeader.Decode(reqRawHeader);
// Read protobuf packet
std::string reqData;
@@ -37,7 +37,7 @@ std::expected<int, std::string> TestConnector::Write(std::string reqNetPacket) {
handler->Handle(reqData, resData);
// Pack result
std::string resNetPacket;
RPCHeader resHeader(resData.size());
MessageHeader resHeader(resData.size());
resNetPacket.append(resHeader.Encode());
resNetPacket.append(resData);
testconnect.hpp
+3 -3
View File
@@ -11,14 +11,14 @@
#include <memory>
#include <netclient.hpp>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
class TestConnector : public NetClient {
private:
NetHandler* handler;
AbstractRPCHandler* handler;
std::stringstream backss;
public:
TestConnector(NetHandler& hand);
TestConnector(AbstractRPCHandler& hand);
std::expected<int, std::string> Write(std::string payload) override;
std::expected<int, std::string> Read(std::string& buffer, int size) override;
~TestConnector(void);
testconnect_test.cpp
+5 -5
View File
@@ -7,14 +7,14 @@
#include <sstream>
#include <netclient.hpp>
#include <nethandler.hpp>
#include <abrpchandler.hpp>
#include <testconnect.hpp>
#include <rpcheader.hpp>
#include <msgheader.hpp>
#include <logger.hpp>
#include <control.pb.h>
class TestHandler : public NetHandler {
class TestHandler : public AbstractRPCHandler {
public:
std::expected<void, std::string> Handle(std::string& req, std::string& res) override;
};
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
std::string rawReq;
pbReq.SerializeToString(&rawReq);
RPCHeader reqHeader(rawReq.size());
MessageHeader reqHeader(rawReq.size());
auto rawHeader = reqHeader.Encode();
std::string reqPacket;
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
const int rhSize = rpcHeaderSize;
auto rSize = conn.Read(resRawHeader, rhSize);
RPCHeader resHeader;
MessageHeader resHeader;
resHeader.Decode(resRawHeader);
auto pSize = resHeader.PacketSize();