working commit

Makefile

@@ -91,7 +91,7 @@ POST_UNINSTALL = :
 sbin_PROGRAMS = helmetd$(EXEEXT)
 noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
 	service_test$(EXEEXT) tunclient_test$(EXEEXT) \
-	message_test$(EXEEXT)
+	rpcclient_test$(EXEEXT) fakeconnect_test$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -107,21 +107,30 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)"
 PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+am_fakeconnect_test_OBJECTS = fakeconnect_test.$(OBJEXT) \
+	rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
+	nethandler.$(OBJEXT) fakeconnect.$(OBJEXT) \
+	control.pb.$(OBJEXT)
+fakeconnect_test_OBJECTS = $(am_fakeconnect_test_OBJECTS)
+fakeconnect_test_LDADD = $(LDADD)
 am_helmetd_OBJECTS = helmetd.$(OBJEXT) tunclient.$(OBJEXT) \
-	service.$(OBJEXT) interface.$(OBJEXT) hello.pb.$(OBJEXT) \
-	udpclient.$(OBJEXT) resolver.$(OBJEXT) iprouter.$(OBJEXT) \
-	tcpclient.$(OBJEXT) rpcclient.$(OBJEXT)
+	service.$(OBJEXT) interface.$(OBJEXT) udpclient.$(OBJEXT) \
+	resolver.$(OBJEXT) iprouter.$(OBJEXT) netclient.$(OBJEXT) \
+	tcpclient.$(OBJEXT) rpcclient.$(OBJEXT) control.pb.$(OBJEXT)
 helmetd_OBJECTS = $(am_helmetd_OBJECTS)
 helmetd_LDADD = $(LDADD)
-am_message_test_OBJECTS = message_test.$(OBJEXT) hello.pb.$(OBJEXT)
-message_test_OBJECTS = $(am_message_test_OBJECTS)
-message_test_LDADD = $(LDADD)
+am_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
+	rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
+	nethandler.$(OBJEXT) fakeconnect.$(OBJEXT) \
+	control.pb.$(OBJEXT)
+rpcclient_test_OBJECTS = $(am_rpcclient_test_OBJECTS)
+rpcclient_test_LDADD = $(LDADD)
 am_service_test_OBJECTS = service_test.$(OBJEXT) tunclient.$(OBJEXT) \
 	service.$(OBJEXT) interface.$(OBJEXT)
 service_test_OBJECTS = $(am_service_test_OBJECTS)
 service_test_LDADD = $(LDADD)
-am_tcpclient_test_OBJECTS = resolver.$(OBJEXT) tcpclient.$(OBJEXT) \
-	tcpclient_test.$(OBJEXT)
+am_tcpclient_test_OBJECTS = resolver.$(OBJEXT) netclient.$(OBJEXT) \
+	tcpclient.$(OBJEXT) tcpclient_test.$(OBJEXT)
 tcpclient_test_OBJECTS = $(am_tcpclient_test_OBJECTS)
 tcpclient_test_LDADD = $(LDADD)
 am_tunclient_test_OBJECTS = tunclient_test.$(OBJEXT) \
