diff --git a/.buzzy/package.yaml b/.buzzy/package.yaml index b903965..bb1a9e8 100644 --- a/.buzzy/package.yaml +++ b/.buzzy/package.yaml @@ -1,4 +1,4 @@ -name: ipset +name: libcorkipset build_dependencies: - pkg-config - check >= 0.9.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4711de2..9baea7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ # ---------------------------------------------------------------------- cmake_minimum_required(VERSION 2.6) -set(PROJECT_NAME ipset) +set(PROJECT_NAME libcorkipset) set(RELEASE_DATE 2013-12-11) project(${PROJECT_NAME}) enable_testing() diff --git a/INSTALL b/INSTALL index 62b693e..c8b5256 100644 --- a/INSTALL +++ b/INSTALL @@ -1,25 +1,25 @@ Installation instructions ========================= -The ipset library is written in ANSI C. It uses cmake as its build +The libcorkipset library is written in ANSI C. It uses cmake as its build manager. Prerequisite libraries ---------------------- -To build ipset, you need the following libraries installed on your +To build libcorkipset, you need the following libraries installed on your system: * pkg-config - * libcork (https://github.com/redjack/libcork) + * libcork (https://github.com/dcreager/libcork) * check (http://check.sourceforge.net) Building from source -------------------- -The ipset library uses cmake as its build manager. In most cases, you +The libcorkipset library uses cmake as its build manager. In most cases, you should be able to build the source code using the following: $ mkdir build diff --git a/README.markdown b/README.markdown index 2099d6f..2fcd0bd 100644 --- a/README.markdown +++ b/README.markdown @@ -2,7 +2,7 @@ [![Build Status](https://img.shields.io/travis/redjack/ipset/develop.svg)](https://travis-ci.org/redjack/ipset) -The ipset library provides C data types for storing sets of IP +The libcorkipset library provides C data types for storing sets of IP addresses, and maps of IP addresses to integers. It supports both IPv4 and IPv6 addresses. It's implemented using [Binary Decision Diagrams](http://en.wikipedia.org/wiki/Binary_decision_diagram) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b05b8b0..b6ab1de 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,5 +17,5 @@ add_c_executable( LIBRARIES libcork LOCAL_LIBRARIES - libipset + libcorkipset ) diff --git a/examples/ipv4-set-size.c b/examples/ipv4-set-size.c index f8f3b20..13f4c4a 100644 --- a/examples/ipv4-set-size.c +++ b/examples/ipv4-set-size.c @@ -13,7 +13,7 @@ #include #include -#include +#include static inline void diff --git a/include/ipset/ipset.h b/include/libcork/ipset.h similarity index 98% rename from include/ipset/ipset.h rename to include/libcork/ipset.h index 85d7d2b..94b28e2 100644 --- a/include/ipset/ipset.h +++ b/include/libcork/ipset.h @@ -7,15 +7,14 @@ * ---------------------------------------------------------------------- */ -#ifndef IPSET_IPSET_H -#define IPSET_IPSET_H +#ifndef LIBCORK_IPSET_H +#define LIBCORK_IPSET_H #include #include #include - -#include +#include struct ip_set { @@ -261,4 +260,4 @@ int ipmap_ip_get(struct ip_map *map, struct cork_ip *addr); -#endif /* IPSET_IPSET_H */ +#endif /* LIBCORK_IPSET_H */ diff --git a/include/ipset/bits.h b/include/libcork/ipset/bits.h similarity index 94% rename from include/ipset/bits.h rename to include/libcork/ipset/bits.h index aaf1d1e..63abedd 100644 --- a/include/ipset/bits.h +++ b/include/libcork/ipset/bits.h @@ -7,8 +7,8 @@ * ---------------------------------------------------------------------- */ -#ifndef IPSET_BITS_H -#define IPSET_BITS_H +#ifndef LIBCORK_IPSET_BITS_H +#define LIBCORK_IPSET_BITS_H #include @@ -54,4 +54,4 @@ | ((val)? IPSET_BIT_ON_MASK(i): 0)) -#endif /* IPSET_BITS_H */ +#endif /* LIBCORK_IPSET_BITS_H */ diff --git a/include/ipset/errors.h b/include/libcork/ipset/errors.h similarity index 85% rename from include/ipset/errors.h rename to include/libcork/ipset/errors.h index a17810d..ca0f37e 100644 --- a/include/ipset/errors.h +++ b/include/libcork/ipset/errors.h @@ -7,8 +7,8 @@ * ---------------------------------------------------------------------- */ -#ifndef IPSET_ERRORS_H -#define IPSET_ERRORS_H +#ifndef LIBCORK_IPSET_ERRORS_H +#define LIBCORK_IPSET_ERRORS_H #include @@ -27,4 +27,4 @@ enum ipset_error { }; -#endif /* IPSET_ERRORS_H */ +#endif /* LIBCORK_IPSET_ERRORS_H */ diff --git a/include/ipset/logging.h b/include/libcork/ipset/logging.h similarity index 85% rename from include/ipset/logging.h rename to include/libcork/ipset/logging.h index 6a2ecdc..00519b7 100644 --- a/include/ipset/logging.h +++ b/include/libcork/ipset/logging.h @@ -7,8 +7,8 @@ * ---------------------------------------------------------------------- */ -#ifndef IPSET_LOGGING_H -#define IPSET_LOGGING_H +#ifndef LIBCORK_IPSET_LOGGING_H +#define LIBCORK_IPSET_LOGGING_H #if !defined(IPSET_DEBUG) @@ -27,4 +27,4 @@ #endif -#endif /* IPSET_LOGGING_H */ +#endif /* LIBCORK_IPSET_LOGGING_H */ diff --git a/include/ipset/bdd/nodes.h b/include/libcork/ipset/nodes.h similarity index 99% rename from include/ipset/bdd/nodes.h rename to include/libcork/ipset/nodes.h index 16edae8..cea8076 100644 --- a/include/ipset/bdd/nodes.h +++ b/include/libcork/ipset/nodes.h @@ -7,8 +7,8 @@ * ---------------------------------------------------------------------- */ -#ifndef IPSET_BDD_NODES_H -#define IPSET_BDD_NODES_H +#ifndef LIBCORK_IPSET_NODES_H +#define LIBCORK_IPSET_NODES_H #include @@ -532,4 +532,4 @@ void ipset_bdd_iterator_advance(struct ipset_bdd_iterator *iterator); -#endif /* IPSET_BDD_NODES_H */ +#endif /* LIBCORK_IPSET_NODES_H */ diff --git a/include/libcorkipset/ipset.h b/include/libcorkipset/ipset.h new file mode 100644 index 0000000..8703d86 --- /dev/null +++ b/include/libcorkipset/ipset.h @@ -0,0 +1,16 @@ +/* -*- coding: utf-8 -*- + * ---------------------------------------------------------------------- + * Copyright © 2017, libcorkipset authors + * All rights reserved. + * + * Please see the COPYING file in this distribution for license details. + * ---------------------------------------------------------------------- + */ + +#ifndef LIBCORKIPSET_IPSET_H +#define LIBCORKIPSET_IPSET_H + +#warning " is deprecated; use instead" +#include + +#endif /* LIBCORKIPSET_IPSET_H */ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45df633..417dc50 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,30 +35,30 @@ # [1] http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info add_c_library( - libipset - OUTPUT_NAME ipset - PKGCONFIG_NAME ipset + libcorkipset + OUTPUT_NAME corkipset + PKGCONFIG_NAME libcorkipset VERSION_INFO 2:0:1 SOURCES - libipset/general.c - libipset/bdd/assignments.c - libipset/bdd/basics.c - libipset/bdd/bdd-iterator.c - libipset/bdd/expanded.c - libipset/bdd/reachable.c - libipset/bdd/read.c - libipset/bdd/write.c - libipset/map/allocation.c - libipset/map/inspection.c - libipset/map/ipv4_map.c - libipset/map/ipv6_map.c - libipset/map/storage.c - libipset/set/allocation.c - libipset/set/inspection.c - libipset/set/ipv4_set.c - libipset/set/ipv6_set.c - libipset/set/iterator.c - libipset/set/storage.c + libcorkipset/general.c + libcorkipset/bdd/assignments.c + libcorkipset/bdd/basics.c + libcorkipset/bdd/bdd-iterator.c + libcorkipset/bdd/expanded.c + libcorkipset/bdd/reachable.c + libcorkipset/bdd/read.c + libcorkipset/bdd/write.c + libcorkipset/map/allocation.c + libcorkipset/map/inspection.c + libcorkipset/map/ipv4_map.c + libcorkipset/map/ipv6_map.c + libcorkipset/map/storage.c + libcorkipset/set/allocation.c + libcorkipset/set/inspection.c + libcorkipset/set/ipv4_set.c + libcorkipset/set/ipv6_set.c + libcorkipset/set/iterator.c + libcorkipset/set/storage.c LIBRARIES libcork ) @@ -71,7 +71,7 @@ add_c_executable( OUTPUT_NAME ipsetbuild SOURCES ipsetbuild/ipsetbuild.c LOCAL_LIBRARIES - libipset + libcorkipset ) add_c_executable( @@ -79,7 +79,7 @@ add_c_executable( OUTPUT_NAME ipsetcat SOURCES ipsetcat/ipsetcat.c LOCAL_LIBRARIES - libipset + libcorkipset ) add_c_executable( @@ -87,5 +87,5 @@ add_c_executable( OUTPUT_NAME ipsetdot SOURCES ipsetdot/ipsetdot.c LOCAL_LIBRARIES - libipset + libcorkipset ) diff --git a/src/ipsetbuild/ipsetbuild.c b/src/ipsetbuild/ipsetbuild.c index cf49505..06ef5a7 100644 --- a/src/ipsetbuild/ipsetbuild.c +++ b/src/ipsetbuild/ipsetbuild.c @@ -17,7 +17,7 @@ #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" static char *output_filename = NULL; diff --git a/src/ipsetcat/ipsetcat.c b/src/ipsetcat/ipsetcat.c index dff6c5b..85d4b65 100644 --- a/src/ipsetcat/ipsetcat.c +++ b/src/ipsetcat/ipsetcat.c @@ -17,7 +17,7 @@ #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" static char *input_filename = NULL; diff --git a/src/ipsetdot/ipsetdot.c b/src/ipsetdot/ipsetdot.c index 3ec917b..1b739ac 100644 --- a/src/ipsetdot/ipsetdot.c +++ b/src/ipsetdot/ipsetdot.c @@ -17,7 +17,7 @@ #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" static char *input_filename = NULL; diff --git a/src/ipset.pc.in b/src/libcorkipset.pc.in similarity index 66% rename from src/ipset.pc.in rename to src/libcorkipset.pc.in index 37b00a8..a6ebf30 100644 --- a/src/ipset.pc.in +++ b/src/libcorkipset.pc.in @@ -3,12 +3,12 @@ exec_prefix=${prefix} libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ sharedir=${prefix}/share -sphinxdir=${sharedir}/doc/ipset/html +sphinxdir=${sharedir}/doc/libcorkipset/html -Name: ipset +Name: libcorkipset Description: Library for storing IP sets and maps Version: @VERSION@ -URL: http://github.com/dcreager/ipset/ +URL: https://github.com/dcreager/libcorkipset/ Requires: libcork >= 0.12.0 -Libs: -L${libdir} -lipset +Libs: -L${libdir} -lcorkipset Cflags: -I${includedir} diff --git a/src/libipset/bdd/assignments.c b/src/libcorkipset/bdd/assignments.c similarity index 99% rename from src/libipset/bdd/assignments.c rename to src/libcorkipset/bdd/assignments.c index 41bfa81..1fd1a72 100644 --- a/src/libipset/bdd/assignments.c +++ b/src/libcorkipset/bdd/assignments.c @@ -9,7 +9,7 @@ #include -#include "ipset/bdd/nodes.h" +#include "libcork/ipset/nodes.h" struct ipset_assignment * diff --git a/src/libipset/bdd/basics.c b/src/libcorkipset/bdd/basics.c similarity index 99% rename from src/libipset/bdd/basics.c rename to src/libcorkipset/bdd/basics.c index 6a1653d..04ca15e 100644 --- a/src/libipset/bdd/basics.c +++ b/src/libcorkipset/bdd/basics.c @@ -12,9 +12,9 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" -#include "ipset/logging.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" void diff --git a/src/libipset/bdd/bdd-iterator.c b/src/libcorkipset/bdd/bdd-iterator.c similarity index 98% rename from src/libipset/bdd/bdd-iterator.c rename to src/libcorkipset/bdd/bdd-iterator.c index 87e24d8..091404b 100644 --- a/src/libipset/bdd/bdd-iterator.c +++ b/src/libcorkipset/bdd/bdd-iterator.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/logging.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" /** diff --git a/src/libipset/bdd/expanded.c b/src/libcorkipset/bdd/expanded.c similarity index 97% rename from src/libipset/bdd/expanded.c rename to src/libcorkipset/bdd/expanded.c index 794a37c..54f6fde 100644 --- a/src/libipset/bdd/expanded.c +++ b/src/libcorkipset/bdd/expanded.c @@ -11,9 +11,9 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" -#include "ipset/logging.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" static void diff --git a/src/libipset/bdd/reachable.c b/src/libcorkipset/bdd/reachable.c similarity index 97% rename from src/libipset/bdd/reachable.c rename to src/libcorkipset/bdd/reachable.c index 9ed2d3e..f81c21e 100644 --- a/src/libipset/bdd/reachable.c +++ b/src/libcorkipset/bdd/reachable.c @@ -10,8 +10,8 @@ #include #include -#include "ipset/bdd/nodes.h" -#include "ipset/logging.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" size_t diff --git a/src/libipset/bdd/read.c b/src/libcorkipset/bdd/read.c similarity index 98% rename from src/libipset/bdd/read.c rename to src/libcorkipset/bdd/read.c index a46e803..be36711 100644 --- a/src/libipset/bdd/read.c +++ b/src/libcorkipset/bdd/read.c @@ -15,9 +15,9 @@ #include #include -#include "ipset/bdd/nodes.h" -#include "ipset/errors.h" -#include "ipset/logging.h" +#include "libcork/ipset/errors.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" static const char MAGIC_NUMBER[] = "IP set"; diff --git a/src/libipset/bdd/write.c b/src/libcorkipset/bdd/write.c similarity index 99% rename from src/libipset/bdd/write.c rename to src/libcorkipset/bdd/write.c index 6d50969..8582a9f 100644 --- a/src/libipset/bdd/write.c +++ b/src/libcorkipset/bdd/write.c @@ -10,8 +10,8 @@ #include #include -#include "ipset/bdd/nodes.h" -#include "ipset/logging.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" /*----------------------------------------------------------------------- diff --git a/src/libipset/general.c b/src/libcorkipset/general.c similarity index 86% rename from src/libipset/general.c rename to src/libcorkipset/general.c index 9a0e550..d528f27 100644 --- a/src/libipset/general.c +++ b/src/libcorkipset/general.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" int diff --git a/src/libipset/map/allocation.c b/src/libcorkipset/map/allocation.c similarity index 94% rename from src/libipset/map/allocation.c rename to src/libcorkipset/map/allocation.c index cf9aebe..9bde5a1 100644 --- a/src/libipset/map/allocation.c +++ b/src/libcorkipset/map/allocation.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" void diff --git a/src/libipset/map/inspection-template.c.in b/src/libcorkipset/map/inspection-template.c.in similarity index 94% rename from src/libipset/map/inspection-template.c.in rename to src/libcorkipset/map/inspection-template.c.in index 2f821fb..0676edf 100644 --- a/src/libipset/map/inspection-template.c.in +++ b/src/libcorkipset/map/inspection-template.c.in @@ -9,10 +9,10 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" -#include "ipset/errors.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/errors.h" +#include "libcork/ipset/nodes.h" /** diff --git a/src/libipset/map/inspection.c b/src/libcorkipset/map/inspection.c similarity index 96% rename from src/libipset/map/inspection.c rename to src/libcorkipset/map/inspection.c index 5d2cf00..1b5d88a 100644 --- a/src/libipset/map/inspection.c +++ b/src/libcorkipset/map/inspection.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" bool ipmap_is_empty(const struct ip_map *map) diff --git a/src/libipset/map/ipv4_map.c b/src/libcorkipset/map/ipv4_map.c similarity index 100% rename from src/libipset/map/ipv4_map.c rename to src/libcorkipset/map/ipv4_map.c diff --git a/src/libipset/map/ipv6_map.c b/src/libcorkipset/map/ipv6_map.c similarity index 100% rename from src/libipset/map/ipv6_map.c rename to src/libcorkipset/map/ipv6_map.c diff --git a/src/libipset/map/storage.c b/src/libcorkipset/map/storage.c similarity index 96% rename from src/libipset/map/storage.c rename to src/libcorkipset/map/storage.c index 7593904..c435612 100644 --- a/src/libipset/map/storage.c +++ b/src/libcorkipset/map/storage.c @@ -14,9 +14,9 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/errors.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/errors.h" +#include "libcork/ipset/nodes.h" static void diff --git a/src/libipset/set/allocation.c b/src/libcorkipset/set/allocation.c similarity index 93% rename from src/libipset/set/allocation.c rename to src/libcorkipset/set/allocation.c index 0f4ed44..249eff7 100644 --- a/src/libipset/set/allocation.c +++ b/src/libcorkipset/set/allocation.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" void diff --git a/src/libipset/set/inspection-template.c.in b/src/libcorkipset/set/inspection-template.c.in similarity index 96% rename from src/libipset/set/inspection-template.c.in rename to src/libcorkipset/set/inspection-template.c.in index 832fd33..79002cc 100644 --- a/src/libipset/set/inspection-template.c.in +++ b/src/libcorkipset/set/inspection-template.c.in @@ -9,10 +9,10 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" -#include "ipset/errors.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/errors.h" +#include "libcork/ipset/nodes.h" /** diff --git a/src/libipset/set/inspection.c b/src/libcorkipset/set/inspection.c similarity index 97% rename from src/libipset/set/inspection.c rename to src/libcorkipset/set/inspection.c index 2edb173..059e54f 100644 --- a/src/libipset/set/inspection.c +++ b/src/libcorkipset/set/inspection.c @@ -9,8 +9,8 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" bool ipset_is_empty(const struct ip_set *set) diff --git a/src/libipset/set/ipv4_set.c b/src/libcorkipset/set/ipv4_set.c similarity index 100% rename from src/libipset/set/ipv4_set.c rename to src/libcorkipset/set/ipv4_set.c diff --git a/src/libipset/set/ipv6_set.c b/src/libcorkipset/set/ipv6_set.c similarity index 100% rename from src/libipset/set/ipv6_set.c rename to src/libcorkipset/set/ipv6_set.c diff --git a/src/libipset/set/iterator.c b/src/libcorkipset/set/iterator.c similarity index 98% rename from src/libipset/set/iterator.c rename to src/libcorkipset/set/iterator.c index 5f03890..5956f26 100644 --- a/src/libipset/set/iterator.c +++ b/src/libcorkipset/set/iterator.c @@ -11,10 +11,10 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" -#include "ipset/ipset.h" -#include "ipset/logging.h" +#include "libcork/ipset.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/logging.h" +#include "libcork/ipset/nodes.h" #define IPV4_BIT_SIZE 32 diff --git a/src/libipset/set/storage.c b/src/libcorkipset/set/storage.c similarity index 96% rename from src/libipset/set/storage.c rename to src/libcorkipset/set/storage.c index cd0a01e..0779c22 100644 --- a/src/libipset/set/storage.c +++ b/src/libcorkipset/set/storage.c @@ -14,9 +14,9 @@ #include -#include "ipset/bdd/nodes.h" -#include "ipset/errors.h" -#include "ipset/ipset.h" +#include "libcork/ipset.h" +#include "libcork/ipset/nodes.h" +#include "libcork/ipset/errors.h" static void diff --git a/tests/test-assignment.c b/tests/test-assignment.c index c2f0c16..8c817e3 100644 --- a/tests/test-assignment.c +++ b/tests/test-assignment.c @@ -13,8 +13,8 @@ #include #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/nodes.h" /*----------------------------------------------------------------------- diff --git a/tests/test-bdd.c b/tests/test-bdd.c index 4ecac91..cfc8927 100644 --- a/tests/test-bdd.c +++ b/tests/test-bdd.c @@ -13,8 +13,8 @@ #include #include -#include "ipset/bdd/nodes.h" -#include "ipset/bits.h" +#include "libcork/ipset/bits.h" +#include "libcork/ipset/nodes.h" #define DESCRIBE_TEST fprintf(stderr, "---\n%s\n", __func__) diff --git a/tests/test-ipmap.c b/tests/test-ipmap.c index 4fd4187..2f0ca77 100644 --- a/tests/test-ipmap.c +++ b/tests/test-ipmap.c @@ -13,7 +13,7 @@ #include #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" #define DESCRIBE_TEST fprintf(stderr, "---\n%s\n", __func__) diff --git a/tests/test-ipset.c b/tests/test-ipset.c index e6b5cc7..21dda26 100644 --- a/tests/test-ipset.c +++ b/tests/test-ipset.c @@ -13,7 +13,7 @@ #include #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" #define DESCRIBE_TEST fprintf(stderr, "---\n%s\n", __func__) diff --git a/tests/test-iterator.c b/tests/test-iterator.c index 1270aba..a46c8d6 100644 --- a/tests/test-iterator.c +++ b/tests/test-iterator.c @@ -12,7 +12,7 @@ #include #include -#include "ipset/ipset.h" +#include "libcork/ipset.h" #define IPV4_BIT_SIZE 32