From 49fe656d8cfd2f05719f4d4f0c33cd2f6ee970b7 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 7 Aug 2026 19:00:47 +0000 Subject: [PATCH] Use the full osctap/ prefix in all project includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The headers under osctap/ included their cross-directory siblings as "ip/..." / "osc/...", which only resolves when the osctap/ directory itself is on the include path. The exported tap::osc INTERFACE target only adds the repo root, so an external consumer including died at "ip/IpEndpointName.h" (verified against main). Every project include in the tree — shipped headers, tests, demos, examples, fuzz targets, and the Android JNI bridge — now uses the full "osctap/..." path from the repo root, so a single include root serves both the library's internal includes and the public prefix (plus the deprecated shim). The extra osctap/ include dir is dropped from the root and Android CMake builds, the ClusterFuzzLite build script and CI fuzz-smoke job switch from -I osctap to -I ., and the doc snippets are updated to match. The only remaining bare include is tests/OscUnitTests.h, a test-local header that resolves relative to its own file. CompatIncludeShim.cpp keeps its deliberate includes. Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_017DGP2KmVV5B9RURrXigPRZ --- .clusterfuzzlite/build.sh | 4 ++-- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 9 ++++----- android/CMakeLists.txt | 2 +- android/osctap_jni.cpp | 4 ++-- demos/osc_send.cpp | 6 +++--- demos/pi5_hub.cpp | 8 ++++---- demos/tcp_send.cpp | 6 +++--- demos/tcp_server.cpp | 6 +++--- docs/EMBEDDED_PICO2W.md | 8 ++++---- docs/GETTING_STARTED.md | 10 +++++----- docs/INTEGRATION_PI5_PICO_ANDROID.md | 4 ++-- docs/OSC_OVER_TCP.md | 10 +++++----- docs/STATUS.md | 2 +- examples/OscDump.cpp | 8 ++++---- examples/SimpleReceive.cpp | 6 +++--- examples/SimpleSend.cpp | 4 ++-- fuzz/README.md | 4 ++-- fuzz/fuzz_deframe.cpp | 4 ++-- fuzz/fuzz_parse.cpp | 4 ++-- osctap/ip/AbstractUdpSocket.h | 4 ++-- osctap/ip/IpEndpointName.h | 2 +- osctap/ip/NetworkingUtils.h | 4 ++-- osctap/ip/TcpSocket.h | 4 ++-- osctap/ip/UdpSocket.h | 8 ++++---- osctap/ip/posix/TcpSocket.h | 8 ++++---- osctap/ip/posix/UdpSocket.h | 6 +++--- osctap/ip/win32/NetworkingUtils.h | 2 +- osctap/ip/win32/TcpSocket.h | 8 ++++---- osctap/ip/win32/UdpSocket.h | 6 +++--- osctap/osc/MessageMappingOscPacketListener.h | 2 +- osctap/osc/OscDebug.h | 2 +- osctap/osc/OscOutboundPacketStream.h | 10 +++++----- osctap/osc/OscPacketListener.h | 4 ++-- osctap/osc/OscPrintReceivedElements.h | 2 +- osctap/osc/OscReceivedElements.h | 8 ++++---- osctap/osc/OscStreamFraming.h | 2 +- osctap/osc/OscTypesTraits.h | 2 +- tests/OscConcurrencyTest.cpp | 6 +++--- tests/OscFreestandingTest.cpp | 4 ++-- tests/OscLatencyBench.cpp | 4 ++-- tests/OscMulticastTest.cpp | 8 ++++---- tests/OscRealtimeTest.cpp | 4 ++-- tests/OscStreamFramingTest.cpp | 2 +- tests/OscTcpTest.cpp | 8 ++++---- tests/OscUdpTest.cpp | 8 ++++---- tests/OscUnitTests.cpp | 10 +++++----- tests/OscValidateTest.cpp | 4 ++-- tests/Win32SocketSmoke.cpp | 10 +++++----- 49 files changed, 131 insertions(+), 132 deletions(-) diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh index 8eea43d..c197b4c 100755 --- a/.clusterfuzzlite/build.sh +++ b/.clusterfuzzlite/build.sh @@ -8,14 +8,14 @@ # its own sanitizer flags for local use). WORKDIR is the project root. # fuzz_parse: the OSC packet parser (untrusted bytes -> ReceivedPacket/...). -$CXX $CXXFLAGS -std=c++17 -I osctap \ +$CXX $CXXFLAGS -std=c++17 -I . \ fuzz/fuzz_parse.cpp \ $LIB_FUZZING_ENGINE \ -o "$OUT/fuzz_parse" # fuzz_deframe: the OSC-over-TCP stream deframer + parser (length-prefix # reassembly across arbitrary chunk boundaries, bounded-buffer / DoS guard). -$CXX $CXXFLAGS -std=c++17 -I osctap \ +$CXX $CXXFLAGS -std=c++17 -I . \ fuzz/fuzz_deframe.cpp \ $LIB_FUZZING_ENGINE \ -o "$OUT/fuzz_deframe" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9ea65e..f4c5df2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,7 +196,7 @@ jobs: - name: Cross-compile the socket loopback tests for win32 run: | for t in OscUdpTest OscTcpTest OscMulticastTest; do - x86_64-w64-mingw32-g++ -std=c++17 -O1 -static -I . -I osctap \ + x86_64-w64-mingw32-g++ -std=c++17 -O1 -static -I . \ tests/$t.cpp -o $t.exe -lws2_32 -lwinmm done diff --git a/CMakeLists.txt b/CMakeLists.txt index 46fccda..82fad2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,10 @@ add_library(tap::osc ALIAS oscpack) # Public headers now live under osctap/ (prefix ); the top-level # oscpack/ tree is a thin redirect shim kept for compatibility. -# Adding osctap/ to the search path lets the in-tree quoted "osc/..."/"ip/..." -# includes resolve, while the repo root (added to the INTERFACE below) keeps -# both and the deprecated prefixes working. -include_directories(osctap) - +# Every include — in the headers themselves and in the in-tree consumers — is +# written with the full "osctap/..." prefix, so the repo root on the INTERFACE +# below is the only search path needed; it also keeps the deprecated +# prefix working. target_include_directories(oscpack INTERFACE .) if(WIN32) target_link_libraries(oscpack INTERFACE ws2_32 winmm) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 24fbb02..fa3354c 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(OSCTAP_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/.." CACHE PATH "Path to the OscTap repo root") add_library(osctap_jni SHARED osctap_jni.cpp) -target_include_directories(osctap_jni PRIVATE ${OSCTAP_ROOT} ${OSCTAP_ROOT}/osctap) +target_include_directories(osctap_jni PRIVATE ${OSCTAP_ROOT}) # Parsing untrusted OSC throws on malformed input; keep exceptions enabled so the # bridge can catch and surface a Java exception instead of aborting. (RTTI is not diff --git a/android/osctap_jni.cpp b/android/osctap_jni.cpp index 8488699..9c6f113 100644 --- a/android/osctap_jni.cpp +++ b/android/osctap_jni.cpp @@ -24,8 +24,8 @@ #include -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscReceivedElements.h" namespace { diff --git a/demos/osc_send.cpp b/demos/osc_send.cpp index ff7598b..bdf9096 100644 --- a/demos/osc_send.cpp +++ b/demos/osc_send.cpp @@ -28,9 +28,9 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" namespace { diff --git a/demos/pi5_hub.cpp b/demos/pi5_hub.cpp index d114de1..f587609 100644 --- a/demos/pi5_hub.cpp +++ b/demos/pi5_hub.cpp @@ -30,10 +30,10 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscPacketListener.h" namespace { diff --git a/demos/tcp_send.cpp b/demos/tcp_send.cpp index be6e25b..d2a979f 100644 --- a/demos/tcp_send.cpp +++ b/demos/tcp_send.cpp @@ -25,9 +25,9 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/TcpSocket.h" -#include "osc/OscOutboundPacketStream.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" namespace { diff --git a/demos/tcp_server.cpp b/demos/tcp_server.cpp index 9fb31c2..b0a9619 100644 --- a/demos/tcp_server.cpp +++ b/demos/tcp_server.cpp @@ -17,9 +17,9 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/TcpSocket.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/osc/OscPacketListener.h" namespace { diff --git a/docs/EMBEDDED_PICO2W.md b/docs/EMBEDDED_PICO2W.md index 63ea881..d7a7d1d 100644 --- a/docs/EMBEDDED_PICO2W.md +++ b/docs/EMBEDDED_PICO2W.md @@ -95,8 +95,8 @@ header-only, so there is no library to compile or link. # After pico_sdk_init() and your add_executable(osc_demo ...) target_include_directories(osc_demo PRIVATE - ${OSCTAP_DIR}) # repo root: enables and the - # in-tree quoted "osc/..." includes + ${OSCTAP_DIR}) # repo root: all includes use the + # osctap/... prefix target_compile_definitions(osc_demo PRIVATE OSCTAP_FREESTANDING) # drop hosted-only facilities @@ -128,7 +128,7 @@ dispatch there (off the realtime thread), then read with the throw-free accessors in your hot loop. *Illustrative — adapt names to your SDK version:* ```cpp -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" static void on_osc_packet(void* /*arg*/, struct udp_pcb* /*pcb*/, struct pbuf* p, const ip_addr_t* /*addr*/, u16_t /*port*/) @@ -164,7 +164,7 @@ static void on_osc_packet(void* /*arg*/, struct udp_pcb* /*pcb*/, Serialize into a stack buffer (no heap), then ship it through an lwIP `pbuf`: ```cpp -#include "osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscOutboundPacketStream.h" void send_fader(udp_pcb* pcb, const ip_addr_t* dst, uint16_t port, float v) { diff --git a/docs/GETTING_STARTED.md b/docs/GETTING_STARTED.md index 09d543a..de6ba4d 100644 --- a/docs/GETTING_STARTED.md +++ b/docs/GETTING_STARTED.md @@ -24,7 +24,7 @@ target_link_libraries(myapp PRIVATE oscpack) # header-only INTERFACE target Or just point at the headers: ```sh -g++ -std=c++17 -I path/to/OscTap -I path/to/OscTap/osctap myapp.cpp -o myapp +g++ -std=c++17 -I path/to/OscTap myapp.cpp -o myapp ``` Public headers live under ``; the old `` paths and the @@ -37,8 +37,8 @@ Serialize into a buffer **you** own (no heap allocation), then put the bytes on the wire. The buffer can be on the stack. ```cpp -#include "osc/OscOutboundPacketStream.h" -#include "ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/ip/UdpSocket.h" int main() { @@ -66,8 +66,8 @@ Subclass `OscPacketListener` (it unpacks bundles for you and bounds nesting depth), bind a socket, and run the receive loop. ```cpp -#include "osc/OscPacketListener.h" -#include "ip/UdpSocket.h" +#include "osctap/osc/OscPacketListener.h" +#include "osctap/ip/UdpSocket.h" #include #include diff --git a/docs/INTEGRATION_PI5_PICO_ANDROID.md b/docs/INTEGRATION_PI5_PICO_ANDROID.md index 679d204..dcae32a 100644 --- a/docs/INTEGRATION_PI5_PICO_ANDROID.md +++ b/docs/INTEGRATION_PI5_PICO_ANDROID.md @@ -102,7 +102,7 @@ contract, the Pico does two things. **Receive `/led` and `/pwm`** in the lwIP `udp_recv` callback: ```cpp -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" static void on_osc(void*, udp_pcb*, pbuf* p, const ip_addr_t*, u16_t) { if (!p) return; @@ -122,7 +122,7 @@ static void on_osc(void*, udp_pcb*, pbuf* p, const ip_addr_t*, u16_t) { (buffer on the stack, no heap): ```cpp -#include "osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscOutboundPacketStream.h" void publish_temp(udp_pcb* pcb, const ip_addr_t* hub, uint16_t port, float c) { char buffer[64]; diff --git a/docs/OSC_OVER_TCP.md b/docs/OSC_OVER_TCP.md index 3af589e..6aca05c 100644 --- a/docs/OSC_OVER_TCP.md +++ b/docs/OSC_OVER_TCP.md @@ -23,7 +23,7 @@ transport-agnostic and usable on its own (e.g. over a serial link or your own socket loop): ```cpp -#include "osc/OscStreamFraming.h" +#include "osctap/osc/OscStreamFraming.h" // Decode: feed received bytes in whatever chunks arrive; the deframer reassembles // complete packets and calls your sink once per packet. @@ -43,8 +43,8 @@ UDP `UdpListeningReceiveSocket` — the listener contract is identical, so exist listeners work unchanged. ```cpp -#include "ip/TcpSocket.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/osc/OscPacketListener.h" class MyListener : public osctap::OscPacketListener { protected: @@ -71,8 +71,8 @@ partial writes; `TCP_NODELAY` is on (Nagle off — without it OSC-over-TCP laten is a classic footgun). ```cpp -#include "ip/TcpSocket.h" -#include "osc/OscOutboundPacketStream.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" osctap::TcpTransmitSocket client( osctap::IpEndpointName( "127.0.0.1", 9000 ) ); diff --git a/docs/STATUS.md b/docs/STATUS.md index 58bc868..445b018 100644 --- a/docs/STATUS.md +++ b/docs/STATUS.md @@ -210,7 +210,7 @@ cmake --build build-fs --target OscFreestandingTest && ./build-fs/OscFreestandin may lack the TSan runtime, so the CI job uses GCC). - **ClusterFuzzLite builds the fuzzer via `.clusterfuzzlite/build.sh`, not CMake** — it compiles `fuzz/fuzz_parse.cpp` directly with the OSS-Fuzz toolchain's - `$CXXFLAGS`/`$LIB_FUZZING_ENGINE` and `-I osctap`. The `cflite_*` workflows build an + `$CXXFLAGS`/`$LIB_FUZZING_ENGINE` and `-I .` (the repo root). The `cflite_*` workflows build an OSS-Fuzz Docker image, so they're slower than the rest of CI. Local fuzzing still goes through CMake (`OSCTAP_BUILD_FUZZERS` / `OSCTAP_FUZZER_STANDALONE`). diff --git a/examples/OscDump.cpp b/examples/OscDump.cpp index 7f14035..a2a0331 100644 --- a/examples/OscDump.cpp +++ b/examples/OscDump.cpp @@ -51,10 +51,10 @@ namespace std { } #endif -#include "ip/PacketListener.h" -#include "ip/UdpSocket.h" -#include "osc/OscPrintReceivedElements.h" -#include "osc/OscReceivedElements.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscPrintReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" using namespace oscpack; // deprecated alias for osctap, intentionally exercised here class OscDumpPacketListener : public PacketListener { diff --git a/examples/SimpleReceive.cpp b/examples/SimpleReceive.cpp index ff07af2..4839b0c 100644 --- a/examples/SimpleReceive.cpp +++ b/examples/SimpleReceive.cpp @@ -11,9 +11,9 @@ #include #include -#include "ip/UdpSocket.h" -#include "osc/OscPacketListener.h" -#include "osc/OscReceivedElements.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscPacketListener.h" +#include "osctap/osc/OscReceivedElements.h" using namespace oscpack; // OscTap's deprecated oscpack:: alias, exercised here diff --git a/examples/SimpleSend.cpp b/examples/SimpleSend.cpp index e6dbb8c..a155d96 100644 --- a/examples/SimpleSend.cpp +++ b/examples/SimpleSend.cpp @@ -6,8 +6,8 @@ For a typed command-line sender see demos/osc_send.cpp. */ -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" using namespace oscpack; // OscTap's deprecated oscpack:: alias, exercised here diff --git a/fuzz/README.md b/fuzz/README.md index bd7d0c2..15f2c16 100644 --- a/fuzz/README.md +++ b/fuzz/README.md @@ -11,7 +11,7 @@ so out-of-bounds reads surface under AddressSanitizer. Requires Clang with the libFuzzer + sanitizer runtimes installed. ```sh -clang++ -std=c++17 -g -O1 -I osctap \ +clang++ -std=c++17 -g -O1 -I . \ -fsanitize=fuzzer,address,undefined \ fuzz/fuzz_parse.cpp -o fuzz_parse ./fuzz_parse fuzz/corpus # seed corpus bootstraps coverage @@ -33,7 +33,7 @@ runs a bounded, deterministic random-mutation loop over them. Useful for CI smoke tests, crash-repro replay, and sanitizer coverage without libFuzzer. ```sh -g++ -std=c++17 -g -O1 -I osctap -fsanitize=address,undefined \ +g++ -std=c++17 -g -O1 -I . -fsanitize=address,undefined \ fuzz/fuzz_parse.cpp fuzz/standalone_main.cpp -o fuzz_parse_standalone ./fuzz_parse_standalone fuzz/corpus/* ``` diff --git a/fuzz/fuzz_deframe.cpp b/fuzz/fuzz_deframe.cpp index 0a8f73c..cddf8e8 100644 --- a/fuzz/fuzz_deframe.cpp +++ b/fuzz/fuzz_deframe.cpp @@ -22,8 +22,8 @@ #include #include -#include "osc/OscReceivedElements.h" -#include "osc/OscStreamFraming.h" +#include "osctap/osc/OscReceivedElements.h" +#include "osctap/osc/OscStreamFraming.h" using namespace oscpack; diff --git a/fuzz/fuzz_parse.cpp b/fuzz/fuzz_parse.cpp index 97e93ee..2b4dfcc 100644 --- a/fuzz/fuzz_parse.cpp +++ b/fuzz/fuzz_parse.cpp @@ -21,8 +21,8 @@ #include #include -#include "osc/OscPrintReceivedElements.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscPrintReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" using namespace oscpack; diff --git a/osctap/ip/AbstractUdpSocket.h b/osctap/ip/AbstractUdpSocket.h index c9b1412..6f82acd 100644 --- a/osctap/ip/AbstractUdpSocket.h +++ b/osctap/ip/AbstractUdpSocket.h @@ -39,8 +39,8 @@ #include // size_t -#include "IpEndpointName.h" -#include "NetworkingUtils.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/NetworkingUtils.h" namespace tap::osc { class PacketListener; diff --git a/osctap/ip/IpEndpointName.h b/osctap/ip/IpEndpointName.h index 9155832..f7fad7f 100644 --- a/osctap/ip/IpEndpointName.h +++ b/osctap/ip/IpEndpointName.h @@ -39,7 +39,7 @@ #include -#include "NetworkingUtils.h" +#include "osctap/ip/NetworkingUtils.h" namespace tap::osc { class IpEndpointName { diff --git a/osctap/ip/NetworkingUtils.h b/osctap/ip/NetworkingUtils.h index 449fc87..495dd27 100644 --- a/osctap/ip/NetworkingUtils.h +++ b/osctap/ip/NetworkingUtils.h @@ -1,7 +1,7 @@ #pragma once #if defined(_WIN32) -#include "ip/win32/NetworkingUtils.h" +#include "osctap/ip/win32/NetworkingUtils.h" #else -#include "ip/posix/NetworkingUtils.h" +#include "osctap/ip/posix/NetworkingUtils.h" #endif diff --git a/osctap/ip/TcpSocket.h b/osctap/ip/TcpSocket.h index 5e8d29c..f86b928 100644 --- a/osctap/ip/TcpSocket.h +++ b/osctap/ip/TcpSocket.h @@ -14,9 +14,9 @@ // server, TCP_NODELAY, frame-size cap. SLIP/TLS/WebSocket/epoll are deferred. #if defined(_WIN32) -#include "win32/TcpSocket.h" +#include "osctap/ip/win32/TcpSocket.h" #else -#include "posix/TcpSocket.h" +#include "osctap/ip/posix/TcpSocket.h" #endif namespace tap::osc { diff --git a/osctap/ip/UdpSocket.h b/osctap/ip/UdpSocket.h index 3b2a915..c86a4a9 100644 --- a/osctap/ip/UdpSocket.h +++ b/osctap/ip/UdpSocket.h @@ -1,11 +1,11 @@ #pragma once -#include "AbstractUdpSocket.h" -#include "ip/NetworkingUtils.h" +#include "osctap/ip/AbstractUdpSocket.h" +#include "osctap/ip/NetworkingUtils.h" #if defined(_WIN32) -#include "win32/UdpSocket.h" +#include "osctap/ip/win32/UdpSocket.h" #else -#include "posix/UdpSocket.h" +#include "osctap/ip/posix/UdpSocket.h" #endif namespace tap::osc { diff --git a/osctap/ip/posix/TcpSocket.h b/osctap/ip/posix/TcpSocket.h index d175585..8231802 100644 --- a/osctap/ip/posix/TcpSocket.h +++ b/osctap/ip/posix/TcpSocket.h @@ -34,10 +34,10 @@ #include // TCP_NODELAY -#include "ip/IpEndpointName.h" // complete type before the helpers below use it -#include "ip/PacketListener.h" -#include "ip/posix/UdpSocket.h" -#include "osc/OscStreamFraming.h" +#include "osctap/ip/IpEndpointName.h" // complete type before the helpers below use it +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/posix/UdpSocket.h" +#include "osctap/osc/OscStreamFraming.h" namespace tap::osc { namespace posix { diff --git a/osctap/ip/posix/UdpSocket.h b/osctap/ip/posix/UdpSocket.h index 1e25606..4a7a93b 100644 --- a/osctap/ip/posix/UdpSocket.h +++ b/osctap/ip/posix/UdpSocket.h @@ -57,9 +57,9 @@ #include #include -#include "ip/AbstractUdpSocket.h" -#include "ip/PacketListener.h" -#include "ip/TimerListener.h" +#include "osctap/ip/AbstractUdpSocket.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/TimerListener.h" namespace tap::osc { diff --git a/osctap/ip/win32/NetworkingUtils.h b/osctap/ip/win32/NetworkingUtils.h index 53b22c3..423ca98 100644 --- a/osctap/ip/win32/NetworkingUtils.h +++ b/osctap/ip/win32/NetworkingUtils.h @@ -34,7 +34,7 @@ requested that these non-binding requests be included whenever the above license is reproduced. */ -#include "ip/NetworkingUtils.h" +#include "osctap/ip/NetworkingUtils.h" // clang-format off // Winsock ordering is load-bearing: winsock2.h must precede windows.h. diff --git a/osctap/ip/win32/TcpSocket.h b/osctap/ip/win32/TcpSocket.h index a46fbcb..533149a 100644 --- a/osctap/ip/win32/TcpSocket.h +++ b/osctap/ip/win32/TcpSocket.h @@ -34,10 +34,10 @@ #include // TCP_NODELAY, IPPROTO_TCP -#include "ip/IpEndpointName.h" // complete type before the helpers below use it -#include "ip/PacketListener.h" -#include "ip/win32/UdpSocket.h" -#include "osc/OscStreamFraming.h" +#include "osctap/ip/IpEndpointName.h" // complete type before the helpers below use it +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/win32/UdpSocket.h" +#include "osctap/osc/OscStreamFraming.h" namespace tap::osc { namespace win32 { diff --git a/osctap/ip/win32/UdpSocket.h b/osctap/ip/win32/UdpSocket.h index 891cb1a..e1d9b77 100644 --- a/osctap/ip/win32/UdpSocket.h +++ b/osctap/ip/win32/UdpSocket.h @@ -57,9 +57,9 @@ #include #include -#include "ip/NetworkingUtils.h" -#include "ip/PacketListener.h" -#include "ip/TimerListener.h" +#include "osctap/ip/NetworkingUtils.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/TimerListener.h" typedef int socklen_t; diff --git a/osctap/osc/MessageMappingOscPacketListener.h b/osctap/osc/MessageMappingOscPacketListener.h index 33ffa10..8f5f715 100644 --- a/osctap/osc/MessageMappingOscPacketListener.h +++ b/osctap/osc/MessageMappingOscPacketListener.h @@ -40,7 +40,7 @@ #include #include -#include "OscPacketListener.h" +#include "osctap/osc/OscPacketListener.h" namespace tap::osc { diff --git a/osctap/osc/OscDebug.h b/osctap/osc/OscDebug.h index 0f18df8..d800104 100644 --- a/osctap/osc/OscDebug.h +++ b/osctap/osc/OscDebug.h @@ -1,7 +1,7 @@ #pragma once #include -#include "OscReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" namespace tap::osc { diff --git a/osctap/osc/OscOutboundPacketStream.h b/osctap/osc/OscOutboundPacketStream.h index 2736fd0..262382a 100644 --- a/osctap/osc/OscOutboundPacketStream.h +++ b/osctap/osc/OscOutboundPacketStream.h @@ -51,11 +51,11 @@ namespace tap::osc { using string_view = std::string_view; } -#include "OscConfig.h" // OSCTAP_THROW, OSCTAP_FREESTANDING -#include "OscException.h" -#include "OscHostEndianness.h" -#include "OscTypes.h" -#include "OscUtilities.h" +#include "osctap/osc/OscConfig.h" // OSCTAP_THROW, OSCTAP_FREESTANDING +#include "osctap/osc/OscException.h" +#include "osctap/osc/OscHostEndianness.h" +#include "osctap/osc/OscTypes.h" +#include "osctap/osc/OscUtilities.h" #if defined(__WIN32__) || defined(WIN32) || defined(_WIN32) #include // for alloca diff --git a/osctap/osc/OscPacketListener.h b/osctap/osc/OscPacketListener.h index 6728576..cb6501c 100644 --- a/osctap/osc/OscPacketListener.h +++ b/osctap/osc/OscPacketListener.h @@ -37,8 +37,8 @@ #ifndef INCLUDED_OSCTAP_OSCPACKETLISTENER_H #define INCLUDED_OSCTAP_OSCPACKETLISTENER_H -#include "../ip/PacketListener.h" -#include "OscReceivedElements.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/osc/OscReceivedElements.h" namespace tap::osc { diff --git a/osctap/osc/OscPrintReceivedElements.h b/osctap/osc/OscPrintReceivedElements.h index 0255579..7068a85 100644 --- a/osctap/osc/OscPrintReceivedElements.h +++ b/osctap/osc/OscPrintReceivedElements.h @@ -43,7 +43,7 @@ #include #include -#include "OscReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" namespace tap::osc { diff --git a/osctap/osc/OscReceivedElements.h b/osctap/osc/OscReceivedElements.h index e556c3d..b5eda5b 100644 --- a/osctap/osc/OscReceivedElements.h +++ b/osctap/osc/OscReceivedElements.h @@ -42,10 +42,10 @@ #include // ptrdiff_t #include // size_t -#include "OscConfig.h" // OSCTAP_THROW, OSCTAP_FREESTANDING -#include "OscException.h" -#include "OscTypes.h" -#include "OscUtilities.h" +#include "osctap/osc/OscConfig.h" // OSCTAP_THROW, OSCTAP_FREESTANDING +#include "osctap/osc/OscException.h" +#include "osctap/osc/OscTypes.h" +#include "osctap/osc/OscUtilities.h" #ifndef OSCTAP_FREESTANDING #include // std::vector backs OwnedMessage (hosted-only) #endif diff --git a/osctap/osc/OscStreamFraming.h b/osctap/osc/OscStreamFraming.h index 0b7d5f7..bc7a497 100644 --- a/osctap/osc/OscStreamFraming.h +++ b/osctap/osc/OscStreamFraming.h @@ -31,7 +31,7 @@ #include // memcpy #include -#include "OscUtilities.h" // FromUInt32 / ToUInt32 +#include "osctap/osc/OscUtilities.h" // FromUInt32 / ToUInt32 /* Length-prefixed OSC stream framing -- the de-facto convention for OSC over a diff --git a/osctap/osc/OscTypesTraits.h b/osctap/osc/OscTypesTraits.h index 177d9f2..018d011 100644 --- a/osctap/osc/OscTypesTraits.h +++ b/osctap/osc/OscTypesTraits.h @@ -1,7 +1,7 @@ #pragma once #include -#include "OscReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" namespace tap::osc { // Helpers to get the values. template diff --git a/tests/OscConcurrencyTest.cpp b/tests/OscConcurrencyTest.cpp index 42283c1..b8729ac 100644 --- a/tests/OscConcurrencyTest.cpp +++ b/tests/OscConcurrencyTest.cpp @@ -22,9 +22,9 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/PacketListener.h" -#include "ip/UdpSocket.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/UdpSocket.h" using namespace osctap; diff --git a/tests/OscFreestandingTest.cpp b/tests/OscFreestandingTest.cpp index 196313f..73e1cb8 100644 --- a/tests/OscFreestandingTest.cpp +++ b/tests/OscFreestandingTest.cpp @@ -17,8 +17,8 @@ #include #include -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscReceivedElements.h" // Guard rails: this TU must be compiled as the freestanding profile. #if OSCTAP_HAS_EXCEPTIONS diff --git a/tests/OscLatencyBench.cpp b/tests/OscLatencyBench.cpp index 139980a..344a2e1 100644 --- a/tests/OscLatencyBench.cpp +++ b/tests/OscLatencyBench.cpp @@ -21,8 +21,8 @@ #include #include -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscReceivedElements.h" using namespace oscpack; diff --git a/tests/OscMulticastTest.cpp b/tests/OscMulticastTest.cpp index c340990..d6bb8a5 100644 --- a/tests/OscMulticastTest.cpp +++ b/tests/OscMulticastTest.cpp @@ -17,10 +17,10 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscPacketListener.h" namespace { diff --git a/tests/OscRealtimeTest.cpp b/tests/OscRealtimeTest.cpp index c180599..33fdd26 100644 --- a/tests/OscRealtimeTest.cpp +++ b/tests/OscRealtimeTest.cpp @@ -32,8 +32,8 @@ #include #include -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscReceivedElements.h" using namespace osctap; diff --git a/tests/OscStreamFramingTest.cpp b/tests/OscStreamFramingTest.cpp index e910e3c..febbfa8 100644 --- a/tests/OscStreamFramingTest.cpp +++ b/tests/OscStreamFramingTest.cpp @@ -8,7 +8,7 @@ tested independently of any socket. */ -#include "osc/OscStreamFraming.h" +#include "osctap/osc/OscStreamFraming.h" #include #include diff --git a/tests/OscTcpTest.cpp b/tests/OscTcpTest.cpp index 95a6742..edcab45 100644 --- a/tests/OscTcpTest.cpp +++ b/tests/OscTcpTest.cpp @@ -17,10 +17,10 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/TcpSocket.h" -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscPacketListener.h" namespace { diff --git a/tests/OscUdpTest.cpp b/tests/OscUdpTest.cpp index 748ba30..01129df 100644 --- a/tests/OscUdpTest.cpp +++ b/tests/OscUdpTest.cpp @@ -20,10 +20,10 @@ #include #include -#include "ip/IpEndpointName.h" -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscPacketListener.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscPacketListener.h" namespace { diff --git a/tests/OscUnitTests.cpp b/tests/OscUnitTests.cpp index 699b8e2..6ac816c 100644 --- a/tests/OscUnitTests.cpp +++ b/tests/OscUnitTests.cpp @@ -42,11 +42,11 @@ #include #include -#include "ip/IpEndpointName.h" -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscPacketListener.h" -#include "osc/OscPrintReceivedElements.h" -#include "osc/OscReceivedElements.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscPacketListener.h" +#include "osctap/osc/OscPrintReceivedElements.h" +#include "osctap/osc/OscReceivedElements.h" // Compile-time proof that the big-endian integer load path is constexpr // ("constexpr parsing"). Uses the oscpack:: alias deliberately (it must keep diff --git a/tests/OscValidateTest.cpp b/tests/OscValidateTest.cpp index 656bb15..96e2c48 100644 --- a/tests/OscValidateTest.cpp +++ b/tests/OscValidateTest.cpp @@ -17,8 +17,8 @@ #include #include -#include "osc/OscOutboundPacketStream.h" -#include "osc/OscReceivedElements.h" +#include "osctap/osc/OscOutboundPacketStream.h" +#include "osctap/osc/OscReceivedElements.h" using osctap::osc_bundle_element_size_t; diff --git a/tests/Win32SocketSmoke.cpp b/tests/Win32SocketSmoke.cpp index df2fe32..5150ca8 100644 --- a/tests/Win32SocketSmoke.cpp +++ b/tests/Win32SocketSmoke.cpp @@ -16,11 +16,11 @@ #include -#include "ip/IpEndpointName.h" -#include "ip/PacketListener.h" -#include "ip/TcpSocket.h" -#include "ip/UdpSocket.h" -#include "osc/OscOutboundPacketStream.h" +#include "osctap/ip/IpEndpointName.h" +#include "osctap/ip/PacketListener.h" +#include "osctap/ip/TcpSocket.h" +#include "osctap/ip/UdpSocket.h" +#include "osctap/osc/OscOutboundPacketStream.h" namespace {