Merge pull request #40 from firehol/ipv6-support

Add IPv6 support with --ipv4/-4 and --ipv6/-6 flags

Author: ktsaou

.github/workflows/sync-wiki.yml

@@ -0,0 +1,37 @@
+name: Sync wiki
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'wiki/**'
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Checkout wiki
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}.wiki
+          path: wiki-repo
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Sync wiki files
+        run: |
+          cp wiki/*.md wiki-repo/
+          cd wiki-repo
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -A
+          if git diff --cached --quiet; then
+            echo "No wiki changes to sync"
+          else
+            git commit -m "Sync wiki from repo"
+            git push
+          fi

CMakeLists.txt

@@ -1,14 +1,65 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.10)
 project(iprange C)
 
-find_package (Threads)
+find_package(Threads REQUIRED)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat-signedness -Werror=format-security")
+include(CheckTypeSize)
+check_type_size("__uint128_t" UINT128_SIZE LANGUAGE C)
+if(NOT HAVE_UINT128_SIZE)
+    message(FATAL_ERROR "Compiler does not support __uint128_t, required for IPv6")
+endif()
 
-set(SOURCE_FILES
-        src/iprange.c src/ipset.c src/ipset.h src/iprange.h src/ipset_binary.c src/ipset_binary.h src/ipset_load.c src/ipset_load.h src/ipset_reduce.c src/ipset_print.c src/ipset_print.h src/ipset_optimize.c src/ipset_optimize.h src/ipset_reduce.h src/ipset_diff.c src/ipset_diff.h src/ipset_common.c src/ipset_common.h src/ipset_exclude.c src/ipset_exclude.h src/ipset_merge.c src/ipset_merge.h src/ipset_copy.c src/ipset_copy.h src/ipset_combine.c src/ipset_combine.h)
+# Generate config.h with the defines the source expects
+include(CheckIncludeFile)
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+check_include_file(stdint.h HAVE_STDINT_H)
 
-include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
-add_definitions("-DHAVE_CONFIG_H")
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
 
-add_executable(iprange_git ${SOURCE_FILES})
+set(SOURCES
+    src/iprange.c
+    src/iprange6_main.c
+    src/ipset.c
+    src/ipset6.c
+    src/ipset6_binary.c
+    src/ipset6_combine.c
+    src/ipset6_common.c
+    src/ipset6_copy.c
+    src/ipset6_diff.c
+    src/ipset6_dns.c
+    src/ipset6_exclude.c
+    src/ipset6_load.c
+    src/ipset6_merge.c
+    src/ipset6_optimize.c
+    src/ipset6_print.c
+    src/ipset_binary.c
+    src/ipset_combine.c
+    src/ipset_common.c
+    src/ipset_copy.c
+    src/ipset_diff.c
+    src/ipset_dns.c
+    src/ipset_exclude.c
+    src/ipset_load.c
+    src/ipset_merge.c
+    src/ipset_optimize.c
+    src/ipset_print.c
+    src/ipset_reduce.c
+)
+
+add_executable(iprange ${SOURCES})
+target_include_directories(iprange PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+target_compile_definitions(iprange PRIVATE
+    HAVE_CONFIG_H
+    COMPARE_WITH_COMMON=1
+    VERSION="${PROJECT_VERSION}"
+)
+target_compile_options(iprange PRIVATE
+    -Wall -Wextra -Wformat-signedness -Werror=format-security
+)
+target_link_libraries(iprange Threads::Threads)

Makefile.am

@@ -33,8 +33,27 @@ endif
 iprange_SOURCES = \
 	src/iprange.c \
 	src/iprange.h \
+	src/iprange6.h \
+	src/iprange6_main.c \
 	src/ipset.c \
 	src/ipset.h \
+	src/ipset6.c \
+	src/ipset6.h \
+	src/ipset6_binary.c \
+	src/ipset6_binary.h \
+	src/ipset6_combine.c \
+	src/ipset6_common.c \
+	src/ipset6_copy.c \
+	src/ipset6_diff.c \
+	src/ipset6_dns.c \
+	src/ipset6_dns.h \
+	src/ipset6_exclude.c \
+	src/ipset6_load.c \
+	src/ipset6_load.h \
+	src/ipset6_merge.c \
+	src/ipset6_optimize.c \
+	src/ipset6_print.c \
+	src/ipset6_print.h \
 	src/ipset_binary.c \
 	src/ipset_binary.h \
 	src/ipset_combine.c \
@@ -45,6 +64,8 @@ iprange_SOURCES = \
 	src/ipset_copy.h \
 	src/ipset_diff.c \
 	src/ipset_diff.h \
+	src/ipset_dns.c \
+	src/ipset_dns.h \
 	src/ipset_exclude.c \
 	src/ipset_exclude.h \
 	src/ipset_load.c \
@@ -61,12 +82,26 @@ iprange_SOURCES = \
 
 VPATH_LOCAL_OBJECTS = \
 	src/iprange.$(OBJEXT) \
+	src/iprange6_main.$(OBJEXT) \
 	src/ipset.$(OBJEXT) \
+	src/ipset6.$(OBJEXT) \
+	src/ipset6_binary.$(OBJEXT) \
+	src/ipset6_combine.$(OBJEXT) \
+	src/ipset6_common.$(OBJEXT) \
+	src/ipset6_copy.$(OBJEXT) \
+	src/ipset6_diff.$(OBJEXT) \
+	src/ipset6_dns.$(OBJEXT) \
+	src/ipset6_exclude.$(OBJEXT) \
+	src/ipset6_load.$(OBJEXT) \
+	src/ipset6_merge.$(OBJEXT) \
+	src/ipset6_optimize.$(OBJEXT) \
+	src/ipset6_print.$(OBJEXT) \
 	src/ipset_binary.$(OBJEXT) \
 	src/ipset_combine.$(OBJEXT) \
 	src/ipset_common.$(OBJEXT) \
 	src/ipset_copy.$(OBJEXT) \
 	src/ipset_diff.$(OBJEXT) \
+	src/ipset_dns.$(OBJEXT) \
 	src/ipset_exclude.$(OBJEXT) \
 	src/ipset_load.$(OBJEXT) \
 	src/ipset_merge.$(OBJEXT) \