From 30ac38a14d6117a662014f231a8e2974985dac08 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 8 Jan 2018 17:11:33 +0000 Subject: [PATCH] Hide all functions that we don't want to make public Signed-off-by: Michael Tremer --- Makefile.am | 19 +++++++++++++++ src/libloc.sym | 56 ++++++++++++++++++++++---------------------- src/loc/as.h | 4 ++++ src/loc/format.h | 4 ++++ src/loc/libloc.h | 3 +++ src/loc/network.h | 3 +++ src/loc/stringpool.h | 3 +++ 7 files changed, 64 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2fa01f9..b431f8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,6 +109,10 @@ src_python_location_la_LIBADD = \ src/libloc.la \ $(PYTHON_LIBS) +TESTS_CFLAGS = \ + $(AM_CFLAGS) \ + -DLIBLOC_PRIVATE + TESTS = \ src/test-libloc \ src/test-stringpool \ @@ -126,29 +130,44 @@ check_PROGRAMS = \ src_test_libloc_SOURCES = \ src/test-libloc.c +src_test_libloc_CFLAGS = \ + $(TESTS_CFLAGS) + src_test_libloc_LDADD = \ src/libloc.la src_test_as_SOURCES = \ src/test-as.c +src_test_as_CFLAGS = \ + $(TESTS_CFLAGS) + src_test_as_LDADD = \ src/libloc.la src_test_network_SOURCES = \ src/test-network.c +src_test_network_CFLAGS = \ + $(TESTS_CFLAGS) + src_test_network_LDADD = \ src/libloc.la src_test_stringpool_SOURCES = \ src/test-stringpool.c +src_test_stringpool_CFLAGS = \ + $(TESTS_CFLAGS) + src_test_stringpool_LDADD = \ src/libloc.la src_test_database_SOURCES = \ src/test-database.c +src_test_database_CFLAGS = \ + $(TESTS_CFLAGS) + src_test_database_LDADD = \ src/libloc.la diff --git a/src/libloc.sym b/src/libloc.sym index 9a28e05..5a99bf6 100644 --- a/src/libloc.sym +++ b/src/libloc.sym @@ -1,5 +1,33 @@ LIBLOC_PRIVATE { global: + # Network Tree + loc_network_tree_add_network; + loc_network_tree_count_networks; + loc_network_tree_count_nodes; + loc_network_tree_dump; + loc_network_tree_new; + loc_network_tree_unref; + + # String Pool + loc_stringpool_add; + loc_stringpool_dump; + loc_stringpool_get; + loc_stringpool_get_size; + loc_stringpool_new; + loc_stringpool_ref; + loc_stringpool_unref; +}; + +LIBLOC_1 { +global: + loc_ref; + loc_get_log_priority; + loc_set_log_fn; + loc_unref; + loc_set_log_priority; + loc_new; + loc_load; + # AS loc_as_cmp; loc_as_get_name; @@ -33,23 +61,6 @@ global: loc_network_str; loc_network_unref; - # Network Tree - loc_network_tree_add_network; - loc_network_tree_count_networks; - loc_network_tree_count_nodes; - loc_network_tree_dump; - loc_network_tree_new; - loc_network_tree_unref; - - # String Pool - loc_stringpool_add; - loc_stringpool_dump; - loc_stringpool_get; - loc_stringpool_get_size; - loc_stringpool_new; - loc_stringpool_ref; - loc_stringpool_unref; - # Writer loc_writer_add_as; loc_writer_add_network; @@ -61,17 +72,6 @@ global: loc_writer_set_vendor; loc_writer_unref; loc_writer_write; -}; - -LIBLOC_1 { -global: - loc_ref; - loc_get_log_priority; - loc_set_log_fn; - loc_unref; - loc_set_log_priority; - loc_new; - loc_load; local: *; }; diff --git a/src/loc/as.h b/src/loc/as.h index b16de84..9990305 100644 --- a/src/loc/as.h +++ b/src/loc/as.h @@ -35,9 +35,13 @@ int loc_as_set_name(struct loc_as* as, const char* name); int loc_as_cmp(struct loc_as* as1, struct loc_as* as2); +#ifdef LIBLOC_PRIVATE + int loc_as_new_from_database_v0(struct loc_ctx* ctx, struct loc_stringpool* pool, struct loc_as** as, const struct loc_database_as_v0* dbobj); int loc_as_to_database_v0(struct loc_as* as, struct loc_stringpool* pool, struct loc_database_as_v0* dbobj); #endif + +#endif diff --git a/src/loc/format.h b/src/loc/format.h index 2c7496b..bfd81ba 100644 --- a/src/loc/format.h +++ b/src/loc/format.h @@ -20,6 +20,9 @@ #include #define LOC_DATABASE_MAGIC "LOCDBXX" + +#ifdef LIBLOC_PRIVATE + #define LOC_DATABASE_VERSION 0 #define LOC_DATABASE_PAGE_SIZE 4096 @@ -83,3 +86,4 @@ struct loc_database_as_v0 { }; #endif +#endif diff --git a/src/loc/libloc.h b/src/loc/libloc.h index 0eca015..2d392fe 100644 --- a/src/loc/libloc.h +++ b/src/loc/libloc.h @@ -37,7 +37,10 @@ int loc_get_log_priority(struct loc_ctx* ctx); void loc_set_log_priority(struct loc_ctx* ctx, int priority); int loc_load(struct loc_ctx* ctx, const char* path); + +#ifdef LIBLOC_PRIVATE int loc_parse_address(struct loc_ctx* ctx, const char* string, struct in6_addr* address); +#endif #ifdef __cplusplus } /* extern "C" */ diff --git a/src/loc/network.h b/src/loc/network.h index f804f79..0b57ae2 100644 --- a/src/loc/network.h +++ b/src/loc/network.h @@ -38,6 +38,8 @@ int loc_network_set_country_code(struct loc_network* network, const char* countr uint32_t loc_network_get_asn(struct loc_network* network); int loc_network_set_asn(struct loc_network* network, uint32_t asn); +#ifdef LIBLOC_PRIVATE + int loc_network_to_database_v0(struct loc_network* network, struct loc_database_network_v0* dbobj); int loc_network_new_from_database_v0(struct loc_ctx* ctx, struct loc_network** network, struct in6_addr* address, const struct loc_database_network_v0* dbobj); @@ -64,3 +66,4 @@ int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node); struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node); #endif +#endif diff --git a/src/loc/stringpool.h b/src/loc/stringpool.h index 29a0eb3..8068242 100644 --- a/src/loc/stringpool.h +++ b/src/loc/stringpool.h @@ -17,6 +17,8 @@ #ifndef LIBLOC_STRINGPOOL_H #define LIBLOC_STRINGPOOL_H +#ifdef LIBLOC_PRIVATE + #include #include @@ -39,3 +41,4 @@ void loc_stringpool_dump(struct loc_stringpool* pool); size_t loc_stringpool_write(struct loc_stringpool* pool, FILE* f); #endif +#endif -- 2.39.2