working commit

Makefile.in

@@ -91,7 +91,7 @@ POST_UNINSTALL = :
 sbin_PROGRAMS = helmetd$(EXEEXT)
 noinst_PROGRAMS = tcpclient_test$(EXEEXT) udpclient_test$(EXEEXT) \
 	service_test$(EXEEXT) tunclient_test$(EXEEXT) \
-	rpcclient_test$(EXEEXT) fakeconnect_test$(EXEEXT)
+	rpcclient_test$(EXEEXT) testconnect_test$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -107,34 +107,36 @@ 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) \
+am_helmetd_OBJECTS = helmetd.$(OBJEXT) interface.$(OBJEXT) \
+	iprouter.$(OBJEXT) netclient.$(OBJEXT) resolver.$(OBJEXT) \
+	rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) service.$(OBJEXT) \
+	tcpclient.$(OBJEXT) tunclient.$(OBJEXT) udpclient.$(OBJEXT) \
 	control.pb.$(OBJEXT) logger.$(OBJEXT)
-fakeconnect_test_OBJECTS = $(am_fakeconnect_test_OBJECTS)
-fakeconnect_test_LDADD = $(LDADD)
-am_helmetd_OBJECTS = helmetd.$(OBJEXT) tunclient.$(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_rpcclient_test_OBJECTS = rpcclient_test.$(OBJEXT) \
 	rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
-	nethandler.$(OBJEXT) fakeconnect.$(OBJEXT) \
+	nethandler.$(OBJEXT) testconnect.$(OBJEXT) tcpclient.$(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.$(OBJEXT) interface.$(OBJEXT) rpcheader.$(OBJEXT) \
+	logger.$(OBJEXT) control.pb.$(OBJEXT)
 service_test_OBJECTS = $(am_service_test_OBJECTS)
 service_test_LDADD = $(LDADD)
 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_testconnect_test_OBJECTS = testconnect_test.$(OBJEXT) \
+	rpcclient.$(OBJEXT) rpcheader.$(OBJEXT) netclient.$(OBJEXT) \
+	nethandler.$(OBJEXT) testconnect.$(OBJEXT) \
+	control.pb.$(OBJEXT) logger.$(OBJEXT)
+testconnect_test_OBJECTS = $(am_testconnect_test_OBJECTS)
+testconnect_test_LDADD = $(LDADD)
 am_tunclient_test_OBJECTS = tunclient_test.$(OBJEXT) \
-	tunclient.$(OBJEXT) service.$(OBJEXT) interface.$(OBJEXT)
+	tunclient.$(OBJEXT) interface.$(OBJEXT)
 tunclient_test_OBJECTS = $(am_tunclient_test_OBJECTS)
 tunclient_test_LDADD = $(LDADD)
 am_udpclient_test_OBJECTS = resolver.$(OBJEXT) udpclient.$(OBJEXT) \
@@ -181,13 +183,13 @@ 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 = $(fakeconnect_test_SOURCES) $(helmetd_SOURCES) \
-	$(rpcclient_test_SOURCES) $(service_test_SOURCES) \
-	$(tcpclient_test_SOURCES) $(tunclient_test_SOURCES) \
+SOURCES = $(helmetd_SOURCES) $(rpcclient_test_SOURCES) \
+	$(service_test_SOURCES) $(tcpclient_test_SOURCES) \
+	$(testconnect_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) \
+DIST_SOURCES = $(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 \
@@ -252,7 +254,7 @@ CSCOPE = @CSCOPE@
 CTAGS = @CTAGS@
 CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = -g -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
+CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -335,26 +337,30 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
 helmetd_SOURCES = helmetd.cpp \
-	tunclient.cpp tunclient.hpp \
-	service.cpp service.hpp \
 	interface.cpp interface.hpp \
-	udpclient.cpp udpclient.hpp \
-	resolver.cpp resolver.hpp \
 	iprouter.cpp iprouter.hpp \
 	netclient.cpp netclient.hpp \
-	tcpclient.cpp tcpclient.hpp \
+	resolver.cpp resolver.hpp \
 	rpcclient.cpp rpcclient.hpp \
-	control.pb.cc control.pb.h
+	rpcheader.cpp rpcheader.hpp \
+	service.cpp service.hpp \
+	tcpclient.cpp tcpclient.hpp \
+	tunclient.cpp tunclient.hpp \
+	udpclient.cpp udpclient.hpp \
+	control.pb.cc control.pb.h \
+	logger.cpp logger.hpp
 
 tunclient_test_SOURCES = tunclient_test.cpp \
 	tunclient.cpp tunclient.hpp \
-	service.cpp service.hpp \
 	interface.cpp interface.hpp
 
 service_test_SOURCES = service_test.cpp \
 	tunclient.cpp tunclient.hpp \
 	service.cpp service.hpp \
-	interface.cpp interface.hpp
+	interface.cpp interface.hpp \
+	rpcheader.cpp rpcheader.hpp \
+	logger.cpp logger.hpp \
+	control.pb.cc control.pb.h
 
 udpclient_test_SOURCES = \
 	resolver.cpp resolver.hpp \
@@ -372,15 +378,16 @@ rpcclient_test_SOURCES = rpcclient_test.cpp \
 	rpcheader.cpp rpcheader.hpp \
 	netclient.cpp netclient.hpp \
 	nethandler.cpp nethandler.hpp \
-	fakeconnect.cpp fakeconnect.hpp \
+	testconnect.cpp testconnect.hpp \
+	tcpclient.cpp tcpclient.hpp \
 	control.pb.cc control.pb.h
 
-fakeconnect_test_SOURCES = fakeconnect_test.cpp \
+testconnect_test_SOURCES = testconnect_test.cpp \
 	rpcclient.cpp rpcclient.hpp \
 	rpcheader.cpp rpcheader.hpp \
 	netclient.cpp netclient.hpp \
 	nethandler.cpp nethandler.hpp \
-	fakeconnect.cpp fakeconnect.hpp \
+	testconnect.cpp testconnect.hpp \
 	control.pb.cc control.pb.h \
 	logger.cpp logger.hpp
 
@@ -484,10 +491,6 @@ 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)
@@ -504,6 +507,10 @@ tcpclient_test$(EXEEXT): $(tcpclient_test_OBJECTS) $(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)
@@ -890,11 +897,12 @@ uninstall-am: uninstall-sbinPROGRAMS
 .PRECIOUS: Makefile
 
 
-test: fakeconnect_test
-	./fakeconnect_test
+#test: testconnect_test
+#	./testconnect_test
+#test: rpcclient_test
+#	./rpcclient_test
 
-run: helmetd
-	./helmetd
+test: service_test rpcclient_test
 
 proto:
 	$(PROTOC) --cpp_out=. control.proto