dcreager · dcreager · Nov 11, 2017
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
 #include <time.h>
 
 #include <libcork/core.h>
-#include <ipset/ipset.h>
+#include <libcork/ipset.h>
 
 
 static inline void

diff --git a/include/ipset/ipset.h → include/libcork/ipset.h b/include/ipset/ipset.h → 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 <stdio.h>
 
 #include <libcork/core.h>
 #include <libcork/ds.h>
-
-#include <ipset/bdd/nodes.h>
+#include <libcork/ipset/nodes.h>
 
 
 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 → include/libcork/ipset/bits.h b/include/ipset/bits.h → 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 <libcork/core.h>
 
@@ -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 → include/libcork/ipset/errors.h b/include/ipset/errors.h → 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 <libcork/core.h>
@@ -27,4 +27,4 @@ enum ipset_error {
 };
 
 
-#endif  /* IPSET_ERRORS_H */
+#endif  /* LIBCORK_IPSET_ERRORS_H */
diff --git a/include/ipset/logging.h → include/libcork/ipset/logging.h b/include/ipset/logging.h → 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 → include/libcork/ipset/nodes.h b/include/ipset/bdd/nodes.h → 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 <stdio.h>
@@ -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
@@ -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 "<libcorkipset/ipset.h> is deprecated; use <libcork/ipset.h> instead"
+#include <libcork/ipset.h>
+
+#endif  /* LIBCORKIPSET_IPSET_H */
diff --git 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,21 +71,21 @@ add_c_executable(
     OUTPUT_NAME ipsetbuild
     SOURCES ipsetbuild/ipsetbuild.c
     LOCAL_LIBRARIES
-        libipset
+        libcorkipset
 )
 
 add_c_executable(
     ipsetcat
     OUTPUT_NAME ipsetcat
     SOURCES ipsetcat/ipsetcat.c
     LOCAL_LIBRARIES
-        libipset
+        libcorkipset
 )
 
 add_c_executable(
     ipsetdot
     OUTPUT_NAME ipsetdot
     SOURCES ipsetdot/ipsetdot.c
     LOCAL_LIBRARIES
-        libipset
+        libcorkipset
 )
diff --git a/src/ipsetbuild/ipsetbuild.c b/src/ipsetbuild/ipsetbuild.c
@@ -17,7 +17,7 @@
 
 #include <libcork/core.h>
 
-#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
@@ -17,7 +17,7 @@
 
 #include <libcork/core.h>
 
-#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
@@ -17,7 +17,7 @@
 
 #include <libcork/core.h>
 
-#include "ipset/ipset.h"
+#include "libcork/ipset.h"
 
 
 static char  *input_filename = NULL;

diff --git a/src/ipset.pc.in → src/libcorkipset.pc.in b/src/ipset.pc.in → 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 → src/libcorkipset/bdd/assignments.c b/src/libipset/bdd/assignments.c → src/libcorkipset/bdd/assignments.c
@@ -9,7 +9,7 @@
 
 #include <libcork/core.h>
 
-#include "ipset/bdd/nodes.h"
+#include "libcork/ipset/nodes.h"
 
 
 struct ipset_assignment *

diff --git a/src/libipset/bdd/basics.c → src/libcorkipset/bdd/basics.c b/src/libipset/bdd/basics.c → src/libcorkipset/bdd/basics.c
@@ -12,9 +12,9 @@
 
 #include <libcork/core.h>
 
-#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 → src/libcorkipset/bdd/bdd-iterator.c b/src/libipset/bdd/bdd-iterator.c → src/libcorkipset/bdd/bdd-iterator.c
@@ -9,8 +9,8 @@
 
 #include <libcork/core.h>
 
-#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 → src/libcorkipset/bdd/expanded.c b/src/libipset/bdd/expanded.c → src/libcorkipset/bdd/expanded.c
@@ -11,9 +11,9 @@
 
 #include <libcork/core.h>
 
-#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 → src/libcorkipset/bdd/reachable.c b/src/libipset/bdd/reachable.c → src/libcorkipset/bdd/reachable.c
@@ -10,8 +10,8 @@
 #include <libcork/core.h>
 #include <libcork/ds.h>
 
-#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 → src/libcorkipset/bdd/read.c b/src/libipset/bdd/read.c → src/libcorkipset/bdd/read.c
@@ -15,9 +15,9 @@
 #include <libcork/ds.h>
 #include <libcork/helpers/errors.h>
 
-#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 → src/libcorkipset/bdd/write.c b/src/libipset/bdd/write.c → src/libcorkipset/bdd/write.c
@@ -10,8 +10,8 @@
 #include <libcork/core.h>
 #include <libcork/helpers/errors.h>
 
-#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 → src/libcorkipset/general.c b/src/libipset/general.c → src/libcorkipset/general.c
@@ -9,8 +9,8 @@
 
 #include <libcork/core.h>
 
-#include "ipset/bdd/nodes.h"
-#include "ipset/ipset.h"
+#include "libcork/ipset.h"
+#include "libcork/ipset/nodes.h"
 
 
 int