working commit

Makefile.in

@@ -89,6 +89,8 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 sbin_PROGRAMS = helmetd$(EXEEXT)
+noinst_PROGRAMS = udpclient_test$(EXEEXT) service_test$(EXEEXT) \
+	server_test$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -103,11 +105,24 @@ CONFIG_HEADER = defines.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)"
-PROGRAMS = $(sbin_PROGRAMS)
-am_helmetd_OBJECTS = server.$(OBJEXT) service.$(OBJEXT) \
-	tunnel.$(OBJEXT)
+PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+am_helmetd_OBJECTS = helmetd.$(OBJEXT) server.$(OBJEXT) \
+	service.$(OBJEXT) interface.$(OBJEXT) hello.pb.$(OBJEXT) \
+	udpclient.$(OBJEXT) resolver.$(OBJEXT)
 helmetd_OBJECTS = $(am_helmetd_OBJECTS)
 helmetd_LDADD = $(LDADD)
+am_server_test_OBJECTS = server_test.$(OBJEXT) server.$(OBJEXT) \
+	service.$(OBJEXT) interface.$(OBJEXT)
+server_test_OBJECTS = $(am_server_test_OBJECTS)
+server_test_LDADD = $(LDADD)
+am_service_test_OBJECTS = service_test.$(OBJEXT) server.$(OBJEXT) \
+	service.$(OBJEXT) interface.$(OBJEXT)
+service_test_OBJECTS = $(am_service_test_OBJECTS)
+service_test_LDADD = $(LDADD)
+am_udpclient_test_OBJECTS = resolver.$(OBJEXT) udpclient.$(OBJEXT) \
+	udpclient_test.$(OBJEXT)
+udpclient_test_OBJECTS = $(am_udpclient_test_OBJECTS)
+udpclient_test_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -148,8 +163,10 @@ 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 = $(helmetd_SOURCES)
-DIST_SOURCES = $(helmetd_SOURCES)
+SOURCES = $(helmetd_SOURCES) $(server_test_SOURCES) \
+	$(service_test_SOURCES) $(udpclient_test_SOURCES)
+DIST_SOURCES = $(helmetd_SOURCES) $(server_test_SOURCES) \
+	$(service_test_SOURCES) $(udpclient_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -226,9 +243,9 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = -pthread
+LDFLAGS = -pthread -static
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = -Wl,--as-need -lprotobuf-lite
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -241,6 +258,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PROTOC = @PROTOC@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -293,15 +311,34 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
-helmetd_SOURCES = server.cpp \
+helmetd_SOURCES = helmetd.cpp \
+	server.cpp server.hpp \
 	service.cpp service.hpp \
-	tunnel.cpp tunnel.hpp
+	interface.cpp interface.hpp \
+	hello.pb.cc hello.pb.h \
+	udpclient.cpp udpclient.hpp \
+	resolver.cpp resolver.hpp
+
+server_test_SOURCES = server_test.cpp \
+	server.cpp server.hpp \
+	service.cpp service.hpp \
+	interface.cpp interface.hpp
+
+service_test_SOURCES = service_test.cpp \
+	server.cpp server.hpp \
+	service.cpp service.hpp \
+	interface.cpp interface.hpp
+
+udpclient_test_SOURCES = \
+	resolver.cpp resolver.hpp \
+	udpclient.cpp udpclient.hpp \
+	udpclient_test.cpp
 
 all: defines.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .o .obj
+.SUFFIXES: .cc .cpp .o .obj
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -350,6 +387,9 @@ $(srcdir)/defines.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f defines.h stamp-h1
+
+clean-noinstPROGRAMS:
+	-$(am__rm_f) $(noinst_PROGRAMS)
 install-sbinPROGRAMS: $(sbin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
@@ -397,12 +437,30 @@ helmetd$(EXEEXT): $(helmetd_OBJECTS) $(helmetd_DEPENDENCIES) $(EXTRA_helmetd_DEP
 	@rm -f helmetd$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(helmetd_OBJECTS) $(helmetd_LDADD) $(LIBS)
 
+server_test$(EXEEXT): $(server_test_OBJECTS) $(server_test_DEPENDENCIES) $(EXTRA_server_test_DEPENDENCIES) 
+	@rm -f server_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(server_test_OBJECTS) $(server_test_LDADD) $(LIBS)
+
+service_test$(EXEEXT): $(service_test_OBJECTS) $(service_test_DEPENDENCIES) $(EXTRA_service_test_DEPENDENCIES) 
+	@rm -f service_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(service_test_OBJECTS) $(service_test_LDADD) $(LIBS)
+
+udpclient_test$(EXEEXT): $(udpclient_test_OBJECTS) $(udpclient_test_DEPENDENCIES) $(EXTRA_udpclient_test_DEPENDENCIES) 
+	@rm -f udpclient_test$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(udpclient_test_OBJECTS) $(udpclient_test_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+.cc.o:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
+
+.cc.obj:
+	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
 .cpp.o:
 	$(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $<
 
@@ -678,7 +736,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-local clean-sbinPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-local clean-noinstPROGRAMS \
+	clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -749,28 +808,34 @@ uninstall-am: uninstall-sbinPROGRAMS
 .MAKE: all install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
-	clean-cscope clean-generic clean-local clean-sbinPROGRAMS \
-	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
-	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	dist-zstd distcheck distclean distclean-compile \
-	distclean-generic distclean-hdr distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-sbinPROGRAMS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-sbinPROGRAMS
+	clean-cscope clean-generic clean-local clean-noinstPROGRAMS \
+	clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip dist-zstd distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
 
 .PRECIOUS: Makefile
 
 
+test: udpclient_test
+	./udpclient_test
+
 run: helmetd
 	./helmetd
 
+hello.pb.cc hello.pb.h: hello.proto
+	$(PROTOC) --cpp_out=. hello.proto
+
 clean-local:
 	rm -rf autom4te.cache
 	rm -f *~