From 302e8874b89fb670a9dfdc5992ac6c9b20f2122d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 30 Oct 2011 19:52:09 +0000 Subject: [PATCH] making the new mesh the default --- po/POTFILES.in | 2 -- ...sh_service_new.h => gnunet_mesh_service.h} | 0 src/mesh/Makefile.am | 36 +++++++++---------- src/mesh/mesh.h | 2 +- src/mesh/{mesh_api_new.c => mesh_api.c} | 4 +-- src/mesh/test_mesh_api.c | 2 +- src/mesh/test_mesh_local_1.c | 2 +- src/mesh/test_mesh_local_2.c | 2 +- src/mesh/test_mesh_path_api.c | 2 +- src/mesh/test_mesh_small.c | 2 +- src/mesh/test_mesh_small_unicast_far.c | 2 +- src/vpn/Makefile.am | 6 ++-- src/vpn/gnunet-daemon-exit.c | 2 +- src/vpn/gnunet-daemon-vpn-dns.c | 2 +- src/vpn/gnunet-daemon-vpn-helper.c | 2 +- src/vpn/gnunet-daemon-vpn.c | 2 +- src/vpn/gnunet-service-dns.c | 2 +- 17 files changed, 35 insertions(+), 37 deletions(-) rename src/include/{gnunet_mesh_service_new.h => gnunet_mesh_service.h} (100%) rename src/mesh/{mesh_api_new.c => mesh_api.c} (99%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 37e449ec1..e84915b05 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -190,7 +190,6 @@ src/block/plugin_block_dns.c src/block/plugin_block_template.c src/mesh/mesh_api.c src/mesh/mesh_tunnel_tree.c -src/mesh/mesh_api_new.c src/mesh/gnunet-service-mesh.c src/hello/hello.c src/hostlist/hostlist-client.c @@ -291,7 +290,6 @@ src/include/platform.h src/include/gnunet_load_lib.h src/include/gnunet_ats_service.h src/include/gnunet_getopt_lib.h -src/include/gnunet_mesh_service_new.h src/include/gnunet_configuration_lib.h src/include/gnunet_util_lib.h src/include/gnunet_disk_lib.h diff --git a/src/include/gnunet_mesh_service_new.h b/src/include/gnunet_mesh_service.h similarity index 100% rename from src/include/gnunet_mesh_service_new.h rename to src/include/gnunet_mesh_service.h diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 341ce4699..b186b3188 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -15,7 +15,7 @@ bin_PROGRAMS = \ gnunet-service-mesh lib_LTLIBRARIES = \ - libgnunetmeshnew.la + libgnunetmesh.la gnunet_service_mesh_SOURCES = \ gnunet-service-mesh.c mesh_tunnel_tree.c @@ -28,12 +28,12 @@ gnunet_service_mesh_LDADD = \ $(top_builddir)/src/dht/libgnunetdht.la \ $(top_builddir)/src/util/libgnunetutil.la -libgnunetmeshnew_la_SOURCES = \ - mesh_api_new.c mesh.h -libgnunetmeshnew_la_LIBADD = \ +libgnunetmesh_la_SOURCES = \ + mesh_api.c mesh.h +libgnunetmesh_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(XLIB) -libgnunetmeshnew_la_LDFLAGS = \ +libgnunetmesh_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 @@ -50,9 +50,9 @@ test_mesh_api_SOURCES = \ test_mesh_api.c test_mesh_api_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la + $(top_builddir)/src/mesh/libgnunetmesh.la test_mesh_api_DEPENDENCIES = \ - libgnunetmeshnew.la \ + libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la test_mesh_path_api_SOURCES = \ @@ -61,51 +61,51 @@ test_mesh_path_api_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/dht/libgnunetdht.la test_mesh_path_api_DEPENDENCIES = \ - libgnunetmeshnew.la \ + libgnunetmesh.la \ $(top_builddir)/src/dht/libgnunetdht.la test_mesh_local_1_SOURCES = \ test_mesh_local_1.c test_mesh_local_1_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la + $(top_builddir)/src/mesh/libgnunetmesh.la test_mesh_local_1_DEPENDENCIES = \ - libgnunetmeshnew.la + libgnunetmesh.la test_mesh_local_2_SOURCES = \ test_mesh_local_2.c test_mesh_local_2_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la + $(top_builddir)/src/mesh/libgnunetmesh.la test_mesh_local_2_DEPENDENCIES = \ - libgnunetmeshnew.la + libgnunetmesh.la test_mesh_small_unicast_SOURCES = \ test_mesh_small.c test_mesh_small_unicast_LDADD = \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la test_mesh_small_unicast_DEPENDENCIES = \ - libgnunetmeshnew.la + libgnunetmesh.la test_mesh_small_unicast_far_SOURCES = \ test_mesh_small.c test_mesh_small_unicast_far_LDADD = \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la test_mesh_small_unicast_far_DEPENDENCIES = \ - libgnunetmeshnew.la + libgnunetmesh.la test_mesh_small_multicast_SOURCES = \ test_mesh_small.c test_mesh_small_multicast_LDADD = \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testing/libgnunettesting.la test_mesh_small_multicast_DEPENDENCIES = \ - libgnunetmeshnew.la + libgnunetmesh.la if ENABLE_TEST_RUN diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h index 8d6985a31..d0648bd3e 100644 --- a/src/mesh/mesh.h +++ b/src/mesh/mesh.h @@ -36,7 +36,7 @@ #include "gnunet_peer_lib.h" #include "gnunet_core_service.h" #include "gnunet_protocols.h" -#include +#include /******************************************************************************/ /******************** MESH LOCAL MESSAGES *************************/ diff --git a/src/mesh/mesh_api_new.c b/src/mesh/mesh_api.c similarity index 99% rename from src/mesh/mesh_api_new.c rename to src/mesh/mesh_api.c index 1d2586825..33cb41179 100644 --- a/src/mesh/mesh_api_new.c +++ b/src/mesh/mesh_api.c @@ -16,7 +16,7 @@ */ /** - * @file mesh/mesh_api_new.c + * @file mesh/mesh_api.c * @brief mesh api: client implementation of mesh service * @author Bartlomiej Polot * @@ -41,7 +41,7 @@ extern "C" #include "gnunet_client_lib.h" #include "gnunet_util_lib.h" #include "gnunet_peer_lib.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #include "mesh.h" #include "mesh_protocol.h" diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c index 1699097f6..10e16bd42 100644 --- a/src/mesh/test_mesh_api.c +++ b/src/mesh/test_mesh_api.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #define VERBOSE 1 #define VERBOSE_ARM 0 diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 1c9196bb2..a7ca77ccd 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #define VERBOSE 1 #define VERBOSE_ARM 0 diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index ee1e6c46a..a2f5dd759 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c @@ -27,7 +27,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #define VERBOSE 1 #define VERBOSE_ARM 0 diff --git a/src/mesh/test_mesh_path_api.c b/src/mesh/test_mesh_path_api.c index d5aea7ebc..eb3ce57db 100644 --- a/src/mesh/test_mesh_path_api.c +++ b/src/mesh/test_mesh_path_api.c @@ -28,7 +28,7 @@ #include "gnunet_common.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #include "mesh.h" #include "mesh_tunnel_tree.h" diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index 3c80a80f0..1110a36f7 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "gnunet_testing_lib.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #define VERBOSE GNUNET_YES #define REMOVE_DIR GNUNET_YES diff --git a/src/mesh/test_mesh_small_unicast_far.c b/src/mesh/test_mesh_small_unicast_far.c index f5bab6fb4..e35922929 100644 --- a/src/mesh/test_mesh_small_unicast_far.c +++ b/src/mesh/test_mesh_small_unicast_far.c @@ -24,7 +24,7 @@ */ #include "platform.h" #include "gnunet_testing_lib.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #define VERBOSE GNUNET_YES #define REMOVE_DIR GNUNET_YES diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 7999990fe..0c61aa904 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am @@ -42,7 +42,7 @@ gnunet_daemon_vpn_LDADD = \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(GN_LIBINTL) gnunet_service_dns_SOURCES = \ @@ -53,7 +53,7 @@ gnunet_service_dns_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/dht/libgnunetdht.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(GN_LIBINTL) gnunet_daemon_exit_SOURCES = \ @@ -64,7 +64,7 @@ gnunet_daemon_exit_LDADD = \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/mesh/libgnunetmeshnew.la \ + $(top_builddir)/src/mesh/libgnunetmesh.la \ $(GN_LIBINTL) #check_PROGRAMS = \ diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c index 605071837..a6112137d 100644 --- a/src/vpn/gnunet-daemon-exit.c +++ b/src/vpn/gnunet-daemon-exit.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/vpn/gnunet-daemon-vpn-dns.c b/src/vpn/gnunet-daemon-vpn-dns.c index b3a9929a1..7f762238c 100644 --- a/src/vpn/gnunet-daemon-vpn-dns.c +++ b/src/vpn/gnunet-daemon-vpn-dns.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c index 9ee6021c8..81a52e222 100644 --- a/src/vpn/gnunet-daemon-vpn-helper.c +++ b/src/vpn/gnunet-daemon-vpn-helper.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 5b96f201e..33a87cf9b 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c @@ -30,7 +30,7 @@ #include "gnunet_common.h" #include "gnunet_protocols.h" #include "gnunet_applications.h" -#include +#include #include "gnunet_client_lib.h" #include "gnunet_container_lib.h" #include "gnunet_constants.h" diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c index df9d74163..5bf2ed232 100644 --- a/src/vpn/gnunet-service-dns.c +++ b/src/vpn/gnunet-service-dns.c @@ -38,7 +38,7 @@ #include "gnunet_block_lib.h" #include "block_dns.h" #include "gnunet_crypto_lib.h" -#include "gnunet_mesh_service_new.h" +#include "gnunet_mesh_service.h" #include "gnunet_signatures.h" struct GNUNET_MESH_Handle *mesh_handle; -- 2.25.1