@@ -172,12 +181,14 @@ 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) $(message_test_SOURCES) \
-	$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
-	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
-DIST_SOURCES = $(helmetd_SOURCES) $(message_test_SOURCES) \
-	$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
-	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
+SOURCES = $(fakeconnect_test_SOURCES) $(helmetd_SOURCES) \
+	$(rpcclient_test_SOURCES) $(service_test_SOURCES) \
+	$(tcpclient_test_SOURCES) $(tunclient_test_SOURCES) \
+	$(udpclient_test_SOURCES)
+DIST_SOURCES = $(fakeconnect_test_SOURCES) $(helmetd_SOURCES) \
+	$(rpcclient_test_SOURCES) $(service_test_SOURCES) \
+	$(tcpclient_test_SOURCES) $(tunclient_test_SOURCES) \
+	$(udpclient_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -241,7 +252,7 @@ CSCOPE = cscope
 CTAGS = ctags
 CXX = g++
 CXXDEPMODE = depmode=none
-CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
+CXXFLAGS = -g -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -327,12 +338,13 @@ helmetd_SOURCES = helmetd.cpp \
 	tunclient.cpp tunclient.hpp \
 	service.cpp service.hpp \
 	interface.cpp interface.hpp \
-	hello.pb.cc hello.pb.h \
 	udpclient.cpp udpclient.hpp \
 	resolver.cpp resolver.hpp \
 	iprouter.cpp iprouter.hpp \
+	netclient.cpp netclient.hpp \
 	tcpclient.cpp tcpclient.hpp \
-	rpcclient.cpp rpcclient.hpp
+	rpcclient.cpp rpcclient.hpp \
+	control.pb.cc control.pb.h
 
 tunclient_test_SOURCES = tunclient_test.cpp \
 	tunclient.cpp tunclient.hpp \
@@ -351,11 +363,25 @@ udpclient_test_SOURCES = \
 
 tcpclient_test_SOURCES = \
 	resolver.cpp resolver.hpp \
+	netclient.cpp netclient.hpp \
 	tcpclient.cpp tcpclient.hpp \
 	tcpclient_test.cpp
 
-message_test_SOURCES = message_test.cpp \
-	hello.pb.cc hello.pb.h
+rpcclient_test_SOURCES = rpcclient_test.cpp \
+	rpcclient.cpp rpcclient.hpp \
+	rpcheader.cpp rpcheader.hpp \
+	netclient.cpp netclient.hpp \
+	nethandler.cpp nethandler.hpp \
+	fakeconnect.cpp fakeconnect.hpp \
+	control.pb.cc control.pb.h
+
+fakeconnect_test_SOURCES = fakeconnect_test.cpp \
+	rpcclient.cpp rpcclient.hpp \
+	rpcheader.cpp rpcheader.hpp \
+	netclient.cpp netclient.hpp \
+	nethandler.cpp nethandler.hpp \
+	fakeconnect.cpp fakeconnect.hpp \
+	control.pb.cc control.pb.h
 
 ASTYLE_OPTS = --indent=spaces=8 --style=java
 all: defines.h
@@ -457,13 +483,17 @@ uninstall-sbinPROGRAMS:
 clean-sbinPROGRAMS:
 	-$(am__rm_f) $(sbin_PROGRAMS)
 
+fakeconnect_test$(EXEEXT): $(fakeconnect_test_OBJECTS) $(fakeconnect_test_DEPENDENCIES) $(EXTRA_fakeconnect_test_DEPENDENCIES) 
+	@rm -f fakeconnect_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(fakeconnect_test_OBJECTS) $(fakeconnect_test_LDADD) $(LIBS)
+
 helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEPENDENCIES) 
 	@rm -f helmetd$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
 
-message_test$(EXEEXT): $(message_test_OBJECTS) $(message_test_DEPENDENCIES) $(EXTRA_message_test_DEPENDENCIES) 
-	@rm -f message_test$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(message_test_OBJECTS) $(message_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)
@@ -859,17 +889,17 @@ uninstall-am: uninstall-sbinPROGRAMS
 .PRECIOUS: Makefile
 
 
-test: message_test
-	./message_test
+test: fakeconnect_test
+	./fakeconnect_test
 
 run: helmetd
 	./helmetd
 
 proto:
-	$(PROTOC) --cpp_out=. hello.proto
+	$(PROTOC) --cpp_out=. control.proto
 
-hello.pb.cc hello.pb.h: hello.proto
-	$(PROTOC) --cpp_out=. hello.proto
+control.pb.cc control.pb.h: control.proto
+	$(PROTOC) --cpp_out=. control.proto
 format:
 	$(ASTYLE) $(ASTYLE_OPTS) *.hpp *.cpp