working commit

Makefile.am

@@ -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