pycapng 0.7__tar.gz → 0.8__tar.gz

pycapng-0.8/.github/workflows/windows-library.yml

@@ -0,0 +1,118 @@
+name: windows library
+
+# Publishes libpcapng as a consumable Windows C library — the DLL, the MinGW
+# import library, a static lib and the headers — attached to the GitHub release.
+# (The wheels in release.yml are the Python story; this is the C one.)
+#
+# Live capture has no Windows backend: capture.c compiles its "unsupported
+# platform" stubs there, so the library is file-analysis only. See win_compat.h.
+
+on:
+  push:
+    tags: ['v*']
+  workflow_dispatch:
+
+jobs:
+  windows-library:
+    name: windows-x86_64
+    runs-on: windows-latest
+    permissions:
+      contents: write          # to attach assets to the release
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          update: true
+          # libpcapng has no external dependencies — just a toolchain.
+          pacboy: toolchain:p cmake:p ninja:p
+          install: zip
+
+      - uses: actions/checkout@v4
+
+      - name: Build
+        run: |
+          # The Python bindings need pybind11 at configure time and are off by
+          # default on Windows; be explicit so this doesn't depend on that.
+          cmake -S . -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DLIBPCAPNG_BINDINGS=OFF
+          cmake --build build --target pcapng pcapng_static -j "$(nproc)"
+
+      - name: Package
+        id: pkg
+        run: |
+          VERSION="${GITHUB_REF_NAME#v}"
+          case "$GITHUB_REF" in refs/tags/*) ;; *) VERSION="dev" ;; esac
+          NAME="libpcapng-$VERSION-windows-x86_64"
+          OUT="dist/$NAME"
+          mkdir -p "$OUT/bin" "$OUT/lib" "$OUT/include"
+
+          cp build/lib/libpcapng.dll        "$OUT/bin/"
+          cp build/lib/libpcapng.dll.a      "$OUT/lib/"
+          cp build/lib/libpcapng_static.a   "$OUT/lib/" 2>/dev/null || true
+          cp -R lib/include/libpcapng       "$OUT/include/"
+
+          # Ship the MinGW runtime DLLs the library was linked against, so the
+          # zip works without an MSYS2 install. /c/Windows DLLs are the OS's.
+          ldd "$OUT/bin/libpcapng.dll" | awk '/=>/ {print $3}' | while read -r dll; do
+            [ -f "$dll" ] || continue
+            case "$(printf '%s' "$dll" | tr 'A-Z' 'a-z')" in /c/windows/*) continue ;; esac
+            cp -f "$dll" "$OUT/bin/"
+          done
+
+          cat > "$OUT/README.txt" <<'TXT'
+          libpcapng — Windows (MinGW-w64 / UCRT64) C library
+
+            include/   headers  — add to your include path
+            lib/       libpcapng.dll.a (import lib), libpcapng_static.a
+            bin/       libpcapng.dll + the MinGW runtime DLLs it needs
+
+          Link with -lpcapng -lws2_32 (the dissectors use ntohs/inet_ntop).
+
+          Built with MinGW-w64/UCRT64. The import library is ELF-style .dll.a for
+          GCC/Clang; MSVC users must generate a .lib from the DLL themselves.
+
+          Live capture is NOT supported on Windows — the capture API compiles to
+          stubs that fail cleanly. Reading and dissecting capture files works.
+          TXT
+
+          ( cd dist && zip -qr "$NAME.zip" "$NAME" )
+          echo "zip=dist/$NAME.zip" >> "$GITHUB_OUTPUT"
+
+      - name: Smoke-test the import library
+        run: |
+          # Link a real consumer against the packaged import lib + headers: this
+          # is what proves the zip is actually usable, not just that it built.
+          NAME="$(basename "${{ steps.pkg.outputs.zip }}" .zip)"
+          cat > /tmp/consumer.c <<'C'
+          #include <libpcapng/capture.h>
+          #include <stdio.h>
+          int main(void) {
+              char err[PCAPNG_CAPTURE_ERRBUF_SIZE] = {0};
+              int n = -1;
+              /* Windows has no capture backend: expect an empty device list and
+                 a clean error, not a crash. */
+              pcapng_capture_list_devices(&n, err);
+              printf("devices=%d err=%s\n", n, err);
+              return n == 0 ? 0 : 1;
+          }
+          C
+          gcc /tmp/consumer.c -o /tmp/consumer.exe \
+            -I"dist/$NAME/include" -L"dist/$NAME/lib" -lpcapng -lws2_32
+          cp dist/$NAME/bin/*.dll /tmp/
+          /tmp/consumer.exe
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: libpcapng-windows-x86_64
+          path: ${{ steps.pkg.outputs.zip }}
+
+      - name: Attach to release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ${{ steps.pkg.outputs.zip }}

{pycapng-0.7 → pycapng-0.8}/CMakeLists.txt

@@ -37,7 +37,14 @@ install(FILES "${libpcapng_BINARY_DIR}/libpcapng.pc" DESTINATION "${CMAKE_INSTAL
 
 include_directories(AFTER ${libpcapng_SOURCE_DIR}/lib/include)
 
-option(LIBPCAPNG_BINDINGS "Build the Python (pybind11) bindings" ON)
+# The Python bindings need pybind11 at configure time; the Windows packaging
+# build only wants the C library, so default them off there.
+if(WIN32)
+  set(_bindings_default OFF)
+else()
+  set(_bindings_default ON)
+endif()
+option(LIBPCAPNG_BINDINGS "Build the Python (pybind11) bindings" ${_bindings_default})
 if(LIBPCAPNG_BINDINGS)
   find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
   set(PYBIND11_FINDPYTHON ON)

{pycapng-0.7 → pycapng-0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pycapng
-Version: 0.7
+Version: 0.8
 Summary: Python bindings for libpcapng — read/write pcapng files and live packet capture
 Keywords: pcapng,pcap,packet-capture,network,packet,wireshark
 Author-Email: Seb Tricaud <sebastien.tricaud@proton.me>

{pycapng-0.7 → pycapng-0.8}/bindings/python/pycapng.cpp

@@ -708,6 +708,24 @@ int PcapNG::foreach_packet_cb(uint32_t block_counter, uint32_t block_type, uint3
     return 0;
   }
 
+  if (block_type == PCAPNG_SIMPLE_PACKET_BLOCK) {
+    /*
+     * SPB body: orig_len(4) + pkt_data(min(orig_len, block_total_length-16) bytes, padded)
+     *
+     * Pass orig_len(4) + exact captured bytes (no padding) to Python.
+     * Using the block size avoids libpcapng_padded_count, which incorrectly
+     * strips payload bytes whose values happen to be 0x00.
+     */
+    if (block_total_length < 16) return 0;
+    uint32_t orig_len;
+    memcpy(&orig_len, data, 4);
+    uint32_t captured = block_total_length - 16;
+    uint32_t pkt_len = (orig_len < captured) ? orig_len : captured;
+    cb_func(block_counter, block_type, block_total_length,
+            py::bytes((const char *)data, 4 + pkt_len));
+    return 0;
+  }
+
   // For other block types (SHB, CDB, …) use the generic CDB-based extraction.
   uint32_t start_offset = libpcapng_custom_data_block_start_offset();
   uint32_t data_length = libpcapng_custom_data_block_data_length(block_total_length);

