working commit

Makefile

@@ -90,7 +90,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 sbin_PROGRAMS = helmetd$(EXEEXT)
 noinst_PROGRAMS = udpclient_test$(EXEEXT) service_test$(EXEEXT) \
-	server_test$(EXEEXT)
+	tunclient_test$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -106,19 +106,19 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(sbindir)"
 PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
-am_helmetd_OBJECTS = helmetd.$(OBJEXT) server.$(OBJEXT) \
+am_helmetd_OBJECTS = helmetd.$(OBJEXT) tunclient.$(OBJEXT) \
 	service.$(OBJEXT) interface.$(OBJEXT) hello.pb.$(OBJEXT) \
-	udpclient.$(OBJEXT) resolver.$(OBJEXT)
+	udpclient.$(OBJEXT) resolver.$(OBJEXT) iprouter.$(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) \
+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_tunclient_test_OBJECTS = tunclient_test.$(OBJEXT) \
+	tunclient.$(OBJEXT) service.$(OBJEXT) interface.$(OBJEXT)
+tunclient_test_OBJECTS = $(am_tunclient_test_OBJECTS)
+tunclient_test_LDADD = $(LDADD)
 am_udpclient_test_OBJECTS = resolver.$(OBJEXT) udpclient.$(OBJEXT) \
 	udpclient_test.$(OBJEXT)
 udpclient_test_OBJECTS = $(am_udpclient_test_OBJECTS)
@@ -163,10 +163,10 @@ 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) $(server_test_SOURCES) \
-	$(service_test_SOURCES) $(udpclient_test_SOURCES)
-DIST_SOURCES = $(helmetd_SOURCES) $(server_test_SOURCES) \
-	$(service_test_SOURCES) $(udpclient_test_SOURCES)
+SOURCES = $(helmetd_SOURCES) $(service_test_SOURCES) \
+	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
+DIST_SOURCES = $(helmetd_SOURCES) $(service_test_SOURCES) \
+	$(tunclient_test_SOURCES) $(udpclient_test_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -244,7 +244,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -pthread 
+LDFLAGS = -pthread
 LIBOBJS = 
 LIBS = -Wl,--as-need -lprotobuf-lite
 LTLIBOBJS = 
@@ -313,20 +313,21 @@ top_builddir = .
 top_srcdir = .
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
 helmetd_SOURCES = helmetd.cpp \
-	server.cpp server.hpp \
+	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
+	resolver.cpp resolver.hpp \
+	iprouter.cpp iprouter.hpp
 
-server_test_SOURCES = server_test.cpp \
-	server.cpp server.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 \
-	server.cpp server.hpp \
+	tunclient.cpp tunclient.hpp \
 	service.cpp service.hpp \
 	interface.cpp interface.hpp
 
@@ -439,14 +440,14 @@ 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)
 
+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)
+
 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)
@@ -829,8 +830,8 @@ uninstall-am: uninstall-sbinPROGRAMS
 .PRECIOUS: Makefile
 
 
-test: udpclient_test
-	./udpclient_test
+test: tunclient_test
+	./tunclient_test
 
 run: helmetd
 	./helmetd