working commit

Makefile.am

@@ -1,24 +1,25 @@
 
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
 
-CXXFLAGS = -g -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
+CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
 LDFLAGS = -pthread
 LIBS = -Wl,--as-need -lprotobuf
 
 sbin_PROGRAMS = helmetd
 
 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
 
 noinst_PROGRAMS = \
 	tcpclient_test \
@@ -26,18 +27,19 @@ noinst_PROGRAMS = \
 	service_test \
 	tunclient_test \
 	rpcclient_test \
-	fakeconnect_test
+	testconnect_test
 
 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 \
@@ -55,24 +57,26 @@ 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
 
 
-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