{pycapng-0.7 → pycapng-0.8}/lib/CMakeLists.txt

@@ -77,6 +77,14 @@ set(CMAKE_INSTALL_RPATH "@rpath")
 add_library(pcapng_static STATIC ${LIBPCAPNG_SOURCES})
 set_target_properties(pcapng_static PROPERTIES SOVERSION 1 POSITION_INDEPENDENT_CODE ON)
 
+if(WIN32)
+  # ntohs/inet_ntop & friends live in ws2_32 (see win_compat.h). Exporting all
+  # symbols spares us __declspec(dllexport) annotations on the whole public API.
+  target_link_libraries(pcapng PRIVATE ws2_32)
+  target_link_libraries(pcapng_static PRIVATE ws2_32)
+  set_target_properties(pcapng PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
 install(TARGETS pcapng LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT Libraries)
 install(TARGETS pcapng_static LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT Libraries)
 # Install the header tree preserving the protocols/ subdirectory, so consumers

{pycapng-0.7 → pycapng-0.8}/lib/capture.c

@@ -24,16 +24,24 @@
 #include <time.h>
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <poll.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
+
+/* Windows has no capture backend (see the platform stubs at the bottom of this
+   file), so it needs none of the POSIX socket/mmap machinery — only the byte
+   order + inet_ntop helpers the display-filter engine uses. */
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <sys/socket.h>
+#  include <sys/mman.h>
+#  include <sys/ioctl.h>
+#  include <net/if.h>
+#  include <ifaddrs.h>
+#  include <poll.h>
+#  include <unistd.h>
+#  include <fcntl.h>
+#  include <arpa/inet.h>
+#  include <netinet/in.h>
+#endif
 
 #if defined(__linux__)
 #  include <linux/if_packet.h>
@@ -725,6 +733,11 @@ struct pcapng_capture {
     int          fd;
     uint8_t     *bpf_buf;
     size_t       bpf_buf_size;
+#else
+    /* Unsupported platform (e.g. Windows): the stub backend never opens
+       anything, but the platform-independent layer still tests cap->fd to
+       decide whether to activate, so the member has to exist. */
+    int          fd;
 #endif
 };
 
@@ -734,18 +747,50 @@ static void sigint_handler(int sig) { (void)sig; g_sigint = 1; }
 
 static void install_sigint_handler(void)
 {
+#ifdef _WIN32
+    /* No sigaction on Windows; the CRT's signal() is enough to set the flag. */
+    signal(SIGINT, sigint_handler);
+#else
     struct sigaction sa;
     memset(&sa, 0, sizeof sa);
     sa.sa_handler = sigint_handler;
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = SA_RESTART;
     sigaction(SIGINT, &sa, NULL);
+#endif
 }
 
 /* ========================================================================
  * Device enumeration
  * ======================================================================== */
 
+#ifdef _WIN32
+
+/* Windows has no capture backend, so there is nothing to enumerate. Report the
+   empty list rather than a hard error: callers (carcal's interface chooser)
+   show the message and carry on with file-based analysis. */
+pcapng_device_t *pcapng_capture_list_devices(int *count, char *errbuf)
+{
+    if (errbuf) snprintf(errbuf, PCAPNG_CAPTURE_ERRBUF_SIZE,
+                         "live capture not supported on this platform");
+    if (count) *count = 0;
+    return NULL;
+}
+
+void pcapng_capture_free_devices(pcapng_device_t *devs)
+{
+    free(devs);
+}
+
+const char *pcapng_capture_default_device(char *errbuf)
+{
+    if (errbuf) snprintf(errbuf, PCAPNG_CAPTURE_ERRBUF_SIZE,
+                         "live capture not supported on this platform");
+    return NULL;
+}
+
+#else /* !_WIN32 */
+
 pcapng_device_t *pcapng_capture_list_devices(int *count, char *errbuf)
 {
     struct ifaddrs *ifa_head = NULL, *ifa;
@@ -817,6 +862,8 @@ const char *pcapng_capture_default_device(char *errbuf)
     return found;
 }
 
+#endif /* !_WIN32 */
+
 /* ========================================================================
  * Open / configure
  * ======================================================================== */
@@ -852,6 +899,8 @@ pcapng_capture_t *pcapng_capture_open(const char *device, char *errbuf)
     cap->fd      = -1;
     cap->bpf_buf = NULL;
     cap->bpf_buf_size = CAP_BPF_BUF_SIZE;
+#else
+    cap->fd      = -1;   /* stub backend: never opened, but tested before use */
 #endif
 
     return cap;
@@ -1323,7 +1372,7 @@ int pcapng_capture_dispatch(pcapng_capture_t *cap, int count,
       defined(__OpenBSD__) || defined(__NetBSD__)
     return bsd_dispatch(cap, count, cb, userdata);
 #else
-    return -1;
+    return stub_dispatch(cap, count, cb, userdata);
 #endif
 }
 
@@ -1351,7 +1400,7 @@ int pcapng_capture_loop(pcapng_capture_t *cap, int count,
       defined(__OpenBSD__) || defined(__NetBSD__)
         int n = bsd_dispatch(cap, count > 0 ? count - total : -1, cb, userdata);
 #else
-        int n = -1;
+        int n = stub_dispatch(cap, count > 0 ? count - total : -1, cb, userdata);
 #endif
         if (n < 0) return -1;
         total += n;
@@ -1375,7 +1424,7 @@ int pcapng_capture_get_stats(pcapng_capture_t *cap,
       defined(__OpenBSD__) || defined(__NetBSD__)
     return bsd_get_stats(cap, st);
 #else
-    return -1;
+    return stub_get_stats(cap, st);
 #endif
 }
 
@@ -1387,6 +1436,8 @@ void pcapng_capture_close(pcapng_capture_t *cap)
 #elif defined(__APPLE__) || defined(__FreeBSD__) || \
       defined(__OpenBSD__) || defined(__NetBSD__)
     bsd_close(cap);
+#else
+    stub_close(cap);
 #endif
     filter_free(cap->filter);
     free(cap);

{pycapng-0.7 → pycapng-0.8}/lib/dissect.c

@@ -10,7 +10,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ntp.h>   /* struct libpcapng_ntp_hdr (wire layout)   */
 #include <libpcapng/protocols/bootp.h> /* struct libpcapng_bootp_hdr (DHCP/BOOTP)  */

pycapng-0.8/lib/include/libpcapng/win_compat.h

@@ -0,0 +1,44 @@
+#ifndef _LIBPCAPNG_WIN_COMPAT_H_
+#define _LIBPCAPNG_WIN_COMPAT_H_
+
+/*
+ * Windows compatibility shim for libpcapng.
+ *
+ * The dissectors need only a handful of things from <arpa/inet.h> and
+ * <netinet/in.h> — the byte-order helpers, inet_ntop/inet_pton, struct in_addr
+ * and AF_INET/AF_INET6. On Windows all of those live in <winsock2.h> and
+ * <ws2tcpip.h> instead, so the sources include this header behind #ifdef _WIN32
+ * and the real POSIX headers otherwise. Mirrors gtcaca's win_compat.h.
+ *
+ * Note ntohs/ntohl/htons/htonl come from winsock2 as functions in ws2_32, so a
+ * Windows build must link ws2_32 (the CMakeLists does). They do not require
+ * WSAStartup — neither do inet_ntop/inet_pton, which are pure conversions.
+ *
+ * Live capture is a separate matter: it has no Windows backend at all, and
+ * capture.c compiles its "unsupported platform" stubs instead. See capture.c.
+ */
+#ifdef _WIN32
+
+/* Keep <windows.h> lean and stop it dragging in the old <winsock.h>, which
+   would collide with the <winsock2.h> we actually want. */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#include <winsock2.h>   /* ntohs/ntohl/htons/htonl, AF_INET, struct in_addr */
+#include <ws2tcpip.h>   /* inet_ntop, inet_pton, AF_INET6, struct in6_addr  */
+#include <windows.h>
+
+/* POSIX spelling used by the dissectors (MSVC lacks it; MinGW has _stricmp). */
+#ifndef strcasecmp
+#define strcasecmp(a, b) _stricmp((a), (b))
+#endif
+#ifndef strncasecmp
+#define strncasecmp(a, b, n) _strnicmp((a), (b), (n))
+#endif
+
+#endif /* _WIN32 */
+#endif /* _LIBPCAPNG_WIN_COMPAT_H_ */

{pycapng-0.7 → pycapng-0.8}/lib/protocols/dhcp.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/udp.h>
 #include <libpcapng/protocols/dhcp.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/dns.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/udp.h>
 #include <libpcapng/protocols/dns.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/icmp.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ethernet.h>
 #include <libpcapng/protocols/ipv4.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/ipv4.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ipv4.h>
 

{pycapng-0.7 → pycapng-0.8}/lib/protocols/ntp.c

@@ -1,5 +1,9 @@
 #include <string.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 #include <time.h>
 
 #include <libpcapng/protocols/udp.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/rdp.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/easyapi.h>
 #include <libpcapng/protocols/asn1.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/ssl.c

@@ -1,7 +1,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ssl.h>
 

{pycapng-0.7 → pycapng-0.8}/lib/protocols/tcp.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ethernet.h>
 #include <libpcapng/protocols/tcp.h>

{pycapng-0.7 → pycapng-0.8}/lib/protocols/udp.c

@@ -2,7 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <arpa/inet.h>
+#ifdef _WIN32
+#  include <libpcapng/win_compat.h>
+#else
+#  include <arpa/inet.h>
+#endif
 
 #include <libpcapng/protocols/ethernet.h>
 #include <libpcapng/protocols/udp.h>